Merge branch 'master' into fewfixes

Author: KipK

src/current_shaper.cpp

@@ -41,7 +41,7 @@ unsigned long CurrentShaperTask::loop(MicroTasks::WakeReason reason) {
 			}
 			if (millis() - _timer > EVSE_SHAPER_FAILSAFE_TIME) {
 				//available power has not been updated since EVSE_SHAPER_FAILSAFE_TIME, pause charge
-				DBUGF("MQTT avl_pwr has not been updated in time, pausing charge");
+				DBUGF("shaper_live_pwr has not been updated in time, pausing charge");
 				props.setState(EvseState::Disabled);
 				evse.claim(EvseClient_OpenEVSE_Shaper,EvseManager_Priority_Limit, props);
 				StaticJsonDocument<128> event;

src/web_server.cpp

@@ -674,20 +674,88 @@ handleSaveOhmkey(MongooseHttpServerRequest *request) {
 // Returns status json
 // url: /status
 // -------------------------------------------------------------------
+void handleStatusPost(MongooseHttpServerRequest *request, MongooseHttpServerResponseStream *response)
+{
+  String body = request->body().toString();
+  // Deserialize the JSON document
+  const size_t capacity = JSON_OBJECT_SIZE(50) + 1024;
+  DynamicJsonDocument doc(capacity);
+  DeserializationError error = deserializeJson(doc, body);
+  if(!error)
+  {
+    if(doc.containsKey("voltage"))
+    {
+      double volts = doc["voltage"];
+      DBUGF("voltage:%.1f", volts);
+      evse.setVoltage(volts);
+    }
+    if(doc.containsKey("shaper_live_pwr"))
+    {
+      double shaper_live_pwr = doc["shaper_live_pwr"];
+      shaper.setLivePwr(shaper_live_pwr);
+      DBUGF("shaper: available power:%dW", shaper.getAvlPwr());
+    }
+    if(doc.containsKey("solar")) {
+      solar = doc["solar"];
+      DBUGF("solar:%dW", solar);
+      divert.update_state();
+    }
+    else if(doc.containsKey("grid_ie")) {
+      grid_ie = doc["grid_ie"];
+      DBUGF("grid:%dW", grid_ie);
+      divert.update_state();
+    }
+    if(doc.containsKey("battery_level")) {
+      double vehicle_soc = doc["battery_level"];
+      DBUGF("vehicle_soc:%d%%", vehicle_soc);
+      evse.setVehicleStateOfCharge(vehicle_soc);
+    }
+    if(doc.containsKey("battery_range")) {
+      double vehicle_range = doc["battery_range"];
+      DBUGF("vehicle_range:%dKM", vehicle_range);
+      evse.setVehicleRange(vehicle_range);
+    }
+    if(doc.containsKey("time_to_full_charge")){
+      double vehicle_eta = doc["time_to_full_charge"];
+      DBUGF("vehicle_eta:%d", vehicle_eta);
+      evse.setVehicleEta(vehicle_eta);   
+    }
+    // send back new value to clients
+    event_send(doc);
+
+    response->setCode(200);
+    serializeJson(doc, *response);
+  } else {
+    response->setCode(400);
+    response->print("{\"msg\":\"Could not parse JSON\"}");
+  }
+}
+
+
 void
-handleStatus(MongooseHttpServerRequest *request) {
+handleStatus(MongooseHttpServerRequest *request) 
+{
+
   MongooseHttpServerResponseStream *response;
   if(false == requestPreProcess(request, response)) {
     return;
   }
 
-  const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
-  DynamicJsonDocument doc(capacity);
+  if(HTTP_GET == request->method()) {
 
-  buildStatus(doc);
+    const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
+    DynamicJsonDocument doc(capacity);
+    buildStatus(doc);
+    response->setCode(200);
+    serializeJson(doc, *response);
+
+  } else if(HTTP_POST == request->method()) {
+    handleStatusPost(request, response);
+  } else {
+    response->setCode(405);
+    response->print("{\"msg\":\"Method not allowed\"}");
+  }
 
-  response->setCode(200);
-  serializeJson(doc, *response);
   request->send(response);
 }