Merge branch 'master' into divert_sim_summary

Author: jeremypoulter

api.yml

@@ -54,6 +54,7 @@ paths:
                     rapi_connected: 1
                     amp: 0
                     pilot: 32
+                    max_current: 32
                     temp1: 282
                     temp2: -2560
                     temp3: -2560

docs/mqtt.md

@@ -48,6 +48,8 @@ Main settings:
 
 `<base-topic>/divertmode/set [1 | 2]`       : enable (1)/ disable (2) divert mode  
 `<base-topic>/shaper/set [0 | 1]`       : temporary enable (1)/ disable (0) current shaper ( doesn't survive reboot )  
+`<base-topic>/restart`                  : restarts the gateway
+
 
 
 MQTT setup is pre-populated with OpenEnergyMonitor [emonPi default MQTT server credentials](https://guide.openenergymonitor.org/technical/credentials/#mqtt).

models/Status.yaml

@@ -68,6 +68,9 @@ properties:
   pilot:
     type: integer
     description: 'the pilot value, in amps'
+  max_current:
+    type: integer
+    description: 'the actual max current value defined either by max_current_soft or a running claim'
   temp:
     type: number
     description: 'the derived temperature, in 1/10th °C'

scripts/auto_fw_version.py

@@ -4,9 +4,11 @@
 def get_build_flag():
     ret = subprocess.run(["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE, text=True) #Uses any tags
     full_hash = ret.stdout.strip()
+    ret = subprocess.run(["git", "symbolic-ref", "--short", "HEAD"], stdout=subprocess.PIPE, text=True) # retrieve branch name
+    branch = ret.stdout.strip()
     short_hash = full_hash[:8]
 
-    build_version = "local_" + short_hash
+    build_version = "local_" + branch + "_" + short_hash
 
     # get the GITHUB_REF_NAME
     ref_name = os.environ.get('GITHUB_REF_NAME')

src/divert.cpp

@@ -245,10 +245,10 @@ void DivertTask::update_state()
       if(_state != current_evse_state)
       {
         _state = current_evse_state;
-        event["divert_active"] = isActive();
       }
     }
 
+    event["divert_active"] = isActive();
     event["charge_rate"] = _charge_rate;
     event["trigger_current"] = trigger_current;
     event["voltage"] = voltage;

src/input.cpp

@@ -73,6 +73,7 @@ class InputTask : public MicroTasks::Task
         event["vehicle"] = evse.isVehicleConnected() ? 1 : 0;
         event["colour"] = evse.getStateColour();
         event["pilot"] = evse.getChargeCurrent();
+        event["max_current"] = evse.getMaxCurrent();
         event["manual_override"] = manual.isActive() ? 1 : 0; //TODO: remove this
         event["status"] = evse.getState().toString();
         event["elapsed"] = evse.getSessionElapsed();
@@ -104,6 +105,7 @@ void create_rapi_json(JsonDocument &doc)
   doc["voltage"] = evse.getVoltage() * VOLTS_SCALE_FACTOR;
   doc["power"] = evse.getPower() * POWER_SCALE_FACTOR;
   doc["pilot"] = evse.getChargeCurrent();
+  doc["max_current"] = evse.getMaxCurrent();
   if(evse.isTemperatureValid(EVSE_MONITOR_TEMP_MONITOR)) {
     doc["temp"] = evse.getTemperature(EVSE_MONITOR_TEMP_MONITOR) * TEMP_SCALE_FACTOR;
   } else {

src/mqtt.cpp

@@ -183,6 +183,11 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {
     mqtt_clear_schedule(payload_str.toInt());
   }
 
+  // Restart
+  else if (topic_string == mqtt_topic + "/restart") {
+    restart_system();
+  }
+
   else
   {
     // If MQTT message is RAPI command
@@ -360,6 +365,12 @@ mqtt_connect()
     mqtt_sub_topic = mqtt_topic + "/schedule/clear";
     mqttclient.subscribe(mqtt_sub_topic);
     yield();
+
+    // ask for a system restart
+    mqtt_sub_topic = mqtt_topic + "/restart";
+    mqttclient.subscribe(mqtt_sub_topic);
+    yield();
+
     connecting = false;
   });