Mercurial > public > ostc4

diff Discovery/Src/settings.c @ 710:8adf9b8fc7fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extension scrubber time: In previous version only one scrubber timer was available. After movement of scruvver timer menu menu space became available allowing to upgrade the functionality to support two scrubbers. To make it easier to identify combination ID to used scrubber the date of the last usage of the scrubber timer has been added.
author Ideenmodellierer
date Tue, 08 Nov 2022 21:16:17 +0100
parents 49b164022335
children 6c620f5f4834
line wrap: on
line diff
--- a/Discovery/Src/settings.c	Tue Nov 08 21:13:14 2022 +0100
+++ b/Discovery/Src/settings.c	Tue Nov 08 21:16:17 2022 +0100
@@ -87,7 +87,7 @@
  * There might even be entries with fixed values that have no range
  */
 const SSettings SettingsStandard = {
-    .header = 0xFFFF0022,
+    .header = 0xFFFF0023,
     .warning_blink_dsec = 8 * 2,
     .lastDiveLogId = 0,
     .logFlashNextSampleStartAddress = SAMPLESTART,
@@ -322,8 +322,8 @@
 	.ppo2sensors_calibCoeff[2] = 0.0,
 	.amPMTime = 0,
 	.autoSetpoint = 0,
-	.scrubTimerMax = 0,
-	.scrubTimerCur = 0,
+	.scrubTimerMax_Obsolete = 0,
+	.scrubTimerCur_Obsolete = 0,
 	.scrubTimerMode = SCRUB_TIMER_OFF,
 };
 
@@ -488,8 +488,8 @@
     	// no break
     case 0xFFFF001E:
     	pSettings->autoSetpoint = 0;
-    	pSettings->scrubTimerMax = 0;
-    	pSettings->scrubTimerCur = 0;
+    	pSettings->scrubTimerMax_Obsolete = 0;
+    	pSettings->scrubTimerCur_Obsolete = 0;
     	pSettings->scrubTimerMode = SCRUB_TIMER_OFF;
     	// no break
     case 0xFFFF001F:
@@ -502,6 +502,22 @@
     case 0xFFFF0021:
     	pSettings->ext_uart_protocol = 0;
     	// no break;
+    case 0xFFFF0022:
+    	pSettings->scubberActiveId = 0;
+    	pSettings->scrubberData[0].TimerCur = pSettings->scrubTimerCur_Obsolete;
+    	pSettings->scrubberData[0].TimerMax = pSettings->scrubTimerMax_Obsolete;
+    	pSettings->scrubberData[0].lastDive.WeekDay = 0;
+    	pSettings->scrubberData[0].lastDive.Month = 0;
+    	pSettings->scrubberData[0].lastDive.Date = 0;
+    	pSettings->scrubberData[0].lastDive.Year = 0;
+
+    	pSettings->scrubberData[1].TimerCur = 0;
+    	pSettings->scrubberData[1].TimerMax = 0;
+    	pSettings->scrubberData[1].lastDive.WeekDay = 0;
+    	pSettings->scrubberData[1].lastDive.Month = 0;
+    	pSettings->scrubberData[1].lastDive.Date = 0;
+    	pSettings->scrubberData[1].lastDive.Year = 0;
+    	// no break;
     default:
         pSettings->header = pStandard->header;
         break; // no break before!!
@@ -1462,10 +1478,21 @@
     	corrections++;
     }
 
-    if((Settings.scrubTimerMax > MAX_SCRUBBER_TIME) || (Settings.scrubTimerCur > MAX_SCRUBBER_TIME))
+    if(Settings.scubberActiveId > 1)
+    {
+    	Settings.scubberActiveId = 0;
+    	corrections++;
+    }
+    if((Settings.scrubberData[0].TimerMax > MAX_SCRUBBER_TIME) || (Settings.scrubberData[0].TimerCur > MAX_SCRUBBER_TIME))
     {
-    	Settings.scrubTimerMax = 0;
-    	Settings.scrubTimerCur = 0;
+    	Settings.scrubberData[0].TimerMax = 0;
+    	Settings.scrubberData[0].TimerCur = 0;
+    	corrections++;
+    }
+    if((Settings.scrubberData[1].TimerMax > MAX_SCRUBBER_TIME) || (Settings.scrubberData[1].TimerCur > MAX_SCRUBBER_TIME))
+    {
+    	Settings.scrubberData[1].TimerMax = 0;
+    	Settings.scrubberData[1].TimerCur = 0;
     	corrections++;
     }
     if(Settings.scrubTimerMode > SCRUB_TIMER_END)
@@ -1490,7 +1517,7 @@
     	Settings.co2_sensor_active = 0;
     	corrections++;
     }
-    if(Settings.co2_sensor_active > UART_MAX_PROTOCOL)
+    if(Settings.ext_uart_protocol > UART_MAX_PROTOCOL)
     {
     	Settings.ext_uart_protocol = 0;
     	corrections++;