Mercurial > public > ostc4
view Discovery/Inc/motion.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 | 49a02dea8ae3 |
children | e3237f580ae9 |
line wrap: on
line source
/* * motion.h * * Created on: 20.05.2019 * Author: Thorsten Sonntag */ #ifndef INC_MOTION_H_ #define INC_MOTION_H_ /* exported data types */ #define CUSTOMER_DEFINED_VIEWS (100u) /* value will cause the function to detect the number of selected views */ #define CUSTOMER_KEEP_LAST_SECTORS (200u) /* do not update number of sectors, just define the new center position */ typedef enum { MOTION_DETECT_OFF = 0, MOTION_DETECT_SECTOR, MOTION_DETECT_MOVE, MOTION_DETECT_SCROLL, MOTION_DETECT_END } MotionDetectMethod_t; typedef enum { DETECT_START = 0, DETECT_POS_MOVE, DETECT_MAXIMA, DETECT_FALLBACK, DETECT_POS_PITCH, DETECT_NEG_MOVE, DETECT_MINIMA, DETECT_RISEBACK, DETECT_NEG_PITCH, DETECT_NOTHING } detectionState_t; typedef struct { float upperborder; /* current sector is changed if pitch exceeds these borders */ float lowerborder; uint8_t current; /* number of the current visible sector */ uint8_t target; /* used for sector switch => number of the sector which shall be finnaly displayed */ float offset; /* offset to adjust minimum pitch value used for detection to zero */ float size; /* delta of upper and lower boarder defining the sector in degree */ float window; /* defines which range of pitch values are used for detection */ float center; /* defines the offset from pitch to middle of active sector (avoid center position is close to the calculated borders) */ uint8_t count; /* number of sectors used for detection */ } SSector; void InitMotionDetection(void); void DefinePitchSectors(float centerAngle, uint8_t numOfSectors); detectionState_t detectPitch(float currentPitch); detectionState_t detectSectorButtonEvent(float curPitch); detectionState_t detectScrollButtonEvent(float curPitch); #endif /* INC_MOTION_H_ */