Mercurial > public > ostc4

comparison Discovery/Src/tMenuSystem.c @ 1037:2af07aa38531 GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with external development branches: Some features have been prepared for integration: Profiles, DMA UART on Firmware part, Bluetooth discovery and messges logging for development phase. All these new function are deactivated by compile switch and may be activated using the configuration.h for testing purpose.
author Ideenmodellierer
date Mon, 15 Sep 2025 21:12:44 +0200
parents 158100a84ebd
children 677d293c669f
comparison
equal deleted inserted replaced
1029:e938901f6386 1037:2af07aa38531
143 else 143 else
144 { 144 {
145 strcpy(&text[textPointer],"\n\r"); 145 strcpy(&text[textPointer],"\n\r");
146 textPointer += 2; 146 textPointer += 2;
147 } 147 }
148 148 #ifdef ENABLE_SETTING_PROFILES
149 if((line == 0) || (line == 2)) 149 if((line == 0) || (line == 2))
150 { 150 {
151 textPointer += snprintf(&text[textPointer], 40,"%c%c:\t%s\n\r",TXT_2BYTE,TXT2BYTE_Profile,data->profileName[data->activeProfile]); 151 textPointer += snprintf(&text[textPointer], 40,"%c%c:\t%s\n\r",TXT_2BYTE,TXT2BYTE_Profile,data->profileName[data->activeProfile]);
152 } 152 }
153 else 153 else
154 { 154 {
155 strcpy(&text[textPointer],"\n\r"); 155 strcpy(&text[textPointer],"\n\r");
156 textPointer += 2; 156 textPointer += 2;
157 } 157 }
158 #endif
159 #ifdef ENABLE_SETTING_PROFILES
158 if((line == 0) || (line == 3)) 160 if((line == 0) || (line == 3))
161 #else
162 if((line == 0) || (line == 2))
163 #endif
159 { 164 {
160 text[textPointer++] = TXT_Language; 165 text[textPointer++] = TXT_Language;
161 text[textPointer++] = '\t'; 166 text[textPointer++] = '\t';
162 text[textPointer++] = TXT_LanguageName; 167 text[textPointer++] = TXT_LanguageName;
163 text[textPointer++] = '\n'; 168 text[textPointer++] = '\n';
167 else 172 else
168 { 173 {
169 strcpy(&text[textPointer],"\n\r"); 174 strcpy(&text[textPointer],"\n\r");
170 textPointer += 2; 175 textPointer += 2;
171 } 176 }
172 177 #ifdef ENABLE_SETTING_PROFILES
173 if((line == 0) || (line == 4)) 178 if((line == 0) || (line == 4))
179 #else
180 if((line == 0) || (line == 3))
181 #endif
174 { 182 {
175 text[textPointer++] = TXT_2BYTE; 183 text[textPointer++] = TXT_2BYTE;
176 text[textPointer++] = TXT2BYTE_Layout; 184 text[textPointer++] = TXT2BYTE_Layout;
177 text[textPointer++] = '\t'; 185 text[textPointer++] = '\t';
178 186
241 { 249 {
242 strcpy(&text[textPointer],"\n\r"); 250 strcpy(&text[textPointer],"\n\r");
243 textPointer += 2; 251 textPointer += 2;
244 } 252 }
245 253
254 #ifdef ENABLE_SETTING_PROFILES
246 if((line == 0) || (line == 5)) 255 if((line == 0) || (line == 5))
256 #else
257 if((line == 0) || (line == 4))
258 #endif
247 { 259 {
248 text[textPointer++] = TXT_Information; 260 text[textPointer++] = TXT_Information;
249 text[textPointer++] = '\t'; 261 text[textPointer++] = '\t';
250 textPointer += snprintf(&text[textPointer],29,"RTE %u.%u OS %i.%i.%i" 262 textPointer += snprintf(&text[textPointer],29,"RTE %u.%u OS %i.%i.%i"
251 ,RTEhigh 263 ,RTEhigh
256 ); 268 );
257 } 269 }
258 strcpy(&text[textPointer],"\n\r"); 270 strcpy(&text[textPointer],"\n\r");
259 textPointer += 2; 271 textPointer += 2;
260 272
273 #ifdef ENABLE_SETTING_PROFILES
261 if((line == 0) || (line == 6)) 274 if((line == 0) || (line == 6))
275 #else
276 if((line == 0) || (line == 5))
277 #endif
262 { 278 {
263 text[textPointer++] = TXT_2BYTE; 279 text[textPointer++] = TXT_2BYTE;
264 text[textPointer++] = TXT2BYTE_ResetMenu; 280 text[textPointer++] = TXT2BYTE_ResetMenu;
265 text[textPointer] = 0; 281 text[textPointer] = 0;
266 } 282 }