annotate BootLoader/Src/settings_bootloader.c @ 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 7801c5d8a562
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
1 ///////////////////////////////////////////////////////////////////////////////
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
2 /// -*- coding: UTF-8 -*-
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
3 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
4 /// \file BootLoader/Src/settings_bootloader.c
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
5 /// \brief mini version for firmwareDataGetPointer() etc.
36
7801c5d8a562 Update author name for release
heinrichsweikamp
parents: 30
diff changeset
6 /// \author heinrichs weikamp gmbh
30
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
7 /// \date 21-March-2016
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
8 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
9 /// $Id$
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
10 ///////////////////////////////////////////////////////////////////////////////
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
11 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
12 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
13 /// This program is free software: you can redistribute it and/or modify
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
14 /// it under the terms of the GNU General Public License as published by
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
15 /// the Free Software Foundation, either version 3 of the License, or
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
16 /// (at your option) any later version.
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
17 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
18 /// This program is distributed in the hope that it will be useful,
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
19 /// but WITHOUT ANY WARRANTY; without even the implied warranty of
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
20 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
21 /// GNU General Public License for more details.
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
22 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
23 /// You should have received a copy of the GNU General Public License
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
24 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
25 //////////////////////////////////////////////////////////////////////////////
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
26
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
27 /* Includes ------------------------------------------------------------------*/
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
28 #include <string.h>
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
29 #include "settings.h"
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
30
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
31 /* always at 0x8080000, do not move -> bootloader access */
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
32 const SFirmwareData* firmwareDataGetPointer(void)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
33 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
34 return (const SFirmwareData*)(0x08040000 + 0x00010000);
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
35 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
36
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
37
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
38 void getActualRTEandFONTversion(uint8_t *RTEhigh, uint8_t *RTElow, uint8_t *FONThigh, uint8_t *FONTlow)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
39 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
40 if(RTEhigh && RTElow)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
41 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
42 *RTEhigh = 0;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
43 *RTElow = 0;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
44 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
45 if(FONThigh && FONTlow)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
46 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
47 *FONThigh = *(uint8_t *)0x08132000;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
48 *FONTlow = *(uint8_t *)0x08132001;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
49 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
50 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
51
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
52
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
53 uint8_t getLicence(void)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
54 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
55 //return 0xFF;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
56 //return LICENCEBONEX;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
57 return hardwareDataGetPointer()->primaryLicence;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
58 }