Mercurial > public > ostc4

comparison Discovery/Src/logbook.c @ 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 2c2df051e554
children 90d1f793dcf2
comparison
equal deleted inserted replaced
470:dd0d0952ef35 471:73da921869d9
1285 logbook_SetMinTemperature(min_temperature_float_celsius); 1285 logbook_SetMinTemperature(min_temperature_float_celsius);
1286 logbook_SetMaxCNS(pStateReal->lifeData.cns); 1286 logbook_SetMaxCNS(pStateReal->lifeData.cns);
1287 logbook_SetCompartmentDesaturation(pStateReal); 1287 logbook_SetCompartmentDesaturation(pStateReal);
1288 logbook_SetLastStop(pStateReal->diveSettings.last_stop_depth_bar); 1288 logbook_SetLastStop(pStateReal->diveSettings.last_stop_depth_bar);
1289 gheader.batteryVoltage = pStateReal->lifeData.battery_voltage * 1000; 1289 gheader.batteryVoltage = pStateReal->lifeData.battery_voltage * 1000;
1290 gheader.batteryCharge = pStateReal->lifeData.battery_charge;
1290 logbook_EndDive(); 1291 logbook_EndDive();
1291 bDiveMode = 0; 1292 bDiveMode = 0;
1292 } else 1293 } else
1293 { 1294 {
1294 ext_flash_enable_protection(); 1295 ext_flash_enable_protection();
1602 headerOSTC3.decoModel = pHead->decoModel; 1603 headerOSTC3.decoModel = pHead->decoModel;
1603 1604
1604 memcpy(headerOSTC3.diveNumber, &pHead->diveNumber, 2); 1605 memcpy(headerOSTC3.diveNumber, &pHead->diveNumber, 2);
1605 1606
1606 headerOSTC3.diveMode = pHead->diveMode; 1607 headerOSTC3.diveMode = pHead->diveMode;
1607 headerOSTC3.CCRmode = pHead->CCRmode; 1608 headerOSTC3.batteryCharge = pHead->batteryCharge;
1608 1609
1609 memcpy(headerOSTC3.n2CompartDesatTime_min,pHead->n2CompartDesatTime_min, 16); 1610 memcpy(headerOSTC3.n2CompartDesatTime_min,pHead->n2CompartDesatTime_min, 16);
1610 memcpy(headerOSTC3.n2Compartments, pHead->n2Compartments, 64); 1611 memcpy(headerOSTC3.n2Compartments, pHead->n2Compartments, 64);
1611 memcpy(headerOSTC3.heCompartDesatTime_min,pHead->heCompartDesatTime_min, 16); 1612 memcpy(headerOSTC3.heCompartDesatTime_min,pHead->heCompartDesatTime_min, 16);
1612 memcpy(headerOSTC3.heCompartments, pHead->heCompartments, 64); 1613 memcpy(headerOSTC3.heCompartments, pHead->heCompartments, 64);