Merge pull request #236 from LeeLeahy2/rover-to-base

nseidle · web-flow · commit fa292f22f946 · 2022-07-19T15:58:45.000-06:00
Don't switch ROVER to BASE by changing base parameter in Serial Config
diff --git a/Firmware/RTK_Surveyor/menuMain.ino b/Firmware/RTK_Surveyor/menuMain.ino
@@ -94,7 +94,8 @@ void menuMain()
   if (online.gnss == true)
     i2cGNSS.saveConfiguration(); //Save the current settings to flash and BBR on the ZED-F9P
 
-  if (restartBase == true)
+  //Reboot as base only if currently operating as a base station
+  if (restartBase && (systemState >= STATE_BASE_NOT_STARTED) && (systemState < STATE_BUBBLE_LEVEL))
   {
     restartBase = false;
     requestChangeState(STATE_BASE_NOT_STARTED); //Restart base upon exit for latest changes to take effect

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ void menuMain()`
`94`	`94`	`if (online.gnss == true)`
`95`	`95`	`i2cGNSS.saveConfiguration(); //Save the current settings to flash and BBR on the ZED-F9P`
`96`	`96`
`97`		`- if (restartBase == true)`
	`97`	`+ //Reboot as base only if currently operating as a base station`
	`98`	`+ if (restartBase && (systemState >= STATE_BASE_NOT_STARTED) && (systemState < STATE_BUBBLE_LEVEL))`
`98`	`99`	`{`
`99`	`100`	`restartBase = false;`
`100`	`101`	`requestChangeState(STATE_BASE_NOT_STARTED); //Restart base upon exit for latest changes to take effect`