From 018a65e0b64b304890ff29c8d4c76990028c24f0 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 15 May 2019 14:56:51 +0200 Subject: [PATCH] data: renamed 'main' function in tutorial to 'start_tour' due to multiple main fix --- bin/app/user/projects/tutorial/src/main.cpp | 12 +++++------- bin/app/user/projects/tutorial/tutorial.srctrlprj | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/app/user/projects/tutorial/src/main.cpp b/bin/app/user/projects/tutorial/src/main.cpp index 0144af26..b4ce6083 100644 --- a/bin/app/user/projects/tutorial/src/main.cpp +++ b/bin/app/user/projects/tutorial/src/main.cpp @@ -20,18 +20,16 @@ //------------------------------------------------------------------------------ // -// WHAT IS THIS? -// Now the Code View finally shows some real code of the tutorial project. -// And who could think of a better place to start a tutorial that involves -// code than a main function? +// WHAT IS THIS? +// Now the Code View finally shows some real code of the tutorial project. // // WHAT CAN I DO NOW? -// Left-click the "my_first_step()" function call inside the main function. -// Lets see what happens. +// Left-click the "my_first_step()" function call inside the start_tour +// function. Let's see what happens. // //------------------------------------------------------------------------------ -int main() +int start_tour() { my_first_step(); return 0; diff --git a/bin/app/user/projects/tutorial/tutorial.srctrlprj b/bin/app/user/projects/tutorial/tutorial.srctrlprj index 32932543..e683bf4d 100644 --- a/bin/app/user/projects/tutorial/tutorial.srctrlprj +++ b/bin/app/user/projects/tutorial/tutorial.srctrlprj @@ -11,10 +11,10 @@ \tcontains a few hundred lines of code as you can see by the numbers below.\n \n LET'S GET STARTED!\n - \tTo keep things simple just click the "main" symbol below to start the tour.\n + \tTo keep things simple just click the "start_tour" symbol below to start the tour.\n \n \n - [::\tmmain\tsint\tp()](); // <- start here\n + [::\tmstart_tour\tsint\tp()](); // <- start here\n \n