Mercurial > public > ostc4

changeset 320:117a7ec23385

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in janlmulder/ostc4/fix-version (pull request #27) bugfix: correct packed main version number in dive header
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Wed, 19 Jun 2019 13:12:25 +0000
parents bc31d078fb90 (current diff) d8e86af78474 (diff)
children 37ee61f93124 b43fa6a6c85a
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/settings.c	Wed Jun 19 13:12:01 2019 +0000
+++ b/Discovery/Src/settings.c	Wed Jun 19 13:12:25 2019 +0000
@@ -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)