Mercurial > public > ostc4

comparison Discovery/Src/settings.c @ 567:1c95f811967c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-Add 12HR Time Support -Add firmware image only font extensions -Show english units when required in log's graphs -Show decompression info with Font84 if 10 characters long -Remove usage of ' symbol to denote minutes and instead use min abbreviation -Show english units when required on the simulation configuration screen -Remove usage of ' symbol to denote feet in in non-metric mode and use ft abbrevation
author izzni
date Tue, 24 Nov 2020 13:22:23 -0600
parents 5d80bb8d22cb
children b1c489b503b9
comparison
equal deleted inserted replaced
566:7761dd028386 567:1c95f811967c
56 56
57 const SFirmwareData firmware_FirmwareData __attribute__( (section(".firmware_firmware_data")) ) = 57 const SFirmwareData firmware_FirmwareData __attribute__( (section(".firmware_firmware_data")) ) =
58 { 58 {
59 .versionFirst = 1, 59 .versionFirst = 1,
60 .versionSecond = 5, 60 .versionSecond = 5,
61 .versionThird = 5, 61 .versionThird = 6,
62 .versionBeta = 0, 62 .versionBeta = 0,
63 63
64 /* 4 bytes with trailing 0 */ 64 /* 4 bytes with trailing 0 */
65 .signature = "mh", 65 .signature = "mh",
66 66
320 .viewYaw = 0, 320 .viewYaw = 0,
321 .ppo2sensors_source = 0, 321 .ppo2sensors_source = 0,
322 .ppo2sensors_calibCoeff[0] = 0.0, 322 .ppo2sensors_calibCoeff[0] = 0.0,
323 .ppo2sensors_calibCoeff[1] = 0.0, 323 .ppo2sensors_calibCoeff[1] = 0.0,
324 .ppo2sensors_calibCoeff[2] = 0.0, 324 .ppo2sensors_calibCoeff[2] = 0.0,
325 .amPMTime = 0,
325 }; 326 };
326 327
327 /* Private function prototypes -----------------------------------------------*/ 328 /* Private function prototypes -----------------------------------------------*/
328 uint8_t checkValue(uint8_t value,uint8_t from, uint8_t to); 329 uint8_t checkValue(uint8_t value,uint8_t from, uint8_t to);
329 330
1431 Settings.ppo2sensors_calibCoeff[1] = 0.0; 1432 Settings.ppo2sensors_calibCoeff[1] = 0.0;
1432 Settings.ppo2sensors_calibCoeff[2] = 0.0; 1433 Settings.ppo2sensors_calibCoeff[2] = 0.0;
1433 corrections++; 1434 corrections++;
1434 } 1435 }
1435 1436
1437 if(Settings.amPMTime > 1) /* only boolean values allowed */
1438 {
1439 Settings.amPMTime = 0;
1440 corrections++;
1441 }
1436 if(corrections > 255) 1442 if(corrections > 255)
1437 return 255; 1443 return 255;
1438 else 1444 else
1439 return (uint8_t)corrections; 1445 return (uint8_t)corrections;
1440 } 1446 }