Added support for modifying the config options generically

This allows for comparisons of #590 against the mainline without having to change the divert_sim to change the different options

Author: jeremypoulter

.github/workflows/divert_sim.yaml

@@ -44,6 +44,7 @@ jobs:
         with:
           repository: bblanchon/ArduinoJson
           path: ArduinoJson
+          ref: v6.20.1
 
       - uses: actions/checkout@v3
         with:

.gitignore

@@ -91,3 +91,4 @@ lib/MicroTasks
 
 *.bin
 divert_sim/epoxyfsdata
+divert_sim/epoxyeepromdata

divert_sim/.vscode/launch.json

@@ -10,6 +10,7 @@
       "request": "launch",
       "program": "${workspaceFolder}/divert_sim",
       "args": [
+        "-c", "data/test_config.json",
         "<", "${workspaceFolder}/data/day1.csv"
       ],
       "stopAtEntry": false,
@@ -100,4 +101,4 @@
       "miDebuggerPath": "/usr/bin/gdb"
     }
   ]
-}
+}

divert_sim/EEPROM.h

@@ -0,0 +1,2 @@
+#include <EpoxyEepromEsp.h>
+#define EEPROM EpoxyEepromEspInstance

divert_sim/Makefile

@@ -20,15 +20,19 @@ CPPFLAGS := \
   -I $(ARDUINO_LIB_DIR)/ConfigJson/src \
   -I $(ARDUINO_LIB_DIR)/ArduinoJson/src \
   -I $(ARDUINO_LIB_DIR)/OpenEVSE_Lib/src \
+  -I $(ARDUINO_LIB_DIR)/ESPAL/src \
   -I $(EPOXY_LIB_DIR)/EpoxyFS/src \
+  -I $(EPOXY_LIB_DIR)/EpoxyEepromEsp/src \
   -ggdb \
   -D DIVERT_SIM \
   -D ARDUINO=100 \
   -D UNIX_HOST_DUINO \
   -D EPOXY_DUINO \
   -D EPOXY_CORE_ESP8266 \
   -D ENERGY_METER_STORE_STATE=0 \
-  -D ARDUINOJSON_ENABLE_PROGMEM=0
+  -D ARDUINOJSON_ENABLE_PROGMEM=0 \
+  -D ENABLE_CONFIG_V1_IMPORT=0 \
+  -D ENABLE_CONFIG_CHANGE_NOTIFICATION=0
 #  \
 #  -D ENABLE_DEBUG \
 #  -D ENABLE_DEBUG_DIVERT \
@@ -54,8 +58,8 @@ OPENEVSE_LIB_OBJ := \
   openevse.o \
   RapiSender.o
 
-#CONFIG_JSON_OBJ := \
-#  ConfigJson.o
+CONFIG_JSON_OBJ := \
+  ConfigJson.o
 
 STREAM_SPY_OBJ := \
   StreamSpy.o \
@@ -68,11 +72,13 @@ OPENEVSE_WIFI_OBJ := \
   energy_meter.o \
   event_log.o \
   debug.o \
-  manual.o
+  manual.o \
+  app_config.o
 
 ARDUINO_OBJ := \
   avr_stdlib.o \
   Arduino.o \
+  base64.o \
   Esp.o \
   IPAddress.o \
   Print.o \
@@ -88,13 +94,21 @@ EPOXY_FS_OBJ := \
   FS.o \
   FSImpl.o
 
+EPOXY_EEPROM_OBJ := \
+  EpoxyEepromEsp.o
+
+ESPAL_OBJ := \
+  espal.o
+
 OBJ    := \
   $(MICRO_TASKS_OBJ) \
   $(CONFIG_JSON_OBJ) \
   $(STREAM_SPY_OBJ) \
+  $(ESPAL_OBJ) \
   $(OPENEVSE_LIB_OBJ) \
   $(OPENEVSE_WIFI_OBJ) \
   $(EPOXY_FS_OBJ) \
+  $(EPOXY_EEPROM_OBJ) \
   $(ARDUINO_OBJ) \
   $(MAINS)
 DEPS   :=
