From a7ea17ef058436576366bf5a98222a1ad3be514c Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Tue, 9 Jan 2024 13:12:09 +0100 Subject: [PATCH] changed Config-Default-code --- Software/include/config.h | 50 +++++++++++++++++++-------------------- Software/src/config.cpp | 2 ++ 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/Software/include/config.h b/Software/include/config.h index cd5360c..c77e016 100644 --- a/Software/include/config.h +++ b/Software/include/config.h @@ -82,36 +82,36 @@ const size_t CANSourceString_Elements = sizeof(CANSourceString) / sizeof(CANSour // Structure for persistence data stored in EEPROM typedef struct { - uint16_t writeCycleCounter = 0; - uint32_t tankRemain_microL = 0; - uint32_t TravelDistance_highRes_mm = 0; - uint32_t odometer_mm = 0; - uint32_t odometer = 0; - uint32_t checksum = 0; + uint16_t writeCycleCounter; + uint32_t tankRemain_microL; + uint32_t TravelDistance_highRes_mm; + uint32_t odometer_mm; + uint32_t odometer; + uint32_t checksum; } persistenceData_t; // Structure for configuration settings stored in EEPROM typedef struct { - uint8_t EEPROM_Version = 0; - uint32_t DistancePerLube_Default = 8000; - uint32_t DistancePerLube_Rain = 4000; - uint32_t tankCapacity_ml = 320; - uint32_t amountPerDose_microL = DEFAULT_PUMP_DOSE; - uint8_t TankRemindAtPercentage = 30; - uint8_t PulsePerRevolution = 1; - uint32_t TireWidth_mm = 150; - uint32_t TireWidthHeight_Ratio = 70; - uint32_t RimDiameter_Inch = 18; - uint32_t DistancePerRevolution_mm = 2000; - uint16_t BleedingPulses = 25; - SpeedSource_t SpeedSource = SOURCE_IMPULSE; - GPSBaudRate_t GPSBaudRate = BAUD_115200; - CANSource_t CANSource = KTM_890_ADV_R_2021; - bool LED_Mode_Flash = false; - uint8_t LED_Max_Brightness = 255; - uint8_t LED_Min_Brightness = 5; - uint32_t checksum = 0; + uint8_t EEPROM_Version; + uint32_t DistancePerLube_Default; + uint32_t DistancePerLube_Rain; + uint32_t tankCapacity_ml; + uint32_t amountPerDose_microL; + uint8_t TankRemindAtPercentage; + uint8_t PulsePerRevolution; + uint32_t TireWidth_mm; + uint32_t TireWidthHeight_Ratio; + uint32_t RimDiameter_Inch; + uint32_t DistancePerRevolution_mm; + uint16_t BleedingPulses; + SpeedSource_t SpeedSource; + GPSBaudRate_t GPSBaudRate; + CANSource_t CANSource; + bool LED_Mode_Flash; + uint8_t LED_Max_Brightness; + uint8_t LED_Min_Brightness; + uint32_t checksum; } LubeConfig_t; // Default configuration settings diff --git a/Software/src/config.cpp b/Software/src/config.cpp index 041a462..a4f9733 100644 --- a/Software/src/config.cpp +++ b/Software/src/config.cpp @@ -36,6 +36,8 @@ boolean checkEEPROMavailable(); */ void InitEEPROM() { + LubeConfig = LubeConfig_defaults; + PersistenceData = {0}; ee.begin(); checkEEPROMavailable(); }