# HG changeset patch
# User heinrichsweikamp <bitbucket@heinrichsweikamp.com>
# Date 1589873238 0
# Node ID 230aed360da00ab0acf55049dc8fbdf7b575cbb1
# Parent  8a375f0544d9f4b4bb27f76ebe6c60a34b988358# Parent  89f6857276f82bd10bb652fbcb9251681df24f8a
Merged in Ideenmodellierer/ostc4/Improve_Button_Sleep (pull request #45)

Improve Button Sleep

diff -r 89f6857276f8 -r 230aed360da0 Discovery/Inc/logbook.h
--- a/Discovery/Inc/logbook.h	Mon May 18 21:51:08 2020 +0200
+++ b/Discovery/Inc/logbook.h	Tue May 19 07:27:18 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];
diff -r 89f6857276f8 -r 230aed360da0 Discovery/Src/logbook.c
--- a/Discovery/Src/logbook.c	Mon May 18 21:51:08 2020 +0200
+++ b/Discovery/Src/logbook.c	Tue May 19 07:27:18 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);