Mercurial > brewboard / file diff

--- a/main/automation.c	Mon Feb 19 15:07:28 2024 +0100
+++ b/main/automation.c	Mon Jun 24 17:05:20 2024 +0200
@@ -11,7 +11,7 @@
 char        			temp_buf[64];			///< Temporary buffer
 char				logline[128];			///< Log line buffer
 char				strftime_buf[64];		///< Time buffer
-bool        			loop;				///< Loop flag
+bool        			a_loop;				///< Loop flag
 bool				CoolBeep = false;		///< Did beep during cooling
 bool				Resume = false;			///< Resume brew flag
 bool				pumpRest = false;		///< Pump is resting
@@ -40,6 +40,11 @@
 bool                            _UseHLT = false;		///< Use HLT slave flag
 bool				_Prompt = false;		///< Prompt display flag
 
+extern my_config_t		config;
+extern my_runtime_t		runtime;
+extern my_equipment_t		equipment;
+extern my_recipe_t		recipe;
+
 extern bool			System_TimeOk;			///< System time is valid
 extern sButton			Buttons[MAXBUTTONS];		///< Buttons definitions
 extern int			Main_Screen;			///< Current screen
@@ -133,10 +138,10 @@
                     Buttons_Add(200, 100, 80, 40, (char *)"Nee",  1);
                     Buttons_Show();
                     SoundPlay(SOUND_Prompt);
-                    loop = true;
-                    while (loop) {
+                    a_loop = true;
+                    while (a_loop) {
                         switch (Buttons_Scan()) {
-                            case 0:     loop = false;
+                            case 0:     a_loop = false;
                                         Resume = true;
                                         Main_Screen = runtime.StageResume;
                                         TimeLeft = runtime.StageTimeLeft;
@@ -160,7 +165,7 @@
 					return true;
                                         break;
 
-                            case 1:     loop = false;
+                            case 1:     a_loop = false;
                                         Resume = false;
                                         break;
 
@@ -431,7 +436,7 @@
 
 
 /*
- * Automation loop screens. Mostly non-blocking.
+ * Automation a_loop screens. Mostly non-blocking.
  */
 bool Automation_Loop(void)
 {
@@ -524,14 +529,14 @@
 		Buttons_Add(250, 210, 70, 30, (char *)"Start"  , 1);
 		Buttons[0].dark = true;
 		Buttons_Show();
-		loop = true;
-		while (loop) {
+		a_loop = true;
+		while (a_loop) {
 		    switch (Buttons_Scan()) {
-			case 0:         loop = false;
+			case 0:         a_loop = false;
 					Main_Screen = MAIN_AUTO_ABORT;
 					break;
 
-			case 1:         loop = false;
+			case 1:         a_loop = false;
 					Main_Screen = MAIN_AUTO_INIT2;
 					log_msg(TAG, "Brew `%s' on `%s'", recipe.Name, equipment.Name); 
 					break;
@@ -553,13 +558,13 @@
                 Buttons_Add(200, 100, 80, 40, (char *)"Nee",  1);
                 Buttons_Show();
                 SoundPlay(SOUND_Prompt);
-                loop = true;
-                while (loop) {
+                a_loop = true;
+                while (a_loop) {
                     switch (Buttons_Scan()) {
-                        case 0:         loop = false;
+                        case 0:         a_loop = false;
                                         break;
 
-                        case 1:         loop = false;
+                        case 1:         a_loop = false;
                                         Main_Screen = MAIN_AUTO_ABORT;
                                         break;
 
@@ -573,14 +578,14 @@
 		if ((equipment.SSR2 == SSR2_HLT_SHARE) || (equipment.SSR2 == SSR2_HLT_IND)) {
                     TopMessage((char *)"Spoelwater aanwezig?");
                     SoundPlay(SOUND_Prompt);
-                    loop = true;
-                    while (loop) {
+                    a_loop = true;
+                    while (a_loop) {
                     	switch (Buttons_Scan()) {
-                            case 0:         loop = false;
+                            case 0:         a_loop = false;
                                         _UseHLT = true;
                                         break;
 
-                            case 1:         loop = false;
+                            case 1:         a_loop = false;
                                         break;
 
                             default:        break;