From 97b1435eabf42e53c21821e15a46776312de8b3c Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 27 Jun 2023 16:20:02 -0400
Subject: [PATCH] more persistence state logging

---
 GDI-4ch/firmware/main.cpp        | 5 +++--
 GDI-4ch/firmware/persistence.cpp | 3 ++-
 GDI-4ch/firmware/uart.cpp        | 9 ++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/GDI-4ch/firmware/main.cpp b/GDI-4ch/firmware/main.cpp
index fb64790..d503cd9 100644
--- a/GDI-4ch/firmware/main.cpp
+++ b/GDI-4ch/firmware/main.cpp
@@ -36,6 +36,7 @@ static const SPIConfig spiCfg = {
 
 void GDIConfiguration::resetToDefaults() {
     version = PERSISTENCE_VERSION;
+    updateCounter = 20;
     inputCanID = GDI4_BASE_ADDRESS + 0x10;
 
 	BoostVoltage = 65;
@@ -97,7 +98,7 @@ bool Pt2001::init() {
 
 Pt2001 chip;
 
-mfs_error_t flashStartState;
+mfs_error_t flashState;
 
 /*
  * Application entry point.
@@ -108,7 +109,7 @@ int main() {
 
     // Fire up all of our threads
     InitPins();
-    flashStartState = InitFlash();
+    flashState = InitFlash();
     InitCan();
     InitUart();
 
diff --git a/GDI-4ch/firmware/persistence.cpp b/GDI-4ch/firmware/persistence.cpp
index 917ea74..7773e74 100644
--- a/GDI-4ch/firmware/persistence.cpp
+++ b/GDI-4ch/firmware/persistence.cpp
@@ -28,6 +28,7 @@ mfs_error_t InitFlash() {
 }
 
 extern GDIConfiguration configuration;
+extern mfs_error_t flashState;
 
 void ReadOrDefault() {
     size_t size = sizeof(GDIConfiguration);
@@ -41,7 +42,7 @@ void ReadOrDefault() {
 
 void saveConfiguration() {
   configuration.updateCounter++;
-  mfs_error_t writeErr = mfsWriteRecord(&mfs1, MFS_RECORD_ID, sizeof(GDIConfiguration), (uint8_t*)&configuration);
+  flashState = mfsWriteRecord(&mfs1, MFS_RECORD_ID, sizeof(GDIConfiguration), (uint8_t*)&configuration);
 }
 
 uint16_t float2short128(float value) {
diff --git a/GDI-4ch/firmware/uart.cpp b/GDI-4ch/firmware/uart.cpp
index b066644..44060ed 100644
--- a/GDI-4ch/firmware/uart.cpp
+++ b/GDI-4ch/firmware/uart.cpp
@@ -31,10 +31,11 @@ static const UARTConfig uartCfg =
 static char printBuffer[200];
 
 extern bool isOverallHappyStatus;
-extern mfs_error_t flashStartState;
+extern mfs_error_t flashState;
 extern int canWriteOk;
 extern int canWriteNotOk;
 extern Pt2001 chip;
+extern GDIConfiguration configuration;
 
 static int counter = 0;
 
@@ -56,11 +57,13 @@ static void UartThread(void*)
             );
 
         } else {
-            writeCount  = chsnprintf(printBuffer, sizeof(printBuffer), "HAPPY fault=%d status=%x status2=%x flash=%d %d CAN o/e %d %d\r\n",
+            writeCount  = chsnprintf(printBuffer, sizeof(printBuffer), "%d %d HAPPY fault=%d status=%x status2=%x flash=%d %d CAN o/e %d %d\r\n",
+                (int)(configuration.PumpPeakCurrent * 1000),
+                configuration.updateCounter,
                 (int)chip.fault,
                 chip.status,
                 chip.status5,
-                (int)flashStartState, counter,
+                (int)flashState, counter,
                 canWriteOk, canWriteNotOk);
 
             }