Merge pull request #296 from OpenEVSE/jeremypoulter/issue140

Updating the firmware to handle configuring the EVSE

Author: glynhudson

.github/workflows/build.yaml

@@ -26,6 +26,8 @@ jobs:
           - openevse_esp32-heltec-wifi-lora-v2
 
     steps:
+    - uses: ammaraskar/gcc-problem-matcher@master
+
     - uses: actions/checkout@v2
       with:
         submodules: recursive
@@ -114,4 +116,3 @@ jobs:
         title: "Development Build"
         files: |
           *.bin
- 

api.yml

@@ -641,3 +641,4 @@ tags:
   - name: Manual Override
   - name: Schedule
   - name: Status
+  - name: Tesla

gui

@@ -8,15 +8,18 @@ x-examples:
     espinfo: ESP32r1 2 core WiFi BLE BT
     buildenv: openevse_esp-wrover-kit
     version: 4.1.0.dev
-    diodet: 0
-    gfcit: 0
-    groundt: 1
-    relayt: 0
-    ventt: 0
-    tempt: 1
+    diode_check: true
+    gfci_check: true
+    ground_check: true
+    relay_check: true
+    vent_check: true
+    temp_check: true
     service: 0
     scale: 220
     offset: 0
+    max_current_soft: 32
+    min_current_hard: 6
+    max_current_hard: 32
     mqtt_supported_protocols:
       - mqtt
       - mqtts
@@ -83,15 +86,18 @@ examples:
     espinfo: ESP32r1 2 core WiFi BLE BT
     buildenv: openevse_esp-wrover-kit
     version: 4.1.0.dev
-    diodet: 0
-    gfcit: 0
-    groundt: 1
-    relayt: 0
-    ventt: 0
-    tempt: 1
+    diode_check: true
+    gfci_check: true
+    ground_check: true
+    relay_check: true
+    vent_check: true
+    temp_check: true
     service: 0
     scale: 220
     offset: 0
+    max_current_soft: 32
+    min_current_hard: 6
+    max_current_hard: 32
     mqtt_supported_protocols:
       - mqtt
       - mqtts
@@ -151,6 +157,8 @@ examples:
     ocpp_energize_plug: true
     mqtt_protocol: mqtt
     charge_mode: fast
+x-tags:
+  - Config
 properties:
   firmware:
     type: string
@@ -175,32 +183,33 @@ properties:
     type: string
     minLength: 1
     readOnly: true
-  diodet:
-    type: number
-    readOnly: true
-  gfcit:
-    type: number
-    readOnly: true
-  groundt:
-    type: number
-    readOnly: true
-  relayt:
-    type: number
-    readOnly: true
-  ventt:
-    type: number
-    readOnly: true
-  tempt:
-    type: number
-    readOnly: true
+  diode_check:
+    type: boolean
+  gfci_check:
+    type: boolean
+  ground_check:
+    type: boolean
+  relay_check:
+    type: boolean
+  vent_check:
+    type: boolean
+  temp_check:
+    type: boolean
   service:
-    type: number
-    readOnly: true
+    type: integer
+    minimum: 0
+    maximum: 2
   scale:
-    type: number
-    readOnly: true
+    type: integer
   offset:
-    type: number
+    type: integer
+  max_current_soft:
+    type: integer
+  min_current_hard:
+    type: integer
+    readOnly: true
+  max_current_hard:
+    type: integer
     readOnly: true
   mqtt_supported_protocols:
     type: array
@@ -254,7 +263,7 @@ properties:
     type: string
     minLength: 1
   mqtt_port:
-    type: number
+    type: integer
   mqtt_topic:
     type: string
     minLength: 1
@@ -347,5 +356,3 @@ properties:
   charge_mode:
     type: string
     minLength: 1
-x-tags:
-  - Config

models/Config.yaml

@@ -6,3 +6,4 @@ enum:
 x-tags:
   - Claims
   - Status
+description: Either enable charging (`active`) or block charging (`disabled`)

models/EvseState.yaml

@@ -3,25 +3,37 @@ type: object
 x-tags:
   - Claims
 description: ''
+examples: []
 properties:
   state:
     $ref: ./EvseState.yaml
   charge_current:
     type: integer
     minimum: 0
+    description: Specify the active charge current in Amps
   max_current:
     type: integer
     minimum: 0
+    description: Dynamically alter the max current while still allowing other claims to very the current via `charge_current` that can not exceede this value. This is primerialy designed for load sharing situations while still allowing things like PV divert to work so the charge current is the minimum of `charge_current` <= `max_current` <= configured soft limit <= hard coded limit
   energy_limit:
     type: integer
     minimum: 0
