diff 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
line wrap: on
line diff
--- a/Common/Inc/data_central.h	Sat Oct 06 15:02:11 2018 +0200
+++ b/Common/Inc/data_central.h	Thu Mar 07 15:06:43 2019 +0100
@@ -218,18 +218,6 @@
 	uint16_t	bottle_bar_age_MilliSeconds[2 * NUM_GASES + 1];
 	uint16_t	apnea_total_counter;
 
-	uint8_t		scooterSpeed;
-	uint8_t		scooterType;
-	uint16_t	scooterWattstunden;
-	uint16_t	scooterDrehzahl;
-	uint8_t		scooterRestkapazitaet;
-	uint8_t		scooterAmpere;
-	uint16_t	scooterTemperature;
-	uint16_t	scooterAgeInMilliSeconds;
-	float			scooterSpannung;
-	uint8_t		scooterRestkapazitaetWhBased;
-	uint8_t		scooterRestkapazitaetVoltageBased;
-
 	/* control of DataEX_copy_to_LifeData()
 	 */
 	uint8_t boolResetAverageDepth;
@@ -476,6 +464,4 @@
 
 _Bool is_ambient_pressure_close_to_surface(SLifeData *lifeData);
 
-uint8_t stateUsed_scooterRemainingBattCapacity(void);
-
 #endif // DATA_CENTRAL_H