annotate Discovery/Inc/t7.h @ 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 f1257a32f2d4
children 9bb9a52d6ae5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1 ///////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
2 /// -*- coding: UTF-8 -*-
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
3 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
4 /// \file Discovery/Inc/t7.h
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
5 /// \brief Header file of Divemode with 7 windows plus plugin
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
6 /// \author heinrichs weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
7 /// \date 23-April-2014
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
8 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
9 /// $Id$
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
10 ///////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
11 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
12 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
13 /// This program is free software: you can redistribute it and/or modify
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
14 /// it under the terms of the GNU General Public License as published by
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
15 /// the Free Software Foundation, either version 3 of the License, or
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
16 /// (at your option) any later version.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
17 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
18 /// This program is distributed in the hope that it will be useful,
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
19 /// but WITHOUT ANY WARRANTY; without even the implied warranty of
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
20 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
21 /// GNU General Public License for more details.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
22 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
23 /// You should have received a copy of the GNU General Public License
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
24 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
25 //////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
26
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
27 /* Define to prevent recursive inclusion -------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
28 #ifndef T7_H
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
29 #define T7_H
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
30
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
31 /* Includes ------------------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
32 #include "stm32f4xx_hal.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
33 #include "gfx_engine.h"
446
f1257a32f2d4 Introduced configuration header for variant managment:
ideenmodellierer
parents: 442
diff changeset
34 #include "configuration.h"
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
35
442
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
36
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
37 typedef enum
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
38 {
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
39 LLC_Empty = 0,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
40 LLC_Temperature,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
41 LLC_AverageDepth,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
42 LLC_ppO2,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
43 LLC_Stopwatch,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
44 LLC_Ceiling,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
45 LLC_FutureTTS,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
46 LLC_CNS,
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
47 LLC_GF,
446
f1257a32f2d4 Introduced configuration header for variant managment:
ideenmodellierer
parents: 442
diff changeset
48 #ifdef ENABLE_BOTTLE_SENSOR
442
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
49 LCC_BottleBar,
446
f1257a32f2d4 Introduced configuration header for variant managment:
ideenmodellierer
parents: 442
diff changeset
50 #endif
442
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
51 LLC_END
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
52
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
53 } customview_llc_t;
adb18fe92737 Introduced enum for lower left corner view selection:
ideenmodellierer
parents: 369
diff changeset
54
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
55 /* Exported functions --------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
56 void t7_init(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
57
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
58 void t7_refresh(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
59 void t7_refresh_sleepmode_fun(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
60 void t7_refresh_customview_old(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
61
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
62 void t7_change_field(void);
361
b111fc4250e9 Pass action to customer vie update function.
Ideenmodellierer
parents: 38
diff changeset
63 void t7_change_customview(uint8_t action);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
64
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
65 void t7_set_field_to_primary(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
66 void t7_set_customview_to_primary(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
67
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
68 void init_t7_compass(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
69
369
210bffc496a3 Added a function to count the active custom views.
ideenmodellierer
parents: 361
diff changeset
70 uint8_t t7_GetEnabled_customviews();
210bffc496a3 Added a function to count the active custom views.
ideenmodellierer
parents: 361
diff changeset
71
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
72 /*
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
73 void t7c_refresh(uint32_t FramebufferStartAddress);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
74 */
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
75
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
76 #endif /* T7_H */