Mercurial > public > ostc4

changeset 687:5e9973957318 Betatest

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Increased version numbers: increased RTE version because of interface change and firmware as well to have a better indicator of the versions used during beta test phase.
author Ideenmodellierer
date Fri, 05 Aug 2022 15:10:10 +0200
parents b1e24513b83e
children 8c92f7743e14
files Discovery/Src/settings.c Small_CPU/Src/baseCPU2.c
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/settings.c	Fri Aug 05 14:56:17 2022 +0200
+++ b/Discovery/Src/settings.c	Fri Aug 05 15:10:10 2022 +0200
@@ -41,7 +41,7 @@
 SSettings Settings;
 
 const uint8_t RTErequiredHigh = 2;
-const uint8_t RTErequiredLow = 7;
+const uint8_t RTErequiredLow = 9;
 
 const uint8_t FONTrequiredHigh = 1;
 const uint8_t FONTrequiredLow =	0;
@@ -60,7 +60,7 @@
 {
     .versionFirst   = 1,
     .versionSecond 	= 5,
-    .versionThird   = 9,
+    .versionThird   = 10,
     .versionBeta    = 0,
 
     /* 4 bytes with trailing 0 */
@@ -87,7 +87,7 @@
  * There might even be entries with fixed values that have no range
  */
 const SSettings SettingsStandard = {
-    .header = 0xFFFF0021,
+    .header = 0xFFFF0022,
     .warning_blink_dsec = 8 * 2,
     .lastDiveLogId = 0,
     .logFlashNextSampleStartAddress = SAMPLESTART,
@@ -499,6 +499,9 @@
     case 0xFFFF0020:
     	pSettings->co2_sensor_active = 0;
     	// no break;
+    case 0xFFFF0021:
+    	pSettings->ext_uart_protocol = 0;
+    	// no break;
     default:
         pSettings->header = pStandard->header;
         break; // no break before!!
@@ -1487,6 +1490,11 @@
     	Settings.co2_sensor_active = 0;
     	corrections++;
     }
+    if(Settings.co2_sensor_active > UART_MAX_PROTOCOL)
+    {
+    	Settings.ext_uart_protocol = 0;
+    	corrections++;
+    }
 
     if(corrections)
     {
--- a/Small_CPU/Src/baseCPU2.c	Fri Aug 05 14:56:17 2022 +0200
+++ b/Small_CPU/Src/baseCPU2.c	Fri Aug 05 15:10:10 2022 +0200
@@ -166,7 +166,7 @@
 // See CPU2-RTE.ld
 const SFirmwareData cpu2_FirmwareData __attribute__(( section(".firmware_data") ))= {
 		.versionFirst = 2,
-		.versionSecond = 8,
+		.versionSecond = 9,
 		.versionThird = 0,
 		.versionBeta = 1,