Mercurial > public > ostc4

changeset 472:8a375f0544d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in janlmulder/ostc4/fix-bat-2 (pull request #44) bugfix: implement battery charge percentage in dive header
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Tue, 28 Apr 2020 15:37:47 +0000
parents dd0d0952ef35 (current diff) 73da921869d9 (diff)
children 230aed360da0
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Inc/logbook.h	Wed Apr 15 07:01:11 2020 +0000
+++ b/Discovery/Inc/logbook.h	Tue Apr 28 15:37:47 2020 +0000
@@ -75,6 +75,7 @@
     uint8_t  gfAtBeginning;
     uint8_t  gfAtEnd;
     uint16_t personalDiveCount;
+    uint8_t  batteryCharge;
     SSetpointLog setpoint[NUM_GAS];
     uint16_t maxCNS;
     uint16_t averageDepth_mbar;
@@ -125,7 +126,7 @@
     uint8_t gfAtBeginning;
     uint8_t gfAtEnd;
     uint8_t personalDiveCount[2];
-    uint8_t CCRmode;
+    uint8_t batteryCharge;
     uint8_t setpoint[5*2];
     uint8_t salinity;
     uint8_t maxCNS[2];
--- a/Discovery/Src/logbook.c	Wed Apr 15 07:01:11 2020 +0000
+++ b/Discovery/Src/logbook.c	Tue Apr 28 15:37:47 2020 +0000
@@ -1287,6 +1287,7 @@
 		logbook_SetCompartmentDesaturation(pStateReal);
 		logbook_SetLastStop(pStateReal->diveSettings.last_stop_depth_bar);
 		gheader.batteryVoltage = pStateReal->lifeData.battery_voltage * 1000;
+		gheader.batteryCharge = pStateReal->lifeData.battery_charge;
 		logbook_EndDive();
 		bDiveMode = 0;
 	} else
@@ -1604,7 +1605,7 @@
 			memcpy(headerOSTC3.diveNumber, &pHead->diveNumber, 2);
 
 			headerOSTC3.diveMode = pHead->diveMode;
-			headerOSTC3.CCRmode = pHead->CCRmode;
+			headerOSTC3.batteryCharge = pHead->batteryCharge;
 
 			memcpy(headerOSTC3.n2CompartDesatTime_min,pHead->n2CompartDesatTime_min, 16);
 			memcpy(headerOSTC3.n2Compartments, pHead->n2Compartments, 64);