Merge pull request #198 from OpenEVSE/issue71/Vehicle_config_ui

Adding a GUI for configuring the vehicle data source

Author: jeremypoulter

gui

@@ -48,6 +48,8 @@ extra_scripts = scripts/extra_script.py
 debug_flags =
   -ggdb
   -DENABLE_DEBUG
+  #-DENABLE_DEBUG_WEB
+  #-DENABLE_DEBUG_WEB_REQUEST
   #-DENABLE_DEBUG_SCHEDULER
   #-DENABLE_DEBUG_EVSE_MAN
   #-DENABLE_DEBUG_EVSE_MONITOR
@@ -56,8 +58,10 @@ debug_flags =
   #-DENABLE_DEBUG_LCD
   #-DENABLE_DEBUG_MQTT
   #-DENABLE_DEBUG_EMONCMS
+  #-DENABLE_DEBUG_TESLA_CLIENT
   #-DENABLE_PROFILE
 src_build_flags =
+#  -DARDUINOJSON_USE_LONG_LONG
 # -DENABLE_ASYNC_WIFI_SCAN
 build_flags =
   -DCS_PLATFORM=CS_P_ESP32
@@ -75,6 +79,8 @@ build_flags =
   -DMG_ENABLE_SNTP=1
   -DCS_PLATFORM=CS_P_ESP32
   -DAO_CUSTOM_WS ; ArduinoOcpp: don't use built-in WS library
+  #-DENABLE_DEBUG
+  #-DENABLE_DEBUG_MONGOOSE_HTTP_CLIENT
   -DRAPI_MAX_COMMANDS=20
 build_partitions = min_spiffs.csv
 monitor_flags = --filter=esp32_exception_decoder
@@ -134,8 +140,8 @@ build_flags =
   -DTX1=27
   -ggdb
 #upload_port = openevse.local
-#upload_speed = 921600
-upload_protocol = ftdi
+upload_speed = 2000000
+#upload_protocol = ftdi
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 board_build.partitions = ${common.build_partitions}

platformio.ini

@@ -46,6 +46,9 @@ String mqtt_pass;
 String mqtt_solar;
 String mqtt_grid_ie;
 String mqtt_vrms;
+String mqtt_vehicle_soc;
+String mqtt_vehicle_range;
+String mqtt_vehicle_eta;
 String mqtt_announce_topic;
 
 // OCPP 1.6 Settings
@@ -70,9 +73,12 @@ double divert_decay_smoothing_factor;
 uint32_t divert_min_charge_time;
 
 // Tesla Client settings
-String tesla_username;
-String tesla_password;
-int tesla_vehidx;
+String tesla_access_token;
+String tesla_refresh_token;
+uint64_t tesla_created_at;
+uint64_t tesla_expires_in;
+
+String tesla_vehicle_id;
 
 #if RGB_LED
 uint8_t led_brightness;
@@ -116,6 +122,9 @@ ConfigOpt *opts[] =
   new ConfigOptDefenition<String>(mqtt_solar, "", "mqtt_solar", "mo"),
   new ConfigOptDefenition<String>(mqtt_grid_ie, "emon/emonpi/power1", "mqtt_grid_ie", "mg"),
   new ConfigOptDefenition<String>(mqtt_vrms, "emon/emonpi/vrms", "mqtt_vrms", "mv"),
+  new ConfigOptDefenition<String>(mqtt_vehicle_soc, "", "mqtt_vehicle_soc", "mc"),
+  new ConfigOptDefenition<String>(mqtt_vehicle_range, "", "mqtt_vehicle_range", "mr"),
+  new ConfigOptDefenition<String>(mqtt_vehicle_eta, "", "mqtt_vehicle_eta", "met"),
   new ConfigOptDefenition<String>(mqtt_announce_topic, "openevse/announce/"+ESPAL.getShortId(), "mqtt_announce_topic", "ma"),
 
 // OCPP 1.6 Settings
