Load partial settings after platform is dected

nseidle · nseidle · commit f43e28b8bcaf · 2023-09-19T08:45:09.000-06:00
So that setSettingsFileName has correct info. Reversion of [this commit](718f07c#diff-b1c05b3c11dc036b5248d5537c2f451b6040a30a1ee28bfe8a970b2bc7af0007R119). We no longer need power button filtering setting so this is ok. Fix for issue #658.
diff --git a/Firmware/RTK_Surveyor/Begin.ino b/Firmware/RTK_Surveyor/Begin.ino
@@ -153,10 +153,6 @@ void beginBoard()
         }
     }
 
-    // We need some settings before we are completely powered on
-    // ie, disablePowerFiltering, enableResetDisplay, resetCount, etc
-    loadSettingsPartial(); // Loads settings from LFS
-
     // Setup hardware pins
     if (productVariant == RTK_SURVEYOR)
     {
@@ -295,6 +291,7 @@ void beginBoard()
     ethernetMACAddress[5] += 3; // Convert MAC address to Ethernet MAC (add 3)
 
     // For all boards, check reset reason. If reset was due to wdt or panic, append last log
+    loadSettingsPartial(); // Loads settings from LFS
     if ((esp_reset_reason() == ESP_RST_POWERON) || (esp_reset_reason() == ESP_RST_SW))
     {
         reuseLastLog = false; // Start new log

Original file line number	Diff line number	Diff line change
`@@ -153,10 +153,6 @@ void beginBoard()`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`- // We need some settings before we are completely powered on`
`157`		`- // ie, disablePowerFiltering, enableResetDisplay, resetCount, etc`
`158`		`- loadSettingsPartial(); // Loads settings from LFS`
`159`		`-`
`160`	`156`	`// Setup hardware pins`
`161`	`157`	`if (productVariant == RTK_SURVEYOR)`
`162`	`158`	`{`
`@@ -295,6 +291,7 @@ void beginBoard()`
`295`	`291`	`ethernetMACAddress[5] += 3; // Convert MAC address to Ethernet MAC (add 3)`
`296`	`292`
`297`	`293`	`// For all boards, check reset reason. If reset was due to wdt or panic, append last log`
	`294`	`+ loadSettingsPartial(); // Loads settings from LFS`
`298`	`295`	`if ((esp_reset_reason() == ESP_RST_POWERON) \|\| (esp_reset_reason() == ESP_RST_SW))`
`299`	`296`	`{`
`300`	`297`	`reuseLastLog = false; // Start new log`