From 6e0b7581eb055dc68796d8a189339f2eb2431c23 Mon Sep 17 00:00:00 2001
From: Marcel Peterkau <marcel@peterkau.de>
Date: Tue, 8 Mar 2022 23:03:10 +0100
Subject: [PATCH] removed unnececary stuff

---
 Software/ChainLube/src/config.cpp | 17 ++++++++++-------
 Software/ChainLube/src/config.h   |  1 +
 Software/ChainLube/src/main.cpp   | 14 +++-----------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Software/ChainLube/src/config.cpp b/Software/ChainLube/src/config.cpp
index f71021c..4112654 100644
--- a/Software/ChainLube/src/config.cpp
+++ b/Software/ChainLube/src/config.cpp
@@ -92,6 +92,11 @@ void GetConfig_EEPROM()
   LubeConfig.checksum = checksum;
 }
 
+uint16_t getPersistanceAddress()
+{
+  return startofPersistence + eePersistenceMarker;
+}
+
 void StorePersistence_EEPROM()
 {
   if (PersistenceData.writeCycleCounter >= 0xFFF0)
@@ -99,16 +104,15 @@ void StorePersistence_EEPROM()
   else
     PersistenceData.writeCycleCounter++;
 
-  uint16_t PersistenceDataAddress = startofPersistence + eePersistenceMarker;
   PersistenceData.checksum = 0;
   PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
 
 #if PCB_REVISION >= 12
   if (!ee.isConnected())
     return;
-  ee.updateBlock(PersistenceDataAddress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+  ee.updateBlock(getPersistanceAddress(), (uint8_t *)&PersistenceData, sizeof(PersistenceData));
 #else
-  EEPROM.put(PersistenceDataAddress, PersistenceData);
+  EEPROM.put(getPersistanceAddress(), PersistenceData);
   EEPROM.commit();
   EEPROM.end();
 #endif
@@ -125,12 +129,10 @@ void GetPersistence_EEPROM()
   EEPROM.get(0, eePersistenceMarker);
 #endif
 
-  uint16_t PersistenceDataAddress = startofPersistence + eePersistenceMarker;
-
 #if PCB_REVISION >= 12
-  ee.readBlock(PersistenceDataAddress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+  ee.readBlock(getPersistanceAddress(), (uint8_t *)&PersistenceData, sizeof(PersistenceData));
 #else
-  EEPROM.get(PersistenceDataAddress, PersistenceData);
+  EEPROM.get(getPersistanceAddress(), PersistenceData);
   EEPROM.end();
 #endif
 
@@ -140,6 +142,7 @@ void GetPersistence_EEPROM()
   if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)
   {
     Serial.printf(PSTR("Persistance EEPROM Checksum BAD\n"));
+    Serial.printf(PSTR("PSD Address: 0x%04X"), getPersistanceAddress());
     FormatPersistence_EEPROM();
   }
   PersistenceData.checksum = checksum;
diff --git a/Software/ChainLube/src/config.h b/Software/ChainLube/src/config.h
index cc7e07c..13680d8 100644
--- a/Software/ChainLube/src/config.h
+++ b/Software/ChainLube/src/config.h
@@ -100,6 +100,7 @@ void FormatPersistence_EEPROM();
 uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
 void dumpEEPROM(uint16_t memoryAddress, uint16_t length);
 void MovePersistencePage_EEPROM(boolean reset);
+uint16_t getPersistanceAddress();
 
 extern LubeConfig_t LubeConfig;
 extern persistenceData_t PersistenceData;
diff --git a/Software/ChainLube/src/main.cpp b/Software/ChainLube/src/main.cpp
index 153506e..e555809 100644
--- a/Software/ChainLube/src/main.cpp
+++ b/Software/ChainLube/src/main.cpp
@@ -47,7 +47,6 @@ U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(-1);
 CRGB leds[1];
 
 // Function-Prototypes
-void updateWebUITicker_callback();
 void IRAM_ATTR trigger_ISR();
 void LED_Process(uint8_t override = false, CRGB setColor = CRGB::White);
 void Display_Process();
@@ -74,7 +73,6 @@ void RemoteDebug_dumpPersistance();
 void wifiMaintainConnectionTicker_callback();
 Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS);
 #endif
-Ticker UpdateWebUITicker(updateWebUITicker_callback, 5000, 0, MILLIS);
 Ticker EEPROMCyclicPDSTicker(EEPROMCyclicPDS_callback, 60000, 0, MILLIS);
 
 void setup()
@@ -188,7 +186,6 @@ void setup()
   u8x8.refreshDisplay();
 
   initWebUI();
-  UpdateWebUITicker.start();
   EEPROMCyclicPDSTicker.start();
   Serial.println("Setup Done");
 }
@@ -213,7 +210,6 @@ void loop()
   }
 
   RunLubeApp(wheelDistance);
-  UpdateWebUITicker.update();
   EEPROMCyclicPDSTicker.update();
   Display_Process();
   Button_Process();
@@ -330,6 +326,7 @@ void RemoteDebug_dumpPersistance()
   debugA("tankRemain_µl: %d", PersistenceData.tankRemain_µl);
   debugA("TravelDistance_highRes: %d", PersistenceData.TravelDistance_highRes);
   debugA("checksum: %d", PersistenceData.checksum);
+  debugA("PSD Adress: 0x%04X", getPersistanceAddress());
 }
 
 void RemoteDebug_printWifiInfo()
@@ -392,11 +389,6 @@ void wifiMaintainConnectionTicker_callback()
 }
 #endif
 
-void updateWebUITicker_callback()
-{
-  UpdateWebUI();
-}
-
 void EEPROMCyclicPDS_callback()
 {
   StorePersistence_EEPROM();
@@ -586,8 +578,8 @@ void Display_Process()
     u8x8.printf(PSTR("next Lube: %4dm\n"), DistRemain);
     u8x8.printf(PSTR("Tank: %8dml\n"), PersistenceData.tankRemain_µl / 1000);
     u8x8.printf(PSTR("WiFi: %10s\n"), (WiFi.getMode() == WIFI_AP ? "AP" : WiFi.getMode() == WIFI_OFF ? "OFF"
-                                                                : WiFi.getMode() == WIFI_STA   ? "CLIENT"
-                                                                                               : "UNKNOWN"));
+                                                                      : WiFi.getMode() == WIFI_STA   ? "CLIENT"
+                                                                                                     : "UNKNOWN"));
     u8x8.printf(PSTR("Source: %8s\n"), SpeedSourceString[LubeConfig.SpeedSource]);
     u8x8.printf("%s\n", WiFi.localIP().toString().c_str());
   }