Mercurial > public > ostc4

diff Discovery/Src/tMenuDeco.c @ 696:cc542448fb28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author heinrichsweikamp
date Fri, 19 Aug 2022 11:30:24 +0200
parents 1b995079c045
children e81afd727993
line wrap: on
line diff
--- a/Discovery/Src/tMenuDeco.c	Mon Nov 01 12:39:34 2021 +0100
+++ b/Discovery/Src/tMenuDeco.c	Fri Aug 19 11:30:24 2022 +0200
@@ -67,6 +67,9 @@
         case DIVEMODE_Apnea:
             divemode = TXT_Apnoe;
             break;
+        case DIVEMODE_PSCR:
+            divemode = TXT_PSClosedCircuit;
+        break;
         default :
         	divemode = TXT_OpenCircuit;
         	break;
@@ -81,14 +84,22 @@
     strcpy(&text[textPointer],"\n\r");
     textPointer += 2;
 
-    if(data->dive_mode == DIVEMODE_CCR)
+    if(isLoopMode(data->dive_mode))
     {
         if((line == 0) || (line == 2))
         {
-            if(data->CCR_Mode == CCRMODE_Sensors)
-                CcrModusTxtId = TXT_Sensor;
-            else
-                CcrModusTxtId = TXT_FixedSP;
+        	switch(data->CCR_Mode)
+        	{
+        		case CCRMODE_Sensors: CcrModusTxtId = TXT_Sensor;
+        			break;
+        		case CCRMODE_FixedSetpoint: CcrModusTxtId = TXT_FixedSP;
+        			break;
+        		case CCRMODE_Simulation: CcrModusTxtId = TXT_SimPpo2;
+        			break;
+        		default:	CcrModusTxtId = 'X';
+        			break;
+        	}
+
 
             textPointer += snprintf(&text[textPointer], 60,\
                 "%c"