comparison Common/Inc/data_central.h @ 160:e3ca52b8e7fa

Merge with FlipDisplay
author heinrichsweikamp
date Thu, 07 Mar 2019 15:06:43 +0100
parents cc9c18075e00
children 2bb1db22b5f5
comparison
equal deleted inserted replaced
80:cc2bb7bb8456 160:e3ca52b8e7fa
216 int32_t stopwatch_seconds; 216 int32_t stopwatch_seconds;
217 uint16_t bottle_bar[2 * NUM_GASES +1]; 217 uint16_t bottle_bar[2 * NUM_GASES +1];
218 uint16_t bottle_bar_age_MilliSeconds[2 * NUM_GASES + 1]; 218 uint16_t bottle_bar_age_MilliSeconds[2 * NUM_GASES + 1];
219 uint16_t apnea_total_counter; 219 uint16_t apnea_total_counter;
220 220
221 uint8_t scooterSpeed;
222 uint8_t scooterType;
223 uint16_t scooterWattstunden;
224 uint16_t scooterDrehzahl;
225 uint8_t scooterRestkapazitaet;
226 uint8_t scooterAmpere;
227 uint16_t scooterTemperature;
228 uint16_t scooterAgeInMilliSeconds;
229 float scooterSpannung;
230 uint8_t scooterRestkapazitaetWhBased;
231 uint8_t scooterRestkapazitaetVoltageBased;
232
233 /* control of DataEX_copy_to_LifeData() 221 /* control of DataEX_copy_to_LifeData()
234 */ 222 */
235 uint8_t boolResetAverageDepth; 223 uint8_t boolResetAverageDepth;
236 uint8_t boolResetStopwatch; 224 uint8_t boolResetStopwatch;
237 uint8_t bool_temp1; 225 uint8_t bool_temp1;
474 uint32_t CRC_CalcBlockCRC(uint32_t *buffer, uint32_t words); 462 uint32_t CRC_CalcBlockCRC(uint32_t *buffer, uint32_t words);
475 uint32_t CRC_CalcBlockCRC_moreThan768000(uint32_t *buffer1, uint32_t *buffer2, uint32_t words); 463 uint32_t CRC_CalcBlockCRC_moreThan768000(uint32_t *buffer1, uint32_t *buffer2, uint32_t words);
476 464
477 _Bool is_ambient_pressure_close_to_surface(SLifeData *lifeData); 465 _Bool is_ambient_pressure_close_to_surface(SLifeData *lifeData);
478 466
479 uint8_t stateUsed_scooterRemainingBattCapacity(void);
480
481 #endif // DATA_CENTRAL_H 467 #endif // DATA_CENTRAL_H