@@ -134,9 +143,11 @@ ConfigOpt *opts[] =
   new ConfigOptDefenition<uint32_t>(divert_min_charge_time, (10 * 60), "divert_min_charge_time", "dt"),
 
 // Tesla client settings
-  new ConfigOptDefenition<String>(tesla_username, "", "tesla_username", "tu"),
-  new ConfigOptSecret(tesla_password, "", "tesla_password", "tp"),
-  new ConfigOptDefenition<int>(tesla_vehidx, -1, "tesla_vehidx", "ti"),
+  new ConfigOptSecret(tesla_access_token, "", "tesla_access_token", "tat"),
+  new ConfigOptSecret(tesla_refresh_token, "", "tesla_refresh_token", "trt"),
+  new ConfigOptDefenition<uint64_t>(tesla_created_at, -1, "tesla_created_at", "tc"),
+  new ConfigOptDefenition<uint64_t>(tesla_expires_in, -1, "tesla_expires_in", "tx"),
+  new ConfigOptDefenition<String>(tesla_vehicle_id, "", "tesla_vehicle_id", "ti"),
 
 #if RGB_LED
 // LED brightness
@@ -152,9 +163,10 @@ ConfigOpt *opts[] =
   new ConfigOptVirtualBool(flagsOpt, CONFIG_MQTT_ALLOW_ANY_CERT, 0, "mqtt_reject_unauthorized", "mru"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_OHM, CONFIG_SERVICE_OHM, "ohm_enabled", "oe"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_SNTP, CONFIG_SERVICE_SNTP, "sntp_enabled", "se"),
-  new ConfigOptVirtualBool(flagsOpt,CONFIG_SERVICE_TESLA,CONFIG_SERVICE_TESLA, "tesla_enabled", "te"),
+  new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_TESLA, CONFIG_SERVICE_TESLA, "tesla_enabled", "te"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_DIVERT, CONFIG_SERVICE_DIVERT, "divert_enabled", "de"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_PAUSE_USES_DISABLED, CONFIG_PAUSE_USES_DISABLED, "pause_uses_disabled", "pd"),
+  new ConfigOptVirtualBool(flagsOpt, CONFIG_VEHICLE_RANGE_MILES, CONFIG_VEHICLE_RANGE_MILES, "mqtt_vehicle_range_miles", "mvru"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_OCPP, CONFIG_SERVICE_OCPP, "ocpp_enabled", "ope"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_OCPP_ACCESS_SUSPEND, CONFIG_OCPP_ACCESS_SUSPEND, "ocpp_suspend_evse", "ops"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_OCPP_ACCESS_ENERGIZE, CONFIG_OCPP_ACCESS_ENERGIZE, "ocpp_energize_plug", "opn"),
@@ -218,12 +230,10 @@ void config_changed(String name)
     DBUGVAR(config_divert_enabled());
     DBUGVAR(config_charge_mode());
     divertmode_update((config_divert_enabled() && 1 == config_charge_mode()) ? DIVERT_MODE_ECO : DIVERT_MODE_NORMAL);
