Merge branch 'master' of https://github.com/eez-open/modular-psu-firm…

…ware
eez-open · Sep 17, 2020 · 7b7fb7b · 7b7fb7b
2 parents 0eb36e6 + 9e48166
commit 7b7fb7b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/eez/firmware.cpp b/src/eez/firmware.cpp
@@ -368,7 +368,9 @@ void shutdown() {
 
     g_shutdownInProgress = true;
 
+#if OPTION_ETHERNET
     ethernet::update();
+#endif
 
 #if !defined(__EMSCRIPTEN__)
     // shutdown SCPI thread

diff --git a/src/eez/modules/bp3c/eeprom.cpp b/src/eez/modules/bp3c/eeprom.cpp
@@ -115,9 +115,12 @@ bool read(uint8_t slotIndex, uint8_t *buffer, uint16_t bufferSize, uint16_t addr
     size_t readBytes = fread(buffer, 1, bufferSize, fp);
     fclose(fp);
 
-    return readBytes == bufferSize;
+    if (readBytes == 4) {
+        readBytes += 2;
+        ((uint16_t *)buffer)[2] = 0xA5A5;
+    }
 
-    return true;
+    return readBytes == bufferSize;
 #endif
 
 }
@@ -211,9 +214,10 @@ bool test() {
 void writeModuleType(uint8_t slotIndex, uint16_t moduleType) {
     uint16_t buffer[] = {
         moduleType,
-        getModule(moduleType)->latestModuleRevision
+        getModule(moduleType)->latestModuleRevision,
+        0xA5A5
     };
-    write(slotIndex, (uint8_t *)buffer, 4, 0);
+    write(slotIndex, (uint8_t *)buffer, sizeof(buffer), 0);
 }
 
 void resetAllExceptOnTimeCounters(uint8_t slotIndex) {