just some experimental settings

stancecoke · Nov 1, 2018 · c02ffed · c02ffed
1 parent 948f8f5
commit c02ffed
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/config.h b/config.h
@@ -51,7 +51,8 @@
 #define ANGLE_5_300 210
 #define TQS_CALIB 0.0
 #define ACA 4764
-#define EEPROM_INIT_MAGIC_BYTE 50 // makes sure (chance of fail 1/255) eeprom is invalidated after flashing new config
+#define EEPROM_NOINIT // eeprom will not be cleared
+#define EEPROM_INIT_MAGIC_BYTE 37 // makes sure (chance of fail 1/255) eeprom is invalidated after flashing new config
 #define ADC_BATTERY_VOLTAGE_K 68
 #define ACA_EXPERIMENTAL 128
 

diff --git a/...rimental settings/20181021-143341MESZ.ini → experimental settings/20181101-163749MEZ.ini b/...rimental settings/20181021-143341MESZ.ini → experimental settings/20181101-163749MEZ.ini
@@ -9,7 +9,7 @@
 150
 300
 50
-197
+238
 46
 1.6
 -110.4
@@ -30,7 +30,7 @@
 false
 64000
 35
-85
+127
 false
 true
 false

diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
@@ -42,6 +42,7 @@
           <in>stm8s_wwdg.h</in>
         </df>
         <df name="src">
+          <in>stm8s_adc1.asm</in>
           <in>stm8s_adc1.c</in>
           <in>stm8s_adc2.c</in>
           <in>stm8s_awu.c</in>
@@ -51,6 +52,7 @@
           <in>stm8s_clk.c</in>
           <in>stm8s_exti.asm</in>
           <in>stm8s_exti.c</in>
+          <in>stm8s_flash.asm</in>
           <in>stm8s_flash.c</in>
           <in>stm8s_gpio.asm</in>
           <in>stm8s_gpio.c</in>
@@ -62,7 +64,9 @@
           <in>stm8s_iwdg.c</in>
           <in>stm8s_rst.c</in>
           <in>stm8s_spi.c</in>
+          <in>stm8s_tim1.asm</in>
           <in>stm8s_tim1.c</in>
+          <in>stm8s_tim2.asm</in>
           <in>stm8s_tim2.c</in>
           <in>stm8s_tim3.c</in>
           <in>stm8s_tim4.c</in>

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -31,24 +31,29 @@
             <file>file:/G:/osebikefw/config.h</file>
             <file>file:/G:/osebikefw/BOdisplay.c</file>
             <file>file:/G:/osebikefw/ACAeeprom.c</file>
-            <file>file:/G:/osebikefw/pwm.c</file>
-            <file>file:/G:/osebikefw/main.c</file>
+            <file>file:/G:/osebikefw/StdPeriphLib/inc/stm8s.h</file>
             <file>file:/G:/osebikefw/Start_Compiling.bat</file>
-            <file>file:/G:/osebikefw/cruise_control.c</file>
             <file>file:/G:/osebikefw/ACAcontrollerState.c</file>
             <file>file:/G:/osebikefw/BOdisplay.h</file>
-            <file>file:/G:/osebikefw/ACAsetPoint.c</file>
             <file>file:/G:/osebikefw/ACAcontrollerState.h</file>
             <file>file:/G:/osebikefw/ACAcommons.h</file>
             <file>file:/G:/osebikefw/motor.c</file>
             <file>file:/G:/osebikefw/Makefile_linux</file>
-            <file>file:/G:/osebikefw/gpio.h</file>
             <file>file:/G:/osebikefw/StdPeriphLib/src/stm8s_tim1.c</file>
             <file>file:/G:/osebikefw/WriteOptionBytes.bat</file>
             <file>file:/G:/osebikefw/ACAeeprom.h</file>
-            <file>file:/G:/osebikefw/display.c</file>
             <file>file:/G:/osebikefw/Makefile_windows</file>
             <file>file:/G:/osebikefw/motor.h</file>
+            <file>file:/G:/osebikefw/display_kingmeter.h</file>
+            <file>file:/G:/osebikefw/pwm.c</file>
+            <file>file:/G:/osebikefw/main.c</file>
+            <file>file:/G:/osebikefw/cruise_control.c</file>
+            <file>file:/G:/osebikefw/display_kingmeter.c</file>
+            <file>file:/G:/osebikefw/ACAsetPoint.c</file>
+            <file>file:/G:/osebikefw/gpio.c</file>
+            <file>file:/G:/osebikefw/gpio.h</file>
+            <file>file:/G:/osebikefw/brake.c</file>
+            <file>file:/G:/osebikefw/display.c</file>
         </group>
     </open-files>
 </project-private>