comparison Common/Inc/data_central.h @ 367:e309f78f89a5 MotionDetection

Merge default
author Ideenmodellierer
date Sat, 20 Jul 2019 21:42:45 +0200
parents b0045281cb2d
children 58200d756365
comparison
equal deleted inserted replaced
366:3c7030d6d67a 367:e309f78f89a5
149 { 149 {
150 SDevice device; 150 SDevice device;
151 SVpmRepetitiveData vpm; 151 SVpmRepetitiveData vpm;
152 } SDeviceState; 152 } SDeviceState;
153 */ 153 */
154
155 typedef struct
156 {
157 uint32_t average_depth_meter_Count;
158 uint32_t average_depth_last_update_dive_time_seconds_without_surface_time;
159 int32_t stopwatch_start_at_this_dive_time_seconds;
160 } SHelper;
161 154
162 /* struct SLifeData 155 /* struct SLifeData
163 * contains data all actual data (pressure, stuturation, etc. as received from second ship 156 * contains data all actual data (pressure, stuturation, etc. as received from second ship
164 * and has actualGas to be send to Small CPU (second chip) 157 * and has actualGas to be send to Small CPU (second chip)
165 * contains data calculated from actual data after receiption from Small CPU 158 * contains data calculated from actual data after receiption from Small CPU
211 float max_depth_meter; 204 float max_depth_meter;
212 float average_depth_meter; 205 float average_depth_meter;
213 float apnea_total_max_depth_meter; 206 float apnea_total_max_depth_meter;
214 float apnea_last_max_depth_meter; 207 float apnea_last_max_depth_meter;
215 int32_t apnea_last_dive_time_seconds; 208 int32_t apnea_last_dive_time_seconds;
216 int32_t stopwatch_seconds;
217 uint16_t bottle_bar[2 * NUM_GASES +1]; 209 uint16_t bottle_bar[2 * NUM_GASES +1];
218 uint16_t bottle_bar_age_MilliSeconds[2 * NUM_GASES + 1]; 210 uint16_t bottle_bar_age_MilliSeconds[2 * NUM_GASES + 1];
219 uint16_t apnea_total_counter; 211 uint16_t apnea_total_counter;
220 212
221 /* control of DataEX_copy_to_LifeData() 213 /* control of DataEX_copy_to_LifeData()
222 */ 214 */
223 uint8_t boolResetAverageDepth; 215 uint8_t boolResetAverageDepth;
224 uint8_t boolResetStopwatch;
225 uint8_t bool_temp1; 216 uint8_t bool_temp1;
226 uint8_t bool_temp2; 217 uint8_t bool_temp2;
227 218
228 /* from local sensor or direct HUD communication */ 219 /* from local sensor or direct HUD communication */
229 //pp O2 Sensor 220 //pp O2 Sensor
230 float ppO2Sensor_bar[3]; 221 float ppO2Sensor_bar[3];
231 float sensorVoltage_mV[3]; 222 float sensorVoltage_mV[3];
232 float HUD_battery_voltage_V; 223 float HUD_battery_voltage_V;
233
234 /* used by DataEX_copy_to_LifeData()
235 */
236 SHelper internal;
237 } SLifeData; 224 } SLifeData;
238 225
239 226
240 typedef struct 227 typedef struct
241 { 228 {