Mercurial > public > ostc4
comparison Discovery/Inc/logbook.h @ 472:8a375f0544d9
Merged in janlmulder/ostc4/fix-bat-2 (pull request #44)
bugfix: implement battery charge percentage in dive header
author | heinrichsweikamp <bitbucket@heinrichsweikamp.com> |
---|---|
date | Tue, 28 Apr 2020 15:37:47 +0000 |
parents | 73da921869d9 |
children | 3db9eba89e3c |
comparison
equal
deleted
inserted
replaced
470:dd0d0952ef35 | 472:8a375f0544d9 |
---|---|
73 uint16_t batteryVoltage; | 73 uint16_t batteryVoltage; |
74 uint16_t cnsAtBeginning; | 74 uint16_t cnsAtBeginning; |
75 uint8_t gfAtBeginning; | 75 uint8_t gfAtBeginning; |
76 uint8_t gfAtEnd; | 76 uint8_t gfAtEnd; |
77 uint16_t personalDiveCount; | 77 uint16_t personalDiveCount; |
78 uint8_t batteryCharge; | |
78 SSetpointLog setpoint[NUM_GAS]; | 79 SSetpointLog setpoint[NUM_GAS]; |
79 uint16_t maxCNS; | 80 uint16_t maxCNS; |
80 uint16_t averageDepth_mbar; | 81 uint16_t averageDepth_mbar; |
81 uint16_t total_diveTime_seconds; | 82 uint16_t total_diveTime_seconds; |
82 uint8_t salinity; | 83 uint8_t salinity; |
123 uint8_t samplingRate; | 124 uint8_t samplingRate; |
124 uint8_t cnsAtBeginning[2]; | 125 uint8_t cnsAtBeginning[2]; |
125 uint8_t gfAtBeginning; | 126 uint8_t gfAtBeginning; |
126 uint8_t gfAtEnd; | 127 uint8_t gfAtEnd; |
127 uint8_t personalDiveCount[2]; | 128 uint8_t personalDiveCount[2]; |
128 uint8_t CCRmode; | 129 uint8_t batteryCharge; |
129 uint8_t setpoint[5*2]; | 130 uint8_t setpoint[5*2]; |
130 uint8_t salinity; | 131 uint8_t salinity; |
131 uint8_t maxCNS[2]; | 132 uint8_t maxCNS[2]; |
132 uint8_t averageDepth_mbar[2]; | 133 uint8_t averageDepth_mbar[2]; |
133 uint8_t total_diveTime_seconds[2]; | 134 uint8_t total_diveTime_seconds[2]; |