fixed eeprom buffer alignment, fixed phaseout includes

am32-firmware · Aug 8, 2024 · 614fb33 · 614fb33
1 parent 81b173f
commit 614fb33
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 1 deletion.
diff --git a/Inc/eeprom.h b/Inc/eeprom.h
@@ -50,8 +50,9 @@ typedef union EEprom_u {
         uint8_t tune[124]; // 52-175
         //eeprom v3
         uint8_t auto_advance; // 176
+        char unused[7]; //177-183
     };
-    uint8_t buffer[177];
+    uint8_t buffer[184];
 } EEprom_t;
 
 extern EEprom_t eepromBuffer;

diff --git a/Mcu/e230/Inc/phaseouts.h b/Mcu/e230/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(int newStep);

diff --git a/Mcu/f031/Inc/phaseouts.h b/Mcu/f031/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(int newStep);

diff --git a/Mcu/f051/Inc/phaseouts.h b/Mcu/f051/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(char newStep);

diff --git a/Mcu/f415/Inc/phaseouts.h b/Mcu/f415/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(int newStep);

diff --git a/Mcu/g071/Inc/phaseouts.h b/Mcu/g071/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(int newStep);

diff --git a/Mcu/g431/Inc/phaseouts.h b/Mcu/g431/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(int newStep);

diff --git a/Mcu/l431/Inc/phaseouts.h b/Mcu/l431/Inc/phaseouts.h
@@ -9,6 +9,7 @@
 #define INC_PHASEOUTS_H_
 
 #include "main.h"
+#include "common.h"
 
 void allOff();
 void comStep(char newStep);

diff --git a/Src/main.c b/Src/main.c
@@ -758,6 +758,13 @@ void loadEEpromSettings()
         high_rpm_level = motor_kv / 12 / (32 / eepromBuffer.motor_poles);				
     }
     reverse_speed_threshold = map(motor_kv, 300, 3000, 1000, 500);
+
+    if (eepromBuffer.eeprom_version > 2) {
+        if (eepromBuffer.auto_advance > 1) {
+            eepromBuffer.auto_advance = 0;
+            save_flash_nolib(eepromBuffer.buffer, sizeof(eepromBuffer.buffer), eeprom_address);
+        }
+    }
     //   reverse_speed_threshold = 200;
 //    if (!eepromBuffer.comp_pwm) {
 //        eepromBuffer.bi_direction = 0;