-  } else if(name == "tesla_username") {
-    teslaClient.setUser(tesla_username.c_str());
-  } else if(name == "tesla_password") {
-    teslaClient.setPass(tesla_password.c_str());
-  } else if(name == "tesla_vehidx") {
-    teslaClient.setVehicleIdx(tesla_vehidx);
+  } else if(name == "tesla_vehicle_id") {
+    teslaClient.setVehicleId(tesla_vehicle_id);
+  } else if(name.startsWith("tesla_")) {
+    teslaClient.setCredentials(tesla_access_token, tesla_refresh_token, tesla_created_at, tesla_expires_in);
 #if RGB_LED
   } else if(name == "led_brightness") {
     ledManager.setBrightness(led_brightness);

src/app_config.cpp

@@ -40,6 +40,9 @@ extern String mqtt_pass;
 extern String mqtt_solar;
 extern String mqtt_grid_ie;
 extern String mqtt_vrms;
+extern String mqtt_vehicle_soc;
+extern String mqtt_vehicle_range;
+extern String mqtt_vehicle_eta;
 extern String mqtt_announce_topic;
 
 // OCPP 1.6 Settings
@@ -69,10 +72,11 @@ extern uint32_t flags;
 #define CONFIG_SERVICE_TESLA        (1 << 8)
 #define CONFIG_SERVICE_DIVERT       (1 << 9)
 #define CONFIG_CHARGE_MODE          (7 << 10) // 3 bits for mode
-#define CONFIG_PAUSE_USES_DISABLED   (1 << 13)
+#define CONFIG_PAUSE_USES_DISABLED  (1 << 13)
 #define CONFIG_SERVICE_OCPP         (1 << 14)
 #define CONFIG_OCPP_ACCESS_SUSPEND  (1 << 15)
 #define CONFIG_OCPP_ACCESS_ENERGIZE (1 << 16)
+#define CONFIG_VEHICLE_RANGE_MILES  (1 << 17)
 
 inline bool config_emoncms_enabled() {
   return CONFIG_SERVICE_EMONCMS == (flags & CONFIG_SERVICE_EMONCMS);
@@ -126,6 +130,10 @@ inline bool config_pause_uses_disabled() {
   return CONFIG_PAUSE_USES_DISABLED == (flags & CONFIG_PAUSE_USES_DISABLED);
 }
 
+inline bool config_vehicle_range_miles() {
+  return CONFIG_VEHICLE_RANGE_MILES == (flags & CONFIG_VEHICLE_RANGE_MILES);
+}
+
 // Ohm Connect Settings
 extern String ohm;
 

src/app_config.h

@@ -141,7 +141,13 @@ EvseManager::EvseManager(Stream &port) :
   _sleepForDisable(true),
   _evaluateClaims(true),
   _evaluateTargetState(false),
-  _waitingForEvent(0)
+  _waitingForEvent(0),
+  _vehicleValid(0),
+  _vehicleUpdated(0),
+  _vehicleLastUpdated(0),
+  _vehicleStateOfCharge(0),
+  _vehicleRange(0),
+  _vehicleEta(0)
 {
 }
 
@@ -536,6 +542,33 @@ uint32_t EvseManager::getTimeLimit(EvseClient client)
   return getClaimProperties(client).getTimeLimit();
 }
 
+void EvseManager::setVehicleStateOfCharge(int vehicleStateOfCharge)
+{
+  _vehicleStateOfCharge = vehicleStateOfCharge;
+  _vehicleValid |= EVSE_VEHICLE_SOC;
+  _vehicleUpdated |= EVSE_VEHICLE_SOC;
+  _vehicleLastUpdated = millis();
+  MicroTask.wakeTask(this);
+}
+
+void EvseManager::setVehicleRange(int vehicleRange)
+{
+  _vehicleRange = vehicleRange;
+  _vehicleValid |= EVSE_VEHICLE_RANGE;
+  _vehicleUpdated |= EVSE_VEHICLE_RANGE;
+  _vehicleLastUpdated = millis();
+  MicroTask.wakeTask(this);
+}
+
+void EvseManager::setVehicleEta(int vehicleEta)
+{
+  _vehicleEta = vehicleEta;
+  _vehicleValid |= EVSE_VEHICLE_ETA;
+  _vehicleUpdated |= EVSE_VEHICLE_ETA;
+  _vehicleLastUpdated = millis();
+  MicroTask.wakeTask(this);
+}
+
 bool EvseManager::isRapiCommandBlocked(String rapi)
 {
   return rapi.startsWith("$ST");

src/evse_man.cpp

@@ -46,6 +46,10 @@ typedef uint32_t EvseClient;
 #define EvseManager_Priority_Limit    1100
 #define EvseManager_Priority_Error   10000
 
+#define EVSE_VEHICLE_SOC    (1 << 0)
+#define EVSE_VEHICLE_RANGE  (1 << 1)
+#define EVSE_VEHICLE_ETA    (1 << 2)
+
 #ifndef EVSE_MANAGER_MAX_CLIENT_CLAIMS
 #define EVSE_MANAGER_MAX_CLIENT_CLAIMS 10
 #endif // !EVSE_MANAGER_MAX_CLIENT_CLAIMS
@@ -276,6 +280,13 @@ class EvseManager : public MicroTasks::Task
     bool _evaluateTargetState;
     int _waitingForEvent;
 
+    uint32_t _vehicleValid;
+    uint32_t _vehicleUpdated;
+    uint32_t _vehicleLastUpdated;
+    int _vehicleStateOfCharge;
+    int _vehicleRange;
+    int _vehicleEta;
+
     void initialiseEvse();
     bool findClaim(EvseClient client, Claim **claim = NULL);
     bool evaluateClaims(EvseProperties &properties);
@@ -343,6 +354,9 @@ class EvseManager : public MicroTasks::Task
     double getVoltage() {
       return _monitor.getVoltage();
     }
+    void setVoltage(double volts) {
+      _monitor.setVoltage(volts);
+    }
     uint32_t getSessionElapsed() {
       return _monitor.getSessionElapsed();
     }
@@ -407,6 +421,32 @@ class EvseManager : public MicroTasks::Task
       return _monitor.getMinCurrent();
     }
 
+    // Get/set the vehicle state
+    int getVehicleStateOfCharge() {
+      return _vehicleStateOfCharge;
+    }
+    int getVehicleRange() {
+      return _vehicleRange;
+    }
+    int getVehicleEta() {
+      return _vehicleEta;
+    }
+    uint32_t getVehicleLastUpdated() {
+      return _vehicleLastUpdated;
+    }
+    int isVehicleStateOfChargeValid() {
+      return 0 != (_vehicleValid & EVSE_VEHICLE_SOC);
+    }
+    int isVehicleRangeValid() {
+      return 0 != (_vehicleValid & EVSE_VEHICLE_RANGE);
+    }
+    int isVehicleEtaValid() {
+      return 0 != (_vehicleValid & EVSE_VEHICLE_ETA);
+    }
+    void setVehicleStateOfCharge(int vehicleStateOfCharge);
+    void setVehicleRange(int vehicleRange);
+    void setVehicleEta(int vehicleEta);
+
     // Temp until everything uses EvseManager
     RapiSender &getSender() {
       return _sender;

src/evse_man.h

@@ -397,6 +397,17 @@ void EvseMonitor::setPilot(long amps)
   });
 }
 
