Mercurial > public > ostc4

diff Discovery/Src/tMenuSystem.c @ 520:970d8040c0e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved custom view menu to new tab: In previous version old location of custom views was kept for easier development. After establishing new tab the old implementation has been removed from MenuSystem unit.
author Ideenmodellierer
date Tue, 08 Sep 2020 21:24:14 +0200
parents 3485360c5db0
children 54c5ec8416c4
line wrap: on
line diff
--- a/Discovery/Src/tMenuSystem.c	Sun Sep 06 22:11:51 2020 +0200
+++ b/Discovery/Src/tMenuSystem.c	Tue Sep 08 21:24:14 2020 +0200
@@ -252,15 +252,6 @@
 
     if((line == 0) || (line == 4))
     {
-        text[textPointer++] = TXT_2BYTE;
-        text[textPointer++] = TXT2BYTE_Customviews;//TXT2BYTE_ShowDebug;
-    }
-    text[textPointer++] = '\n';
-    text[textPointer++] = '\r';
-    text[textPointer] = 0;
-
-    if((line == 0) || (line == 5))
-    {
         text[textPointer++] = TXT_Information;
         text[textPointer++] = '\t';
         textPointer += snprintf(&text[textPointer],29,"RTE %u.%u  OS %i.%i.%i"
@@ -274,7 +265,7 @@
     strcpy(&text[textPointer],"\n\r");
     textPointer += 2;
 
-    if((line == 0) || (line == 6))
+    if((line == 0) || (line == 5))
     {
         text[textPointer++] = TXT_2BYTE;
         text[textPointer++] = TXT2BYTE_ResetMenu;
@@ -288,64 +279,3 @@
 
 
 /* Private functions ---------------------------------------------------------*/
-
-char customview_TXT2BYTE_helper(uint8_t customViewId)
-{
-    char text = 0;
-
-    switch(customViewId)
-    {
-    case CVIEW_sensors:
-        text = TXT2BYTE_O2monitor;
-        break;
-    case CVIEW_sensors_mV:
-        text = TXT2BYTE_O2voltage;
-        break;
-    case CVIEW_Compass:
-        text = TXT2BYTE_Compass;
-        break;
-    case CVIEW_Decolist:
-    case CVIEW_T3_Decostop:
-        text = TXT2BYTE_Decolist;
-        break;
-    case CVIEW_Tissues:
-        text = TXT2BYTE_Tissues;
-        break;
-    case CVIEW_Profile:
-        text = TXT2BYTE_Profile;
-        break;
-    case CVIEW_Gaslist:
-        text = TXT2BYTE_Gaslist;
-        break;
-    case CVIEW_EADTime:
-        text = TXT2BYTE_Info;
-        break;
-    case CVIEW_SummaryOfLeftCorner:
-        text = TXT2BYTE_Summary;
-        break;
-    case CVIEW_noneOrDebug:
-    	text = TXT2BYTE_DispNoneDbg;
-        break;
-    case CVIEW_T3_MaxDepth:
-    	text = TXT2BYTE_MaxDepth;
-    	break;
-    case CVIEW_T3_StopWatch:
-    	text = TXT2BYTE_Stopwatch;
-    	break;
-    case CVIEW_T3_TTS:
-    	text = TXT2BYTE_TTS;
-    	break;
-    case CVIEW_T3_ppO2andGas:
-    	text = TXT2BYTE_ppoNair;
-    	break;
-    case CVIEW_T3_Navigation:
-    	text = TXT2BYTE_Navigation;
-    	break;
-    case CVIEW_T3_DepthData:
-    	text = TXT2BYTE_DepthData;
-    	break;
-    default:
-        break;
-    }
-    return text;
-}