+    format: int32
+    description: |-
+      Stop the charge after `energy_limit` Wh of energy have been transfered.
+
+      > Note:  Not currently implemented
   time_limit:
     type: integer
     minimum: 0
+    format: int32
+    description: |-
+      Stop the charge after the duration of the charging session has exceeded `time_limit` seconds
+
+      > Note:  Not currently implemented
   auto_release:
     type: boolean
     description: |
       `true` if the manual override is auto-released when the vehicle is
       disconnected, `false` if manual override will persist after vehicle
       disconnection.
-examples: []

models/Properties.yaml

@@ -116,6 +116,11 @@ properties:
   divertmode:
     type: integer
     description: 'The PV divert mode, `1` normal, `2` Eco'
+  service_level:
+    type: integer
+    description: The current service level
+    minimum: 1
+    maximum: 2
   solar:
     type: integer
     description: The latest solar feed value received

models/Status.yaml

@@ -35,7 +35,7 @@ lib_deps =
   bblanchon/[email protected]
   jeremypoulter/[email protected]
   jeremypoulter/Micro [email protected]
-  jeremypoulter/[email protected].3
+  jeremypoulter/[email protected].4
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
@@ -283,12 +283,12 @@ board_build.partitions = ${common.build_partitions}
 #https://github.com/OpenEVSE/ESP32_WiFi_V3.x/blob/master/docs/wired-ethernet.md
 extends = env:openevse_esp32-gateway
 framework = arduino, espidf
-upload_speed = 921600
 build_flags =
   ${common.build_flags}
   -D RX2=16
   -D TX2=32
 board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'E\'"
+upload_speed = 921600
 
 [env:openevse_esp32-heltec-wifi-lora-v2]
 platform = ${common.platform}

platformio.ini

@@ -84,6 +84,8 @@ String tesla_vehicle_id;
 uint8_t led_brightness;
 #endif
 
+long max_current_soft;
+
 String esp_hostname_default = "openevse-"+ESPAL.getShortId();
 
 void config_changed(String name);
@@ -154,6 +156,9 @@ ConfigOpt *opts[] =
   new ConfigOptDefenition<uint8_t>(led_brightness, LED_DEFAULT_BRIGHTNESS, "led_brightness", "lb"),
 #endif
 
+// EVSE settings
+  new ConfigOptDefenition<long>(max_current_soft, LONG_MAX, "max_current_soft", "mcs"),
+
 // Flags
   &flagsOpt,
 
@@ -238,6 +243,8 @@ void config_changed(String name)
   } else if(name == "led_brightness") {
     ledManager.setBrightness(led_brightness);
 #endif
+  } else if(name == "max_current_soft") {
+    evse.setMaxConfiguredCurrent(max_current_soft);
   }
 }
 

src/app_config.cpp

@@ -139,6 +139,7 @@ EvseManager::EvseManager(Stream &port, EventLog &eventLog) :
   _eventLog(eventLog),
   _clients(),
   _evseStateListener(this),
+  _evseBootListener(this),
   _sessionCompleteListener(this),
   _targetProperties(EvseState::Active),
   _hasClaims(false),
@@ -251,6 +252,7 @@ bool EvseManager::evaluateClaims(EvseProperties &properties)
 
 void EvseManager::setup()
 {
+  _monitor.onBootReady(&_evseBootListener);
   _monitor.onStateChange(&_evseStateListener);
   _monitor.onSessionComplete(&_sessionCompleteListener);
 }
@@ -335,6 +337,11 @@ unsigned long EvseManager::loop(MicroTasks::WakeReason reason)
     return 10 * 1000;
   }
 
+  DBUGVAR(_evseBootListener.IsTriggered());
+  if(_evseBootListener.IsTriggered()) {
+    _evaluateTargetState = true;
+  }
+
   DBUGVAR(_evseStateListener.IsTriggered());
   if(_evseStateListener.IsTriggered())
   {
@@ -584,6 +591,16 @@ void EvseManager::setVehicleEta(int vehicleEta)
   MicroTask.wakeTask(this);
 }
 
+void EvseManager::setMaxConfiguredCurrent(long amps)
+{
+  _monitor.setMaxConfiguredCurrent(amps);
+  DBUGF("Max configured current set to %ld", _monitor.getMaxConfiguredCurrent());
+  // Setting the Max Current will update the pilot as well, but in any case we may
+  // need to change the level so re-evaluate the claims
+  _evaluateClaims = true;
+  MicroTask.wakeTask(this);
+}
+
 bool EvseManager::isRapiCommandBlocked(String rapi)
 {
   return rapi.startsWith("$ST");