+void EvseMonitor::setVoltage(double volts)
+{
+  _openevse.setVoltage(volts, [this, volts](int ret)
+  {
+    if(RAPI_RESPONSE_OK == ret || RAPI_RESPONSE_NK == ret) {
+      _voltage = volts;
+    }
+  });
+}
+
+
 void EvseMonitor::getStatusFromEvse()
 {
   DBUGLN("Get EVSE status");

src/evse_monitor.cpp

@@ -186,6 +186,8 @@ class EvseMonitor : public MicroTasks::Task
 
     void setPilot(long amps);
 
+    void setVoltage(double volts);
+
     uint8_t getEvseState() {
       return _state.getEvseState();
     }

src/evse_monitor.h

@@ -56,10 +56,10 @@ class InputTask : public MicroTasks::Task
           DynamicJsonDocument data(4096);
 
           create_rapi_json(data); // create JSON Strings for EmonCMS and MQTT
-          emoncms_publish(data);
-
-          teslaClient.getChargeInfoJson(data);
           event_send(data);
+          // Already evented to MQTT etc
+          teslaClient.getChargeInfoJson(data);
+          emoncms_publish(data);
         }
       }
 
@@ -126,6 +126,8 @@ void create_rapi_json(JsonDocument &doc)
   doc["freeram"] = ESPAL.getFreeHeap();
   doc["divertmode"] = divertmode;
   doc["srssi"] = WiFi.RSSI();
+
+  //teslaClient.getChargeInfoJson(doc);
 }
 
 void