# HG changeset patch
# User heinrichsweikamp <bitbucket@heinrichsweikamp.com>
# Date 1560949945 0
# Node ID 117a7ec23385f20e259a654a63f90e2637f7f2af
# Parent  bc31d078fb9006f90423db8c65d18dce751cd7f8# Parent  d8e86af78474c19b257df1f4dd2ea4d09e330b50
Merged in janlmulder/ostc4/fix-version (pull request #27)

bugfix: correct packed main version number in dive header

diff -r bc31d078fb90 -r 117a7ec23385 Discovery/Src/settings.c
--- 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)