Mercurial > public > ostc4

annotate Small_CPU/Inc/pressure.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 4093ac18b25c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1 /* Define to prevent recursive inclusion -------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
2 #ifndef PRESSURE_H
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
3 #define PRESSURE_H
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
4
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
5 #include <stdint.h>
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
6
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
7 uint8_t init_pressure(void);
339
37f45300bc2e Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents: 276
diff changeset
8 void pressure_set_offset (float pressureOffset, float temperatureOffset);
37f45300bc2e Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents: 276
diff changeset
9
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
10 uint8_t pressure_update(void);
276
8e9c502c0b06 Rework pressure/ temperature data aquisition
ideenmodellierer
parents: 38
diff changeset
11 void pressure_update_alternating(void);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
12
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
13 uint8_t is_init_pressure_done(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
14
276
8e9c502c0b06 Rework pressure/ temperature data aquisition
ideenmodellierer
parents: 38
diff changeset
15 HAL_StatusTypeDef pressure_sensor_get_pressure_raw(void);
8e9c502c0b06 Rework pressure/ temperature data aquisition
ideenmodellierer
parents: 38
diff changeset
16 HAL_StatusTypeDef pressure_sensor_get_temperature_raw(void);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
17 void pressure_calculation(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
18
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
19 float get_temperature(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
20 float get_pressure_mbar(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
21 float get_surface_mbar(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
22
345
4093ac18b25c Added function to evaluate the state of the surface pressure history memory
ideenmodellierer
parents: 339
diff changeset
23 uint8_t is_surface_pressure_stable(void);
4093ac18b25c Added function to evaluate the state of the surface pressure history memory
ideenmodellierer
parents: 339
diff changeset
24 float set_last_surface_pressure_stable(void);
4093ac18b25c Added function to evaluate the state of the surface pressure history memory
ideenmodellierer
parents: 339
diff changeset
25
339
37f45300bc2e Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents: 276
diff changeset
26 void init_surface_ring(uint8_t force);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
27 void update_surface_pressure(uint8_t call_rhythm_seconds);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
28
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
29 uint32_t demo_modify_temperature_and_pressure(int32_t divetime_in_seconds, uint8_t subseconds, float ceiling_mbar);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
30
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
31 #endif /* PRESSURE_H */
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
32