Allow shutdown while in serial menu

nseidle · nseidle · commit 0015f253b14a · 2022-10-28T11:12:37.000-06:00
diff --git a/Firmware/RTK_Surveyor/Tasks.ino b/Firmware/RTK_Surveyor/Tasks.ino
@@ -504,6 +504,8 @@ void ButtonCheckTask(void *e)
       {
         forceSystemStateUpdate = true;
         requestChangeState(STATE_SHUTDOWN);
+
+        if(inMainMenu) powerDown(true); //State machine is not updated while in menu system so go straight to power down as needed
       }
       else if ((setupBtn != NULL && setupBtn->pressedFor(500)) &&
                (powerBtn != NULL && powerBtn->pressedFor(500)))
@@ -625,6 +627,8 @@ void ButtonCheckTask(void *e)
       {
         forceSystemStateUpdate = true;
         requestChangeState(STATE_SHUTDOWN);
+
+        if(inMainMenu) powerDown(true); //State machine is not updated while in menu system so go straight to power down as needed
       }
       else if (powerBtn != NULL && systemState == STATE_ROVER_NOT_STARTED && firstRoverStart == true && powerBtn->pressedFor(500))
       {

Original file line number	Diff line number	Diff line change
`@@ -504,6 +504,8 @@ void ButtonCheckTask(void *e)`
`504`	`504`	`{`
`505`	`505`	`forceSystemStateUpdate = true;`
`506`	`506`	`requestChangeState(STATE_SHUTDOWN);`
	`507`	`+`
	`508`	`+ if(inMainMenu) powerDown(true); //State machine is not updated while in menu system so go straight to power down as needed`
`507`	`509`	`}`
`508`	`510`	`else if ((setupBtn != NULL && setupBtn->pressedFor(500)) &&`
`509`	`511`	`(powerBtn != NULL && powerBtn->pressedFor(500)))`
`@@ -625,6 +627,8 @@ void ButtonCheckTask(void *e)`
`625`	`627`	`{`
`626`	`628`	`forceSystemStateUpdate = true;`
`627`	`629`	`requestChangeState(STATE_SHUTDOWN);`
	`630`	`+`
	`631`	`+ if(inMainMenu) powerDown(true); //State machine is not updated while in menu system so go straight to power down as needed`
`628`	`632`	`}`
`629`	`633`	`else if (powerBtn != NULL && systemState == STATE_ROVER_NOT_STARTED && firstRoverStart == true && powerBtn->pressedFor(500))`
`630`	`634`	`{`