souko/Kettenoeler
souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

removed unnececary stuff

Browse Source
This commit is contained in:
Marcel Peterkau 2022-03-08 23:03:10 +01:00
parent 3fffc1f0b1
commit 6e0b7581eb
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Software/ChainLube/src/config.cpp
View File

@ -92,6 +92,11 @@ void GetConfig_EEPROM()
LubeConfig.checksum = checksum; LubeConfig.checksum = checksum;
} }
uint16_t getPersistanceAddress()
{
return startofPersistence + eePersistenceMarker;
}
void StorePersistence_EEPROM() void StorePersistence_EEPROM()
{ {
if (PersistenceData.writeCycleCounter >= 0xFFF0) if (PersistenceData.writeCycleCounter >= 0xFFF0)
@ -99,16 +104,15 @@ void StorePersistence_EEPROM()
else else
PersistenceData.writeCycleCounter++; PersistenceData.writeCycleCounter++;
uint16_t PersistenceDataAddress = startofPersistence + eePersistenceMarker;
PersistenceData.checksum = 0; PersistenceData.checksum = 0;
PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)); PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
#if PCB_REVISION >= 12 #if PCB_REVISION >= 12
if (!ee.isConnected()) if (!ee.isConnected())
return; return;
ee.updateBlock(PersistenceDataAddress, (uint8_t *)&PersistenceData, sizeof(PersistenceData)); ee.updateBlock(getPersistanceAddress(), (uint8_t *)&PersistenceData, sizeof(PersistenceData));
#else #else
EEPROM.put(PersistenceDataAddress, PersistenceData); EEPROM.put(getPersistanceAddress(), PersistenceData);
EEPROM.commit(); EEPROM.commit();
EEPROM.end(); EEPROM.end();
#endif #endif
@ -125,12 +129,10 @@ void GetPersistence_EEPROM()
EEPROM.get(0, eePersistenceMarker); EEPROM.get(0, eePersistenceMarker);
#endif #endif
uint16_t PersistenceDataAddress = startofPersistence + eePersistenceMarker;
#if PCB_REVISION >= 12 #if PCB_REVISION >= 12
ee.readBlock(PersistenceDataAddress, (uint8_t *)&PersistenceData, sizeof(PersistenceData)); ee.readBlock(getPersistanceAddress(), (uint8_t *)&PersistenceData, sizeof(PersistenceData));
#else #else
EEPROM.get(PersistenceDataAddress, PersistenceData); EEPROM.get(getPersistanceAddress(), PersistenceData);
EEPROM.end(); EEPROM.end();
#endif #endif
@ -140,6 +142,7 @@ void GetPersistence_EEPROM()
if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum) if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)
{ {
Serial.printf(PSTR("Persistance EEPROM Checksum BAD\n")); Serial.printf(PSTR("Persistance EEPROM Checksum BAD\n"));
Serial.printf(PSTR("PSD Address: 0x%04X"), getPersistanceAddress());
FormatPersistence_EEPROM(); FormatPersistence_EEPROM();
} }
PersistenceData.checksum = checksum; PersistenceData.checksum = checksum;

1
Software/ChainLube/src/config.h
View File

@ -100,6 +100,7 @@ void FormatPersistence_EEPROM();
uint32_t Checksum_EEPROM(uint8_t const *data, size_t len); uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
void dumpEEPROM(uint16_t memoryAddress, uint16_t length); void dumpEEPROM(uint16_t memoryAddress, uint16_t length);
void MovePersistencePage_EEPROM(boolean reset); void MovePersistencePage_EEPROM(boolean reset);
uint16_t getPersistanceAddress();
extern LubeConfig_t LubeConfig; extern LubeConfig_t LubeConfig;
extern persistenceData_t PersistenceData; extern persistenceData_t PersistenceData;

10
Software/ChainLube/src/main.cpp
View File

@ -47,7 +47,6 @@ U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(-1);
CRGB leds[1]; CRGB leds[1];
// Function-Prototypes // Function-Prototypes
void updateWebUITicker_callback();
void IRAM_ATTR trigger_ISR(); void IRAM_ATTR trigger_ISR();
void LED_Process(uint8_t override = false, CRGB setColor = CRGB::White); void LED_Process(uint8_t override = false, CRGB setColor = CRGB::White);
void Display_Process(); void Display_Process();
@ -74,7 +73,6 @@ void RemoteDebug_dumpPersistance();
void wifiMaintainConnectionTicker_callback(); void wifiMaintainConnectionTicker_callback();
Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS); Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS);
#endif #endif
Ticker UpdateWebUITicker(updateWebUITicker_callback, 5000, 0, MILLIS);
Ticker EEPROMCyclicPDSTicker(EEPROMCyclicPDS_callback, 60000, 0, MILLIS); Ticker EEPROMCyclicPDSTicker(EEPROMCyclicPDS_callback, 60000, 0, MILLIS);
void setup() void setup()
@ -188,7 +186,6 @@ void setup()
u8x8.refreshDisplay(); u8x8.refreshDisplay();
initWebUI(); initWebUI();
UpdateWebUITicker.start();
EEPROMCyclicPDSTicker.start(); EEPROMCyclicPDSTicker.start();
Serial.println("Setup Done"); Serial.println("Setup Done");
} }
@ -213,7 +210,6 @@ void loop()
} }
RunLubeApp(wheelDistance); RunLubeApp(wheelDistance);
UpdateWebUITicker.update();
EEPROMCyclicPDSTicker.update(); EEPROMCyclicPDSTicker.update();
Display_Process(); Display_Process();
Button_Process(); Button_Process();
@ -330,6 +326,7 @@ void RemoteDebug_dumpPersistance()
debugA("tankRemain_µl: %d", PersistenceData.tankRemain_µl); debugA("tankRemain_µl: %d", PersistenceData.tankRemain_µl);
debugA("TravelDistance_highRes: %d", PersistenceData.TravelDistance_highRes); debugA("TravelDistance_highRes: %d", PersistenceData.TravelDistance_highRes);
debugA("checksum: %d", PersistenceData.checksum); debugA("checksum: %d", PersistenceData.checksum);
debugA("PSD Adress: 0x%04X", getPersistanceAddress());
} }
void RemoteDebug_printWifiInfo() void RemoteDebug_printWifiInfo()
@ -392,11 +389,6 @@ void wifiMaintainConnectionTicker_callback()
} }
#endif #endif
void updateWebUITicker_callback()
{
UpdateWebUI();
}
void EEPROMCyclicPDS_callback() void EEPROMCyclicPDS_callback()
{ {
StorePersistence_EEPROM(); StorePersistence_EEPROM();