@@ -106,7 +120,9 @@ VPATH 	:= \
   $(ARDUINO_LIB_DIR)/MicroTasks/src \
   $(ARDUINO_LIB_DIR)/ConfigJson/src \
   $(ARDUINO_LIB_DIR)/StreamSpy/src \
-  $(EPOXY_LIB_DIR)/EpoxyFS/src
+  $(ARDUINO_LIB_DIR)/ESPAL/src \
+  $(EPOXY_LIB_DIR)/EpoxyFS/src \
+  $(EPOXY_LIB_DIR)/EpoxyEepromEsp/src
 
 .PHONY: all clean
 

divert_sim/data/test_config.json

@@ -0,0 +1,6 @@
+{
+  "divert_PV_ratio": 0.5,
+  "divert_attack_smoothing_factor": 0.4,
+  "divert_decay_smoothing_factor": 0.05,
+  "divert_min_charge_time": 600
+}

divert_sim/divert_sim.cpp

@@ -25,9 +25,9 @@ ManualOverride manual(evse);
 
 long pilot = 32;                      // OpenEVSE Pilot Setting
 long state = OPENEVSE_STATE_CONNECTED; // OpenEVSE State
-String mqtt_solar = "";
-String mqtt_grid_ie = "";
-uint32_t flags;
+double voltage = 240; // Voltage from OpenEVSE or MQTT
+
+extern double smoothed_available_current;
 
 int date_col = 0;
 int grid_ie_col = -1;
@@ -38,15 +38,6 @@ time_t simulated_time = 0;
 
 bool kw = false;
 
-extern double smoothed_available_current;
-double divert_attack_smoothing_factor = 0.4;
-double divert_decay_smoothing_factor = 0.05;
-double divert_PV_ratio = 0.5;
-uint32_t divert_min_charge_time = (10 * 60);
-double voltage = 240; // Voltage from OpenEVSE or MQTT
-
-uint32_t current_shaper_max_pwr = 0;
-
 time_t parse_date(const char *dateStr)
 {
   int y = 2020, M = 1, d = 1, h = 0, m = 0, s = 0;
@@ -105,6 +96,7 @@ int main(int argc, char** argv)
 {
   int voltage_arg = -1;
   std::string sep = ",";
+  std::string config;
 
   cxxopts::Options options(argv[0], " - example command line options");
   options
@@ -117,8 +109,7 @@ int main(int argc, char** argv)
     ("d,date", "The date column", cxxopts::value<int>(date_col), "N")
     ("s,solar", "The solar column", cxxopts::value<int>(solar_col), "N")
     ("g,gridie", "The Grid IE column", cxxopts::value<int>(grid_ie_col), "N")
-    ("attack", "The attack factor for the smoothing", cxxopts::value<double>(divert_attack_smoothing_factor))
-    ("decay", "The decay factor for the smoothing", cxxopts::value<double>(divert_decay_smoothing_factor))
+    ("c,config", "Config options, either a file name or JSON", cxxopts::value<std::string>(config))
     ("v,voltage", "The Voltage column if < 50, else the fixed voltage", cxxopts::value<int>(voltage_arg), "N")
     ("kw", "values are KW")
     ("sep", "Field separator", cxxopts::value<std::string>(sep));
@@ -131,6 +122,22 @@ int main(int argc, char** argv)
     exit(0);
   }
 
+  fs::EpoxyFS.begin();
+  config_reset();
+
+  // If config is set and not a JSON string, assume it is a file name
+  if(config.length() > 0 && config[0] != '{')
+  {
+    std::ifstream t(config);
+    std::stringstream buffer;
+    buffer << t.rdbuf();
+    config = buffer.str();
+  }
+  // If we have some JSON load it
+  if(config.length() > 0 && config[0] == '{') {
+    config_deserialize(config.c_str());
+  }
+
   kw = result.count("kw") > 0;
 
   mqtt_solar = grid_ie_col >= 0 ? "" : "yes";
@@ -147,7 +154,6 @@ int main(int argc, char** argv)
   solar = 0;
   grid_ie = 0;
 
-  fs::EpoxyFS.begin();
   evse.begin();
   divert.begin();
 

divert_sim/runall.sh

@@ -11,6 +11,6 @@ mkdir -p output
 ./divert_sim -g 2 < data/day2_grid_ie.csv > output/day2_grid_ie.csv
 ./divert_sim -g 2 < data/day3_grid_ie.csv > output/day3_grid_ie.csv
 ./divert_sim -v 2 < data/solar-vrms.csv > output/solar-vrms.csv
-./divert_sim --sep \; --kw --decay 0.4 < data/Energy_and_Power_Day_2020-03-22.csv > output/Energy_and_Power_Day_2020-03-22.csv
-./divert_sim --sep \; --kw --decay 0.4 < data/Energy_and_Power_Day_2020-03-31.csv > output/Energy_and_Power_Day_2020-03-31.csv
-./divert_sim --sep \; --kw --decay 0.4 < data/Energy_and_Power_Day_2020-04-01.csv > output/Energy_and_Power_Day_2020-04-01.csv
+./divert_sim --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}' < data/Energy_and_Power_Day_2020-03-22.csv > output/Energy_and_Power_Day_2020-03-22.csv
+./divert_sim --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}' < data/Energy_and_Power_Day_2020-03-31.csv > output/Energy_and_Power_Day_2020-03-31.csv
+./divert_sim --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}' < data/Energy_and_Power_Day_2020-04-01.csv > output/Energy_and_Power_Day_2020-04-01.csv

