Mercurial > public > ostc4

diff 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
line wrap: on
line diff
--- a/Discovery/Src/settings.c	Mon Jun 17 19:56:38 2019 +0200
+++ b/Discovery/Src/settings.c	Sat Jul 20 21:42:45 2019 +0200
@@ -36,7 +36,7 @@
 SSettings Settings;
 
 const uint8_t RTErequiredHigh = 1;
-const uint8_t RTErequiredLow = 8;
+const uint8_t RTErequiredLow = 9;
 
 const uint8_t FONTrequiredHigh = 1;
 const uint8_t FONTrequiredLow =	0;
@@ -55,8 +55,8 @@
 {
     .versionFirst   = 1,
     .versionSecond 	= 4,
-    .versionThird   = 8,
-    .versionBeta    = 0,
+    .versionThird   = 9,
+    .versionBeta    = 1,
 
     /* 4 bytes with trailing 0 */
     .signature = "mh",
@@ -1391,7 +1391,7 @@
 
 uint8_t firmwareVersion_16bit_high(void)
 {
-    return ((firmware_FirmwareData.versionFirst & 0x1F)  << 3)	+ ((firmware_FirmwareData.versionSecond & 0x1C) >> 5);
+    return ((firmware_FirmwareData.versionFirst & 0x1F)  << 3)	+ ((firmware_FirmwareData.versionSecond & 0x1C) >> 2);
 }
 
 uint8_t firmwareVersion_16bit_low(void)