dma bs

Zer0-bit · Jun 19, 2023 · 8427ec6 · 8427ec6
1 parent dbe04a7
commit 8427ec6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/eeprom_data/eeprom_data.cpp b/src/eeprom_data/eeprom_data.cpp
@@ -189,8 +189,9 @@ bool eepromWrite(eepromValues_t eepromValuesNew) {
   eepromMetadata.version = EEPROM_DATA_VERSION;
   eepromMetadata.values = eepromValuesNew;
   eepromMetadata.versionTimestampXOR = eepromMetadata.timestamp ^ eepromMetadata.version;
+  EEPROM.put(0, eepromMetadata);
 
-  dmaWriteCurrentMetadata();
+  // dmaWriteCurrentMetadata();
 
   return true;
 }

diff --git a/src/gaggiuino.ino b/src/gaggiuino.ino
@@ -77,7 +77,7 @@ void setup(void) {
   thermocoupleInit();
   LOG_INFO("Thermocouple Init");
 
-  lcdUploadCfg(runningCfg);
+  lcdUploadCfg(runningCfg, systemState);
   LOG_INFO("LCD cfg uploaded");
 
   adsInit();
@@ -481,7 +481,7 @@ void lcdRefreshElementsTrigger(void) {
   }
 
   // Make the necessary changes
-  uploadPageCfg(eepromCurrentValues);
+  uploadPageCfg(eepromCurrentValues, systemState);
   // refresh the screen elements
   pageValuesRefresh();
 }

diff --git a/src/lcd/lcd.h b/src/lcd/lcd.h
@@ -33,8 +33,8 @@ extern volatile NextionPage lcdLastCurrentPageId;
 void lcdInit(void);
 bool lcdCheckSerialInit(const char* expectedOutput, size_t expectedLen);
 void lcdUploadProfile(eepromValues_t &eepromCurrentValues);
-void lcdUploadCfg(eepromValues_t &eepromCurrentValues);
-void uploadPageCfg(eepromValues_t &eepromCurrentValues);
+void lcdUploadCfg(eepromValues_t &eepromCurrentValues, SystemState &sys);
+void uploadPageCfg(eepromValues_t &eepromCurrentValues, SystemState &sys);
 void lcdListen(void);
 void lcdWakeUp(void);
 

diff --git a/src/lcd/nextion.cpp b/src/lcd/nextion.cpp
@@ -137,7 +137,7 @@ void lcdUploadProfile(eepromValues_t &eepromCurrentValues) {
 }
 
 // This is never called again after boot
-void lcdUploadCfg(eepromValues_t &eepromCurrentValues) {
+void lcdUploadCfg(eepromValues_t &eepromCurrentValues, SystemState &sys) {
   // bool profileType = false;
 
   // Profile names for all buttons
@@ -167,11 +167,14 @@ void lcdUploadCfg(eepromValues_t &eepromCurrentValues) {
 
   // Led
   myNex.writeNum("ledOn", eepromCurrentValues.ledState);
+  sys.ledColours[0] = eepromCurrentValues.ledR;
+  sys.ledColours[1] = eepromCurrentValues.ledR;
+  sys.ledColours[2] = eepromCurrentValues.ledB;
 
   lcdUploadProfile(eepromCurrentValues);
 }
 
-void uploadPageCfg(eepromValues_t &eepromCurrentValues) {
+void uploadPageCfg(eepromValues_t &eepromCurrentValues, SystemState &sys) {
   // Updating only page specific elements as necessary to speed up things and avoid needless writes.
   switch (lcdCurrentPageId) {
     case NextionPage::BrewPreinfusion:
@@ -252,7 +255,7 @@ void uploadPageCfg(eepromValues_t &eepromCurrentValues) {
       }
       break;
     default:
-      lcdUploadCfg(eepromCurrentValues);
+      lcdUploadCfg(eepromCurrentValues, sys);
       break;
   }
 }