backToSpiffsMergeFixes

Author: mooiweertje

.github/workflows/main.yml

@@ -1,9 +1,9 @@
 name: CI
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "**" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "**" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

main/Kconfig.projbuild

@@ -104,4 +104,3 @@ menu "Sparta Ion Config"
         default n
 
 endmenu
-

main/bat.cpp

@@ -151,11 +151,6 @@ static uint8_t batMvToPercentage(uint32_t batMv) {
 void measureBat() {
     batMv = measureBatMv();
 
-<<<<<<< HEAD
-    history += batMv;
-    uint32_t avg = history >> 7;
-    history -= avg;
-=======
 	// This is provided by 'mooiweertje' and is pretty much similar to Simple Exponential Smoothing (https://en.wikipedia.org/wiki/Exponential_smoothing).
 	// By using an alpha of 1/128, and storing the smoothed value scaled by 128 in history, this can be written very efficiently though,
 	// and the scaled value allows us to work with integers instead of floating point.
@@ -164,7 +159,6 @@ void measureBat() {
 	history += batMv;
 	uint32_t avg = history >> 7;
 	history -= avg;
->>>>>>> 9e922f8 (Add a bit of comments on the new adc code)
 
     batPercentage = batMvToPercentage(avg);
 }

main/charge.cpp

@@ -2,8 +2,6 @@
 #include "storage.h"
 #include "charge.h"
 
-#define CHARGE_FILE "/littlefs/charge.bin"
-
 // note that Ah is not real Ah but a relative Ah measurement based on ADC and timer.
 
 struct chargeStruct {

main/main.cpp

@@ -245,7 +245,7 @@ static void my_task(void *pvParameter) {
     adc_init();
 #endif
 
-    init_spiffs();
+    init_fs();
 
     initUart();
 

main/storage.cpp

@@ -5,9 +5,7 @@
 
 static const char *TAG = "storage";
 
-#define CALIBRATION_FILE "/spiffs/calibration.bin"
-
-void init_spiffs() {
+void init_fs() {
     ESP_LOGI(TAG, "Initializing SPIFFS");
 
     esp_vfs_spiffs_conf_t spiffs_conf = {};

main/storage.h

@@ -2,7 +2,13 @@
 
 #include <sys/unistd.h>
 
-void init_spiffs();
+#define CALIBRATION_FILE "/spiffs/calibration.bin"
+
+#define DISTANCE_FILE "/spiffs/distance.bin"
+
+#define CHARGE_FILE "/spiffs/charge.bin"
+
+void init_fs();
 
 // Is a calibration file stored?
 bool calibrationFileExists();

main/trip.cpp

@@ -1,8 +1,6 @@
 #include "storage.h"
 #include "trip.h"
 
-#define DISTANCE_FILE "/spiffs/distance.bin"
-
 struct distancesStruct {
     // Trip-1 in 10m increments
     uint32_t trip1;

sdkconfig.Tesla

@@ -20,14 +20,14 @@ CONFIG_ION_UART=1
 CONFIG_ION_RXD=20
 CONFIG_ION_TXD=21
 
-CONFIG_ION_LIGHT=y
-CONFIG_ION_LIGHT_PIN=3
-CONFIG_ION_LIGHT_PIN_INVERTED=n
-
 CONFIG_ION_RELAY=y
 CONFIG_ION_RELAY_PIN=0
 CONFIG_ION_RELAY_PIN_INVERTED=n
 
+CONFIG_ION_LIGHT=y
+CONFIG_ION_LIGHT_PIN=3
+CONFIG_ION_LIGHT_PIN_INVERTED=n
+
 CONFIG_ESP32C3_DEFAULT_CPU_FREQ_160=y
 
 # --- ADC measuring ---
@@ -46,10 +46,10 @@ CONFIG_ION_ADC_CHAN=2
 # The scale of the divider, times 1000, from APM power module
 CONFIG_ION_DIVIDER_SCALE=10829
 
-# Consider 22V (2.5V/cell for 8s LiFePo4) empty
-CONFIG_ION_ADC_EMPTY_MV=21000
+# Consider 23V (2,875V/cell for 8s LiFePo4) empty
+CONFIG_ION_ADC_EMPTY_MV=23000
 
-# Consider 27V (3.5V/cell for 8s  LiFePo4) full
+# Consider 27V (3,375V/cell for 8s  LiFePo4) full
 CONFIG_ION_ADC_FULL_MV=27000
 
 # --- Current measuring ---

sdkconfig.TeslaS

@@ -25,7 +25,7 @@ CONFIG_ION_RELAY_PIN=0
 CONFIG_ION_RELAY_PIN_INVERTED=n
 
 CONFIG_ION_LIGHT=y
-CONFIG_ION_LIGHT_PIN=1
+CONFIG_ION_LIGHT_PIN=3
 CONFIG_ION_LIGHT_PIN_INVERTED=n
 
 CONFIG_ESP32C3_DEFAULT_CPU_FREQ_160=y
@@ -37,6 +37,7 @@ CONFIG_ESP32C3_DEFAULT_CPU_FREQ_160=y
 # ADC channel 2 is pin 2
 # ADC channel 3 is pin 3
 # ADC channel 4 is pin 4
+
 CONFIG_ION_ADC=y
 # --- Voltage measuring ---
 # ADC channel 1 is pin 2
@@ -45,10 +46,10 @@ CONFIG_ION_ADC_CHAN=2
 # The scale of the divider, times 1000, from APM power module
 CONFIG_ION_DIVIDER_SCALE=10829
 
-# Consider 20V (2.5V/cell for 8s) empty
-CONFIG_ION_ADC_EMPTY_MV=21000
+# Consider 23V (2,875V/cell for 8s LiFePo4) empty
+CONFIG_ION_ADC_EMPTY_MV=23000
 
-# Consider 28V (3.5V/cell for 8s) full
+# Consider 27V (3,375V/cell for 8s  LiFePo4) full
 CONFIG_ION_ADC_FULL_MV=27000
 
 # --- Current measuring ---
@@ -61,9 +62,4 @@ CONFIG_ION_CURR_ADC_CHAN=1
 CONFIG_ION_BAT_CHARGE=20000
 
 # keepalive
-<<<<<<< HEAD:sdkconfig.supermini
-CONFIG_ION_KEEPALIVE=y
-
-=======
-CONFIG_ION_KEEPALIVE=n
->>>>>>> 8796a39 (Tesla config split):sdkconfig.TeslaS
+CONFIG_ION_KEEPALIVE=y