Mercurial > public > ostc4

comparison Discovery/Src/settings.c @ 461:b3f684cea9c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in Ideenmodellierer/ostc4/minor_improvments (pull request #41) Minor improvments
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Mon, 30 Mar 2020 13:16:11 +0000
parents a5101c688b49
children dddfe7917131
comparison
equal deleted inserted replaced
441:9a9e4908ce2e 461:b3f684cea9c0
31 #include "firmwareEraseProgram.h" // for HARDWAREDATA_ADDRESS 31 #include "firmwareEraseProgram.h" // for HARDWAREDATA_ADDRESS
32 #include "externLogbookFlash.h" // for SAMPLESTART and SAMPLESTOP 32 #include "externLogbookFlash.h" // for SAMPLESTART and SAMPLESTOP
33 #include "text_multilanguage.h" // for LANGUAGE_END 33 #include "text_multilanguage.h" // for LANGUAGE_END
34 #include "tHome.h" // for CVIEW_END 34 #include "tHome.h" // for CVIEW_END
35 #include "motion.h" 35 #include "motion.h"
36 #include "t7.h"
36 37
37 SSettings Settings; 38 SSettings Settings;
38 39
39 const uint8_t RTErequiredHigh = 2; 40 const uint8_t RTErequiredHigh = 2;
40 const uint8_t RTErequiredLow = 3; 41 const uint8_t RTErequiredLow = 3;
273 .scooterBattSize = 760, 274 .scooterBattSize = 760,
274 .scooterSPARE1[0] = 0, 275 .scooterSPARE1[0] = 0,
275 .scooterSPARE2[0] = 0, 276 .scooterSPARE2[0] = 0,
276 .ppo2sensors_deactivated = 0, 277 .ppo2sensors_deactivated = 0,
277 .tX_colorscheme = 0, 278 .tX_colorscheme = 0,
278 .tX_userselectedLeftLowerCornerPrimary = 1, 279 .tX_userselectedLeftLowerCornerPrimary = LLC_Temperature,
279 .tX_userselectedLeftLowerCornerTimeout = 0, 280 .tX_userselectedLeftLowerCornerTimeout = 0,
280 .tX_customViewPrimary = 1, 281 .tX_customViewPrimary = 1,
281 .tX_customViewTimeout = 0, 282 .tX_customViewTimeout = 0,
282 .timeoutEnterButtonSelectDive = 10, 283 .timeoutEnterButtonSelectDive = 10,
283 .logbookOffset = 0, 284 .logbookOffset = 0,
1159 corrections++; 1160 corrections++;
1160 } 1161 }
1161 1162
1162 /* uint8_t tX_userselectedLeftLowerCornerPrimary; 1163 /* uint8_t tX_userselectedLeftLowerCornerPrimary;
1163 */ 1164 */
1164 if(Settings.tX_userselectedLeftLowerCornerPrimary > 8) 1165 if(Settings.tX_userselectedLeftLowerCornerPrimary >= LLC_END)
1165 { 1166 {
1166 Settings.tX_userselectedLeftLowerCornerPrimary = 1; 1167 Settings.tX_userselectedLeftLowerCornerPrimary = LLC_Temperature;
1167 corrections++; 1168 corrections++;
1168 } 1169 }
1169 1170
1170 /* uint8_t tX_userselectedLeftLowerCornerTimeout; 1171 /* uint8_t tX_userselectedLeftLowerCornerTimeout;
1171 */ 1172 */