diff Discovery/Src/settings.c @ 212:c878a08dcf86

Merged in janlmulder/ostc4/cv-persistent (pull request #10) Custom views persistent and better support for mCCR
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Tue, 26 Mar 2019 22:23:26 +0000
parents b2a9e9b02df0
children 26c874cdde0d
line wrap: on
line diff
--- a/Discovery/Src/settings.c	Sun Mar 24 22:09:37 2019 +0000
+++ b/Discovery/Src/settings.c	Tue Mar 26 22:23:26 2019 +0000
@@ -82,7 +82,7 @@
  * There might even be entries with fixed values that have no range
  */
 const SSettings SettingsStandard = {
-    .header = 0xFFFF0018,
+    .header = 0xFFFF0019,
     .warning_blink_dsec = 8 * 2,
     .lastDiveLogId = 0,
     .logFlashNextSampleStartAddress = 0,
@@ -306,6 +306,7 @@
     .FactoryButtonBalance[1] = 3,
     .FactoryButtonBalance[2] = 3,
 	.FlipDisplay = 0,
+	.cv_configuration = 0xFFFFFFFF,
 };
 
 /* Private function prototypes -----------------------------------------------*/
@@ -446,8 +447,11 @@
     case 0xFFFF0017:
     	pSettings->FlipDisplay = 0;
     	// no break
+    case 0xFFFF0018:
+    	pSettings->cv_configuration = 0xFFFFFFFF;
+    	// no break
     default:
-        pSettings->header 																= pStandard->header;
+        pSettings->header = pStandard->header;
         break; // no break before!!
     }
 }