Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditSystem.c @ 730:9c65d226f4f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update sensor menu support for automatic sensor detection: In previous version the three ppo2 sensor slots were always displayed with digital sensor hard mapped to channel 0 in case a digital sensor is available. The new function is able to merge the available sensors into one view and can hide unused slots.
author Ideenmodellierer
date Sat, 14 Jan 2023 20:49:40 +0100
parents 4f70155362d2
children dd7ce655db26
comparison
equal deleted inserted replaced
729:d646a0f724a7 730:9c65d226f4f6
151 RTC_DateTypeDef Sdate; 151 RTC_DateTypeDef Sdate;
152 RTC_TimeTypeDef Stime; 152 RTC_TimeTypeDef Stime;
153 uint8_t day,month,year,hour,minute, dateFormat, ddmmyy, mmddyy, yymmdd; 153 uint8_t day,month,year,hour,minute, dateFormat, ddmmyy, mmddyy, yymmdd;
154 char text[32]; 154 char text[32];
155 SSettings *pSettings; 155 SSettings *pSettings;
156 SFirmwareData *pFirmwareInfo; 156 const SFirmwareData *pFirmwareInfo;
157 pFirmwareInfo = firmwareDataGetPointer(); 157 pFirmwareInfo = firmwareDataGetPointer();
158 const SDiveState * pStateReal = stateRealGetPointer(); 158 const SDiveState * pStateReal = stateRealGetPointer();
159 159
160 pSettings = settingsGetPointer(); 160 pSettings = settingsGetPointer();
161 translateDate(pStateReal->lifeData.dateBinaryFormat, &Sdate); 161 translateDate(pStateReal->lifeData.dateBinaryFormat, &Sdate);
226 { 226 {
227 uint8_t digitContentNew; 227 uint8_t digitContentNew;
228 uint32_t newDay, newMonth, newYear; 228 uint32_t newDay, newMonth, newYear;
229 RTC_DateTypeDef sdatestructure; 229 RTC_DateTypeDef sdatestructure;
230 230
231 SFirmwareData *pFirmwareInfo; 231 const SFirmwareData *pFirmwareInfo;
232 pFirmwareInfo = firmwareDataGetPointer(); 232 pFirmwareInfo = firmwareDataGetPointer();
233 233
234 if(action == ACTION_BUTTON_ENTER) 234 if(action == ACTION_BUTTON_ENTER)
235 { 235 {
236 return digitContent; 236 return digitContent;