Mercurial > public > ostc4
comparison Discovery/Src/tMenuDeco.c @ 696:cc542448fb28
Merge
author | heinrichsweikamp |
---|---|
date | Fri, 19 Aug 2022 11:30:24 +0200 |
parents | 1b995079c045 |
children | e81afd727993 |
comparison
equal
deleted
inserted
replaced
661:87bee7cc77b3 | 696:cc542448fb28 |
---|---|
65 divemode = TXT_Gauge; | 65 divemode = TXT_Gauge; |
66 break; | 66 break; |
67 case DIVEMODE_Apnea: | 67 case DIVEMODE_Apnea: |
68 divemode = TXT_Apnoe; | 68 divemode = TXT_Apnoe; |
69 break; | 69 break; |
70 case DIVEMODE_PSCR: | |
71 divemode = TXT_PSClosedCircuit; | |
72 break; | |
70 default : | 73 default : |
71 divemode = TXT_OpenCircuit; | 74 divemode = TXT_OpenCircuit; |
72 break; | 75 break; |
73 } | 76 } |
74 textPointer += snprintf(&text[textPointer], 60,\ | 77 textPointer += snprintf(&text[textPointer], 60,\ |
79 ); | 82 ); |
80 } | 83 } |
81 strcpy(&text[textPointer],"\n\r"); | 84 strcpy(&text[textPointer],"\n\r"); |
82 textPointer += 2; | 85 textPointer += 2; |
83 | 86 |
84 if(data->dive_mode == DIVEMODE_CCR) | 87 if(isLoopMode(data->dive_mode)) |
85 { | 88 { |
86 if((line == 0) || (line == 2)) | 89 if((line == 0) || (line == 2)) |
87 { | 90 { |
88 if(data->CCR_Mode == CCRMODE_Sensors) | 91 switch(data->CCR_Mode) |
89 CcrModusTxtId = TXT_Sensor; | 92 { |
90 else | 93 case CCRMODE_Sensors: CcrModusTxtId = TXT_Sensor; |
91 CcrModusTxtId = TXT_FixedSP; | 94 break; |
95 case CCRMODE_FixedSetpoint: CcrModusTxtId = TXT_FixedSP; | |
96 break; | |
97 case CCRMODE_Simulation: CcrModusTxtId = TXT_SimPpo2; | |
98 break; | |
99 default: CcrModusTxtId = 'X'; | |
100 break; | |
101 } | |
102 | |
92 | 103 |
93 textPointer += snprintf(&text[textPointer], 60,\ | 104 textPointer += snprintf(&text[textPointer], 60,\ |
94 "%c" | 105 "%c" |
95 "\t" | 106 "\t" |
96 "%c" | 107 "%c" |