diff --git a/Software/src/config.cpp b/Software/src/config.cpp index 749b38d..0de4ccd 100644 --- a/Software/src/config.cpp +++ b/Software/src/config.cpp @@ -273,11 +273,11 @@ uint32_t ConfigSanityCheck(bool autocorrect) LubeConfig.tankCapacity_ml = LubeConfig_defaults.tankCapacity_ml; } - if (!(LubeConfig.amountPerDose_µl > 0) || !(LubeConfig.amountPerDose_µl < 100)) + if (!(LubeConfig.amountPerDose_microL > 0) || !(LubeConfig.amountPerDose_microL < 100)) { setting_reset_bits = setting_reset_bits | (1 << 3); if (autocorrect) - LubeConfig.amountPerDose_µl = LubeConfig_defaults.amountPerDose_µl; + LubeConfig.amountPerDose_microL = LubeConfig_defaults.amountPerDose_microL; } if (!(LubeConfig.TankRemindAtPercentage >= 0) || !(LubeConfig.TankRemindAtPercentage <= 100)) diff --git a/Software/src/config.h b/Software/src/config.h index e081aa5..3682559 100644 --- a/Software/src/config.h +++ b/Software/src/config.h @@ -64,7 +64,7 @@ const size_t SpeedSourceString_Elements = sizeof(SpeedSourceString) / sizeof(Spe typedef struct { uint16_t writeCycleCounter = 0; - uint32_t tankRemain_µl = 0; + uint32_t tankRemain_microL = 0; uint32_t TravelDistance_highRes_mm = 0; uint32_t odometer_mm = 0; uint32_t odometer = 0; @@ -77,7 +77,7 @@ typedef struct uint32_t DistancePerLube_Default = 8000; uint32_t DistancePerLube_Rain = 4000; uint32_t tankCapacity_ml = 320; - uint32_t amountPerDose_µl = DEFAULT_PUMP_DOSE; + uint32_t amountPerDose_microL = DEFAULT_PUMP_DOSE; uint8_t TankRemindAtPercentage = 30; uint8_t PulsePerRevolution = 1; uint32_t TireWidth_mm = 150; diff --git a/Software/src/lubeapp.cpp b/Software/src/lubeapp.cpp index f6e47e2..906235b 100644 --- a/Software/src/lubeapp.cpp +++ b/Software/src/lubeapp.cpp @@ -5,9 +5,9 @@ uint32_t lubePulseTimestamp = 0; void RunLubeApp(uint32_t add_milimeters) { - globals.TankPercentage = PersistenceData.tankRemain_µl / (LubeConfig.tankCapacity_ml * 10); + globals.TankPercentage = PersistenceData.tankRemain_microL / (LubeConfig.tankCapacity_ml * 10); - MaintainDTC(DTC_TANK_EMPTY, DTC_CRITICAL, (PersistenceData.tankRemain_µl < LubeConfig.amountPerDose_µl)); + MaintainDTC(DTC_TANK_EMPTY, DTC_CRITICAL, (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL)); MaintainDTC(DTC_TANK_LOW, DTC_WARN, (globals.TankPercentage < LubeConfig.TankRemindAtPercentage)); static tSystem_Status preserverSysStatusError; @@ -121,13 +121,13 @@ void RunLubeApp(uint32_t add_milimeters) void LubePulse() { - if (PersistenceData.tankRemain_µl > 0) // Only Lube if theres Oil remaining! + if (PersistenceData.tankRemain_microL > 0) // Only Lube if theres Oil remaining! { lubePulseTimestamp = millis() + LUBE_PULSE_LENGHT_MS; - if (PersistenceData.tankRemain_µl < LubeConfig.amountPerDose_µl) // Prevent underrun and shiftover - PersistenceData.tankRemain_µl = 0; + if (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL) // Prevent underrun and shiftover + PersistenceData.tankRemain_microL = 0; else - PersistenceData.tankRemain_µl = PersistenceData.tankRemain_µl - LubeConfig.amountPerDose_µl; + PersistenceData.tankRemain_microL = PersistenceData.tankRemain_microL - LubeConfig.amountPerDose_microL; } } \ No newline at end of file diff --git a/Software/src/main.cpp b/Software/src/main.cpp index 5d2ec95..449fdb6 100644 --- a/Software/src/main.cpp +++ b/Software/src/main.cpp @@ -335,7 +335,7 @@ void RemoteDebug_dumpConfig() debugA("DistancePerLube_Default: %d", LubeConfig.DistancePerLube_Default); debugA("DistancePerLube_Rain: %d", LubeConfig.DistancePerLube_Rain); debugA("tankCapacity_ml: %d", LubeConfig.tankCapacity_ml); - debugA("amountPerDose_µl: %d", LubeConfig.amountPerDose_µl); + debugA("amountPerDose_microL: %d", LubeConfig.amountPerDose_microL); debugA("TankRemindAtPercentage: %d", LubeConfig.TankRemindAtPercentage); debugA("PulsePerRevolution: %d", LubeConfig.PulsePerRevolution); debugA("TireWidth_mm: %d", LubeConfig.TireWidth_mm); @@ -370,7 +370,7 @@ void RemoteDebug_dumpGlobals() void RemoteDebug_dumpPersistance() { debugA("writeCycleCounter: %d", PersistenceData.writeCycleCounter); - debugA("tankRemain_µl: %d", PersistenceData.tankRemain_µl); + debugA("tankRemain_microL: %d", PersistenceData.tankRemain_microL); debugA("TravelDistance_highRes_mm: %d", PersistenceData.TravelDistance_highRes_mm); debugA("checksum: %d", PersistenceData.checksum); debugA("PSD Adress: 0x%04X", globals.eePersistanceAdress); @@ -628,7 +628,7 @@ void Display_Process() else { u8x8.printf(PSTR("next Lube: %4dm\n"), DistRemain); - u8x8.printf(PSTR("Tank: %8dml\n"), PersistenceData.tankRemain_µl / 1000); + u8x8.printf(PSTR("Tank: %8dml\n"), PersistenceData.tankRemain_microL / 1000); u8x8.printf(PSTR("WiFi: %10s\n"), (WiFi.getMode() == WIFI_AP ? "AP" : WiFi.getMode() == WIFI_OFF ? "OFF" : WiFi.getMode() == WIFI_STA ? "CLIENT" : "UNKNOWN")); diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp index f0e5155..89375f8 100644 --- a/Software/src/webui.cpp +++ b/Software/src/webui.cpp @@ -51,7 +51,7 @@ void initWebUI() String processor(const String &var) { if (var == "TANK_REMAIN_CAPACITY") - return String((PersistenceData.tankRemain_µl / 10) / LubeConfig.tankCapacity_ml); + return String((PersistenceData.tankRemain_microL / 10) / LubeConfig.tankCapacity_ml); if (var == "LUBE_DISTANCE_NORMAL") return String(LubeConfig.DistancePerLube_Default); if (var == "LUBE_DISTANCE_RAIN") @@ -59,7 +59,7 @@ String processor(const String &var) if (var == "TANK_CAPACITY") return String(LubeConfig.tankCapacity_ml); if (var == "AMOUNT_PER_DOSE") - return String(LubeConfig.amountPerDose_µl); + return String(LubeConfig.amountPerDose_microL); if (var == "TANK_REMIND") return String(LubeConfig.TankRemindAtPercentage); if (var == "PULSE_PER_REV") @@ -99,7 +99,7 @@ String processor(const String &var) if (var == "PERSISTENCE_MARKER") return String(globals.eePersistanceAdress); if (var == "TANK_REMAIN_UL") - return String(PersistenceData.tankRemain_µl); + return String(PersistenceData.tankRemain_microL); if (var == "TRAVEL_DISTANCE_HIGHRES") return String(PersistenceData.TravelDistance_highRes_mm); if (var == "ODOMETER") @@ -298,7 +298,7 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request) if (p->name() == "tankwarn") LubeConfig.TankRemindAtPercentage = p->value().toInt(); if (p->name() == "pumppulse") - LubeConfig.amountPerDose_µl = p->value().toInt(); + LubeConfig.amountPerDose_microL = p->value().toInt(); if (p->name() == "oilsave") globals.requestEEAction = EE_CFG_SAVE; // end: POST Form Oiltank @@ -309,7 +309,7 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request) globals.requestEEAction = EE_CFG_SAVE; if (p->name() == "resettank") { - PersistenceData.tankRemain_µl = LubeConfig.tankCapacity_ml * 1000; + PersistenceData.tankRemain_microL = LubeConfig.tankCapacity_ml * 1000; globals.requestEEAction = EE_PDS_SAVE; } if (p->name() == "reset_ee_btn") @@ -459,7 +459,7 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request) config["DistancePerLube_Default"] = LubeConfig.DistancePerLube_Default; config["DistancePerLube_Rain"] = LubeConfig.DistancePerLube_Rain; config["tankCapacity_ml"] = LubeConfig.tankCapacity_ml; - config["amountPerDose_µl"] = LubeConfig.amountPerDose_µl; + config["amountPerDose_microL"] = LubeConfig.amountPerDose_microL; config["TankRemindAtPercentage"] = LubeConfig.TankRemindAtPercentage; config["PulsePerRevolution"] = LubeConfig.PulsePerRevolution; config["TireWidth_mm"] = LubeConfig.TireWidth_mm; @@ -488,7 +488,7 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request) JsonObject persis = json.createNestedObject("persis"); persis["writeCycleCounter"] = PersistenceData.writeCycleCounter; - persis["tankRemain_µl"] = PersistenceData.tankRemain_µl; + persis["tankRemain_microL"] = PersistenceData.tankRemain_microL; persis["TravelDistance_highRes_mm"] = PersistenceData.TravelDistance_highRes_mm; persis["odometer_mm"] = PersistenceData.odometer_mm; persis["odometer"] = PersistenceData.odometer;