Mercurial > public > ostc4

comparison Discovery/Src/tMenuCustom.c @ 988:d9290c76b840 GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OSTC4/5 joined code: In the previous version code differences between OSTC4/5 were identified using the ENABLE_GPIO_V2 compiler switch. In the new version this is done using the display version as indicator which OSTC model is in used. Since this is detected by Firmware the information is forwarded from there to the RTE. This causes a little delay in the GPIO initialization but this applies only to the cold start of the RTE which should not happen very often.
author ideenmodellierer
date Sun, 06 Apr 2025 21:02:17 +0200 (5 weeks ago)
parents e9c37071933b
children ac25c35a3c97
comparison
equal deleted inserted replaced
984:41136649b90d 988:d9290c76b840
117 117
118 strcpy(&text[textPointer],"\n\r"); 118 strcpy(&text[textPointer],"\n\r");
119 textPointer += 2; 119 textPointer += 2;
120 #endif 120 #endif
121 121
122 #ifdef ENABLE_GPIO_V2 122
123 if((line == 0) || (line == 5)) 123 if((isNewDisplay()) && ((line == 0) || (line == 5)))
124 { 124 {
125 /* MotionCtrl */
126 text[textPointer++] = TXT_2BYTE; 125 text[textPointer++] = TXT_2BYTE;
127 text[textPointer++] = TXT2BYTE_BUZZER; 126 text[textPointer++] = TXT2BYTE_BUZZER;
128 text[textPointer++] = ' '; 127 text[textPointer++] = ' ';
129 text[textPointer++] = TXT_Warning; 128 text[textPointer++] = TXT_Warning;
130 text[textPointer++] = '\t'; 129 text[textPointer++] = '\t';
134 text[textPointer++] = '\006'; 133 text[textPointer++] = '\006';
135 } 134 }
136 135
137 strcpy(&text[textPointer],"\n\r"); 136 strcpy(&text[textPointer],"\n\r");
138 textPointer += 2; 137 textPointer += 2;
139 #endif
140 138
141 return StMCustom; 139 return StMCustom;
142 } 140 }
143 141