Mercurial > public > ostc4

changeset 526:88c626d01ee5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added new option to gas configuration: "Off": Added strings and menu definitions needed to implement new state. The new state may be activated in code using the compile switch "ENABLE_UNUSED_GAS_HIDING"
author Ideenmodellierer
date Sun, 13 Sep 2020 20:55:54 +0200
parents 1f557e5f4b5a
children 962d7b2c18c6
files Common/Inc/settings.h Discovery/Inc/configuration.h Discovery/Inc/tStructure.h Discovery/Inc/text_multilanguage.h Discovery/Src/text_multilanguage.c
diffstat 5 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Common/Inc/settings.h	Sun Sep 13 20:49:58 2020 +0200
+++ b/Common/Inc/settings.h	Sun Sep 13 20:55:54 2020 +0200
@@ -76,7 +76,8 @@
 uint8_t first:1;
 uint8_t deco:1;
 uint8_t travel:1;
-uint8_t senderCode:4;
+uint8_t off:1;
+uint8_t spare:3;
 } gasubit8_t;
 
 typedef union{
--- a/Discovery/Inc/configuration.h	Sun Sep 13 20:49:58 2020 +0200
+++ b/Discovery/Inc/configuration.h	Sun Sep 13 20:55:54 2020 +0200
@@ -52,4 +52,6 @@
 /* Enable to have access to the motion control selection menu */
 /* #define ENABLE_MOTION_CONTROL */
 
+/* Enable to have option to hide not needed gases from dive views */
+/* #define ENABLE_UNUSED_GAS_HIDING */
 #endif
--- a/Discovery/Inc/tStructure.h	Sun Sep 13 20:49:58 2020 +0200
+++ b/Discovery/Inc/tStructure.h	Sun Sep 13 20:55:54 2020 +0200
@@ -124,12 +124,13 @@
 #define StMOG_SetToMOD			_MB(2,1,255,4,0)
 #define StMOG_Bottle				_MB(2,1,255,5,0)
 
-#define StMOG_MOD						_MB(2,1,255,9,0)
+#define StMOG_MOD					_MB(2,1,255,9,0)
 
 #define StMOG_First					_MB(2,1,255,21,0)
 #define StMOG_Deco					_MB(2,1,255,22,0)
 #define StMOG_Travel				_MB(2,1,255,23,0)
-#define StMOG_Inactive			_MB(2,1,255,24,0)
+#define StMOG_Inactive				_MB(2,1,255,24,0)
+#define StMOG_Off					_MB(2,1,255,25,0)
 
 #define StMOG_NoTransmitter	_MB(2,1,255,30,0)
 #define StMOG_Transmitter1	_MB(2,1,255,31,0)
--- a/Discovery/Inc/text_multilanguage.h	Sun Sep 13 20:49:58 2020 +0200
+++ b/Discovery/Inc/text_multilanguage.h	Sun Sep 13 20:55:54 2020 +0200
@@ -90,6 +90,7 @@
 		TXT_Deco,
 		TXT_Travel,
 		TXT_Inactive,
+		TXT_Off,
 		TXT_ChangeDepth,
 		TXT_Active,
 		TXT_Default,
--- a/Discovery/Src/text_multilanguage.c	Sun Sep 13 20:49:58 2020 +0200
+++ b/Discovery/Src/text_multilanguage.c	Sun Sep 13 20:55:54 2020 +0200
@@ -290,6 +290,13 @@
 static uint8_t text_ES_Inactive[] = "Inactivo";     
 
 // Menu Gas
+static uint8_t text_EN_Off[] = "Off";
+static uint8_t text_DE_Off[] = "Ausblenden";
+static uint8_t text_FR_Off[] = "";
+static uint8_t text_IT_Off[] = "";
+static uint8_t text_ES_Off[] = "";
+
+// Menu Gas
 static uint8_t text_EN_ChangeDepth[] = "Change depth";
 static uint8_t text_DE_ChangeDepth[] = "Wechseltiefe";
 static uint8_t text_FR_ChangeDepth[] = "Prof.Changmt";
@@ -1632,7 +1639,8 @@
     {(uint8_t)TXT_First, 			{text_EN_First, text_DE_First, text_FR_First, text_IT_First, text_ES_First}},
     {(uint8_t)TXT_Deco, 			{text_EN_Deco, text_DE_Deco, text_FR_Deco, text_IT_Deco, text_ES_Deco}},
     {(uint8_t)TXT_Travel, 			{text_EN_Travel, text_DE_Travel, text_FR_Travel, text_IT_Travel, text_ES_Travel}},
-    {(uint8_t)TXT_Inactive, 		{text_EN_Inactive, text_DE_Inactive, text_FR_Inactive, text_IT_Inactive, text_ES_Inactive}},
+	{(uint8_t)TXT_Inactive, 		{text_EN_Inactive, text_DE_Inactive, text_FR_Inactive, text_IT_Inactive, text_ES_Inactive}},
+	{(uint8_t)TXT_Off, 				{text_EN_Off, text_DE_Off, text_FR_Off, text_IT_Off, text_ES_Off}},
     {(uint8_t)TXT_ChangeDepth, 		{text_EN_ChangeDepth, text_DE_ChangeDepth, text_FR_ChangeDepth, text_IT_ChangeDepth, text_ES_ChangeDepth}},
     {(uint8_t)TXT_Active, 			{text_EN_Active, text_DE_Active, text_FR_Active, text_IT_Active, text_ES_Active}},
     {(uint8_t)TXT_Default, 			{text_EN_Default, text_DE_Default, text_FR_Default, text_IT_Default, text_ES_Default}},