Mercurial > public > ostc4
annotate ostc4pack/create_full_update_bin.sh @ 471:73da921869d9 fix-bat-2
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 | 9c77cfe8c2b2 |
| children | f4b553da620a |
| rev | line source |
|---|---|
| 163 | 1 #!/bin/bash |
| 2 | |
| 3 # | |
| 4 # path and file name settings | |
| 5 # | |
| 6 | |
| 7 # the build products are here | |
| 8 BUILD_PATH="$HOME/OSTC4workspace" | |
| 9 | |
| 10 # Debug or Release build | |
| 11 BUILD_TYPE="Release" | |
| 12 | |
| 13 # build project names | |
| 14 CPU1_DISCOVERY="CPU1-Discovery" | |
| 15 CPU1_FONTPACK="CPU1-FontPack" | |
| 16 CPU2_RTE="CPU2-RTE" | |
| 17 | |
| 18 # | |
| 19 # End of path and file name settings | |
| 20 # | |
| 21 | |
| 22 # | |
| 23 # Copy the bin files to pack. Build them seperately | |
| 24 # | |
| 25 cp $BUILD_PATH/$CPU1_DISCOVERY/$BUILD_TYPE/$CPU1_DISCOVERY.bin . | |
| 26 cp $BUILD_PATH/$CPU1_FONTPACK/$BUILD_TYPE/$CPU1_FONTPACK.bin . | |
| 27 cp $BUILD_PATH/$CPU2_RTE/$BUILD_TYPE/$CPU2_RTE.bin . | |
| 28 | |
| 29 # | |
| 30 # OSTC4pack_V4 all | |
| 31 # | |
| 32 ./src/OSTC4pack_V4 1 $CPU1_DISCOVERY.bin | |
| 33 ./src/OSTC4pack_V4 2 $CPU1_FONTPACK.bin | |
| 34 ./src/OSTC4pack_V4 0 $CPU2_RTE.bin | |
| 35 | |
| 36 # | |
| 37 # Final pack | |
| 38 # | |
| 39 ./src/checksum_final_add_fletcher ${CPU1_DISCOVERY}_upload.bin \ | |
| 40 ${CPU1_FONTPACK}_upload.bin \ | |
| 41 ${CPU2_RTE}_upload.bin |