Mercurial > public > ostc4

comparison Discovery/Inc/logbook.h @ 471:73da921869d9 fix-bat-2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix: implement battery charge percentage in dive header This commit is (much) less trivial than the related 919e5cb51c92. First, rename the CCRmode attribute (corresponding to byte Ox59) of the SLogbookHeaderOSTC3. This byte (according to the hwOS interface document) does not contain any CCR related value, but it contains "battery information". Already since 2017, this byte is used from libdivecomputer to interface the charge percentage. So, its renamed from CCRmode to batteryCharge, to reflect its true purpose. Now, simply add a batteryCharge attribute to the SLogbookHeader (and see below why that is possible, without breaking things). The remaining changes are trivial to implement battery charge percentage in dive header. Caveat: do not get confused by the exact role of the individual logbook header types. SLogbookHeaderOSTC3 is the formal type of the logbook format that the OSTC4 produces. This format is supposed to identical to the format, as is used in hwOS for the series of small OSTCs. Only some values of attributes are different. For example, the OSTC4 supports VPM, so byte 0x79 (deco model used for this dive) also has a value for VPM. But the SLogbookHeader type, despite its name and structure, is *not* a true logbook header, as it includes attributes that are not available in the SLogbookHeaderOSTC3 formal header type. Signed-off-by: Jan Mulder <jan@jlmulder.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Wed, 22 Apr 2020 13:08:57 +0200
parents 5dd996ed8611
children 3db9eba89e3c
comparison
equal deleted inserted replaced
470:dd0d0952ef35 471:73da921869d9
73 uint16_t batteryVoltage; 73 uint16_t batteryVoltage;
74 uint16_t cnsAtBeginning; 74 uint16_t cnsAtBeginning;
75 uint8_t gfAtBeginning; 75 uint8_t gfAtBeginning;
76 uint8_t gfAtEnd; 76 uint8_t gfAtEnd;
77 uint16_t personalDiveCount; 77 uint16_t personalDiveCount;
78 uint8_t batteryCharge;
78 SSetpointLog setpoint[NUM_GAS]; 79 SSetpointLog setpoint[NUM_GAS];
79 uint16_t maxCNS; 80 uint16_t maxCNS;
80 uint16_t averageDepth_mbar; 81 uint16_t averageDepth_mbar;
81 uint16_t total_diveTime_seconds; 82 uint16_t total_diveTime_seconds;
82 uint8_t salinity; 83 uint8_t salinity;
123 uint8_t samplingRate; 124 uint8_t samplingRate;
124 uint8_t cnsAtBeginning[2]; 125 uint8_t cnsAtBeginning[2];
125 uint8_t gfAtBeginning; 126 uint8_t gfAtBeginning;
126 uint8_t gfAtEnd; 127 uint8_t gfAtEnd;
127 uint8_t personalDiveCount[2]; 128 uint8_t personalDiveCount[2];
128 uint8_t CCRmode; 129 uint8_t batteryCharge;
129 uint8_t setpoint[5*2]; 130 uint8_t setpoint[5*2];
130 uint8_t salinity; 131 uint8_t salinity;
131 uint8_t maxCNS[2]; 132 uint8_t maxCNS[2];
132 uint8_t averageDepth_mbar[2]; 133 uint8_t averageDepth_mbar[2];
133 uint8_t total_diveTime_seconds[2]; 134 uint8_t total_diveTime_seconds[2];