Mercurial > public > ostc4

diff Discovery/Src/settings.c @ 505:06b21f1e47a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed second big font profile The nex big font views have been introduced using an additional profile because an individual selection was not possible. By introducing the selection dialog for big font data views this additional profile is no longer needed.
author Ideenmodellierer
date Sun, 30 Aug 2020 17:14:31 +0200
parents 4811f3dfaa52
children 7512804bc6cf
line wrap: on
line diff
--- a/Discovery/Src/settings.c	Mon Aug 24 19:59:28 2020 +0200
+++ b/Discovery/Src/settings.c	Sun Aug 30 17:14:31 2020 +0200
@@ -84,7 +84,7 @@
  * There might even be entries with fixed values that have no range
  */
 const SSettings SettingsStandard = {
-    .header = 0xFFFF001A,
+    .header = 0xFFFF001B,
     .warning_blink_dsec = 8 * 2,
     .lastDiveLogId = 0,
     .logFlashNextSampleStartAddress = 0,
@@ -311,7 +311,6 @@
 	.cv_configuration = 0xFFFFFFFF,
 	.MotionDetection = MOTION_DETECT_OFF,
 	.cv_config_BigScreen = 0xFFFFFFFF,
-	.cv_config_BigScreenV2 = 0xFFFFFFFF,
 };
 
 /* Private function prototypes -----------------------------------------------*/
@@ -460,8 +459,10 @@
     	pSettings->MotionDetection = MOTION_DETECT_OFF;
     	// no break
     case 0xFFFF001A:
+    	/* deactivate new views => to be activated by customer */
         pSettings->cv_config_BigScreen = 0xFFFFFFFF;
-        pSettings->cv_config_BigScreenV2 = 0xFFFFFFFF;
+        pSettings->cv_config_BigScreen &= pSettings->cv_configuration ^= 1 << CVIEW_T3_Navigation;
+        pSettings->cv_config_BigScreen &= pSettings->cv_configuration ^= 1 << CVIEW_T3_DepthData;
         // no break
     default:
         pSettings->header = pStandard->header;