src/app_config.cpp

@@ -1,5 +1,7 @@
 #include "emonesp.h"
 #include "espal.h"
+
+#if ENABLE_CONFIG_CHANGE_NOTIFICATION
 #include "divert.h"
 #include "net_manager.h"
 #include "mqtt.h"
@@ -10,6 +12,7 @@
 #include "LedManagerTask.h"
 #include "current_shaper.h"
 #include "limit.h"
+#endif
 
 #include "app_config.h"
 #include "app_config_mqtt.h"
@@ -253,16 +256,22 @@ config_load_settings()
   user_config.onChanged(config_changed);
 
   factory_config.load(false);
-  if(!user_config.load(true)) {
+  if(!user_config.load(true))
+  {
+#if ENABLE_CONFIG_V1_IMPORT
     DBUGF("No JSON config found, trying v1 settings");
     config_load_v1_settings();
+#else
+    DBUGF("No JSON config found, using defaults");
+#endif
   }
 }
 
 void config_changed(String name)
 {
   DBUGF("%s changed", name.c_str());
 
+#if ENABLE_CONFIG_CHANGE_NOTIFICATION
   if(name == "time_zone") {
     timeManager.setTimeZone(time_zone);
   } else if(name == "flags") {
@@ -319,6 +328,7 @@ void config_changed(String name)
   } else if(name == "sntp_enabled") {
     timeManager.setSntpEnabled(config_sntp_enabled());
   }
+#endif
 }
 
 void config_commit(bool factory)

src/app_config.h

@@ -4,6 +4,14 @@
 #include <Arduino.h>
 #include <ArduinoJson.h>
 
+#ifndef ENABLE_CONFIG_V1_IMPORT
+#define ENABLE_CONFIG_V1_IMPORT 1
+#endif
+
+#ifndef ENABLE_CONFIG_CHANGE_NOTIFICATION
+#define ENABLE_CONFIG_CHANGE_NOTIFICATION 1
+#endif
+
 // -------------------------------------------------------------------
 // Load and save the OpenEVSE WiFi config.
 //
@@ -194,7 +202,9 @@ extern String ohm;
 // Load saved settings
 // -------------------------------------------------------------------
 extern void config_load_settings();
+#if ENABLE_CONFIG_V1_IMPORT
 extern void config_load_v1_settings();
+#endif
 
 // -------------------------------------------------------------------
 // Reset the config back to defaults