upgrade to MO v1.1

Author: matth-x

platformio.ini

@@ -38,8 +38,10 @@ lib_deps =
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
-  matth-x/[email protected]
-  matth-x/[email protected]
+  #matth-x/[email protected]
+  #matth-x/[email protected]
+  https://github.com/matth-x/MicroOcpp#a36e6a443fe660f27b8b21eceb55db5b59e5c3b2
+  https://github.com/matth-x/MicroOcppMongoose#1a6dc511e9678391bc45225f1d69296ddc352218
 lib_ignore = WebSockets ; MicroOcpp: don't compile built-in WS library
 extra_scripts =
   pre:scripts/auto_fw_version.py
@@ -89,8 +91,8 @@ build_flags =
   -D MO_CUSTOM_WS ; MicroOcpp: don't use built-in WS library
   -D MO_CUSTOM_CONSOLE ; MicroOcpp: use custom debug out
   -D MO_DBG_LEVEL=MO_DL_INFO
+  -D MO_TRAFFIC_OUT
   -D MO_MG_VERSION_614 ; use MG v6.14
-  -D MO_CA_CERT_LOCAL ; manage certificate locally
   #-D ENABLE_DEBUG
   #-D ENABLE_DEBUG_MONGOOSE_HTTP_CLIENT
   -D RAPI_MAX_COMMANDS=20

src/ocpp.cpp

@@ -6,6 +6,8 @@
 #include "ocpp.h"
 
 #include <MicroOcpp.h>
+#include <MicroOcpp/Model/Diagnostics/DiagnosticsService.h>
+#include <MicroOcpp/Model/FirmwareManagement/FirmwareService.h>
 #include <MongooseCore.h>
 
 #include "app_config.h"
@@ -274,17 +276,17 @@ void OcppTask::loadEvseBehavior() {
      * Synchronize OpenEVSE data with OCPP-library data
      */
 
-    addMeterValueInput([this] () {
-            return evse->getAmps() * evse->getVoltage();
-        },
-        "Power.Active.Import",
-        "W");
-    
-    addMeterValueInput([this] () {
-            return evse->getTotalEnergy() * 1000.; //convert kWh into Wh
-        }, 
-        "Energy.Active.Import.Register",
-        "Wh");
+    //basic meter readings
+
+    setEnergyMeterInput([this] () {
+        return evse->getTotalEnergy() * 1000.; //convert kWh into Wh
+    });
+
+    setPowerMeterInput([this] () {
+        return evse->getAmps() * evse->getVoltage();
+    });
+
+    //further meter readings
 
     addMeterValueInput([this] () {
             return evse->getAmps();
@@ -525,6 +527,11 @@ void OcppTask::updateEvseClaim() {
         evseState = EvseState::Disabled;
     }
 
+    //check further error condition not handled by Atmega
+    if (rfid->communicationFails()) {
+        evseState = EvseState::Disabled;
+    }
+
     evseProperties = evseState;
 
     //OCPP Smart Charging?
@@ -728,7 +735,7 @@ void OcppTask::initializeFwService() {
 
 bool OcppTask::isConnected() {
     if (instance && instance->connection) {
-        return instance->connection->isConnectionOpen();
+        return instance->connection->isConnected();
     }
     return false;
 }