Mercurial > public > ostc4

comparison Discovery/Src/settings.c @ 367:e309f78f89a5 MotionDetection

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge default
author Ideenmodellierer
date Sat, 20 Jul 2019 21:42:45 +0200
parents d4d8d717e9a7
children 143fe85f82a2 50ea68c7a153
comparison
equal deleted inserted replaced
366:3c7030d6d67a 367:e309f78f89a5
34 #include "tHome.h" // for CVIEW_END 34 #include "tHome.h" // for CVIEW_END
35 35
36 SSettings Settings; 36 SSettings Settings;
37 37
38 const uint8_t RTErequiredHigh = 1; 38 const uint8_t RTErequiredHigh = 1;
39 const uint8_t RTErequiredLow = 8; 39 const uint8_t RTErequiredLow = 9;
40 40
41 const uint8_t FONTrequiredHigh = 1; 41 const uint8_t FONTrequiredHigh = 1;
42 const uint8_t FONTrequiredLow = 0; 42 const uint8_t FONTrequiredLow = 0;
43 43
44 uint8_t RTEactualHigh = 0; 44 uint8_t RTEactualHigh = 0;
53 53
54 const SFirmwareData firmware_FirmwareData __attribute__( (section(".firmware_firmware_data")) ) = 54 const SFirmwareData firmware_FirmwareData __attribute__( (section(".firmware_firmware_data")) ) =
55 { 55 {
56 .versionFirst = 1, 56 .versionFirst = 1,
57 .versionSecond = 4, 57 .versionSecond = 4,
58 .versionThird = 8, 58 .versionThird = 9,
59 .versionBeta = 0, 59 .versionBeta = 1,
60 60
61 /* 4 bytes with trailing 0 */ 61 /* 4 bytes with trailing 0 */
62 .signature = "mh", 62 .signature = "mh",
63 63
64 .release_year = 19, 64 .release_year = 19,
1389 } 1389 }
1390 1390
1391 1391
1392 uint8_t firmwareVersion_16bit_high(void) 1392 uint8_t firmwareVersion_16bit_high(void)
1393 { 1393 {
1394 return ((firmware_FirmwareData.versionFirst & 0x1F) << 3) + ((firmware_FirmwareData.versionSecond & 0x1C) >> 5); 1394 return ((firmware_FirmwareData.versionFirst & 0x1F) << 3) + ((firmware_FirmwareData.versionSecond & 0x1C) >> 2);
1395 } 1395 }
1396 1396
1397 uint8_t firmwareVersion_16bit_low(void) 1397 uint8_t firmwareVersion_16bit_low(void)
1398 { 1398 {
1399 return ((firmware_FirmwareData.versionSecond & 0x03) << 6) + ((firmware_FirmwareData.versionThird & 0x1F) << 1) + (firmware_FirmwareData.versionBeta & 0x01); 1399 return ((firmware_FirmwareData.versionSecond & 0x03) << 6) + ((firmware_FirmwareData.versionThird & 0x1F) << 1) + (firmware_FirmwareData.versionBeta & 0x01);