Merge pull request #325 from matth-x/master

Add RFID support and upgrade OCPP library

Author: jeremypoulter

gui

@@ -32,8 +32,8 @@ default_envs = openevse_wifi_v1
 version = -D BUILD_TAG=4.1.3
 monitor_speed = 115200
 lib_deps =
-  bblanchon/ArduinoJson@6.15.1
-  jeremypoulter/[email protected].17
+  bblanchon/ArduinoJson@6.19.1
+  jeremypoulter/[email protected].18
   jeremypoulter/Micro [email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
@@ -42,7 +42,7 @@ lib_deps =
   jeremypoulter/[email protected]
   erropix/ESP32 [email protected]
   lorol/[email protected]
-  matth-x/ArduinoOcpp@0.0.4
+  matth-x/ArduinoOcpp@0.1.0
 lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library
 extra_scripts = scripts/extra_script.py
 debug_flags =
@@ -79,7 +79,8 @@ build_flags =
   -D MG_ENABLE_SNTP=1
   -D CS_PLATFORM=CS_P_ESP32
   -D AO_CUSTOM_WS ; ArduinoOcpp: don't use built-in WS library
-  -D AO_CUSTOM_DIAGNOSTICS ; ArduinoOcpp: don't do internal logging
+  -D AO_CUSTOM_CONSOLE ; ArduinoOcpp: use custom debug out
+  -D AO_DBG_LEVEL=AO_DL_WARN
   #-D ENABLE_DEBUG
   #-D ENABLE_DEBUG_MONGOOSE_HTTP_CLIENT
   -D RAPI_MAX_COMMANDS=20
@@ -246,6 +247,7 @@ src_build_flags =
   -D I2C_SDA=21
   -D I2C_SCL=22
   -D ENABLE_MCP9808
+  -D ENABLE_PN532
 build_flags =
   ${common.build_flags}
   -D TX1=16

platformio.ini

@@ -3,6 +3,10 @@
  * Created: 2021-04-10
  */
 
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_OCPPSOCKET)
+#undef ENABLE_DEBUG
+#endif
+
 #include "MongooseOcppSocketClient.h"
 #include "net_manager.h"
 #include "debug.h"
@@ -203,7 +207,7 @@ void MongooseOcppSocketClient::reconnect(const String &ws_url) {
     maintainWsConn();
 }
 
-bool MongooseOcppSocketClient::sendTXT(String &out) {
+bool MongooseOcppSocketClient::sendTXT(std::string &out) {
     /*
      * Check if the EVSE is able to send the data at the moment. This fuzzy check can be useful to
      * to diagnose connection problems at upper layers. It gives no guarantee that packages will
@@ -243,7 +247,7 @@ bool MongooseOcppSocketClient::isValidUrl(const char *url) {
     if (url[1] != 'S' && url[1] != 's')
         return false;
 
-    if (url[2] == 'S' && url[2] == 's') {
+    if (url[2] == 'S' || url[2] == 's') {
         if (url[3] != ':')
             return false;
         //else: passed

src/MongooseOcppSocketClient.cpp

@@ -32,17 +32,17 @@ class MongooseOcppSocketClient : public ArduinoOcpp::OcppSocket {
 
     MongooseOcppSocketClient(const String &ws_url);
 
-    ~MongooseOcppSocketClient();
+    ~MongooseOcppSocketClient() override;
 
-    void loop();
+    void loop() override;
 
     void maintainWsConn();
 
-    bool sendTXT(String &out);
+    bool sendTXT(std::string &out) override;
 
     bool receiveTXT(const char* msg, size_t len);
 
-    void setReceiveTXTcallback(ArduinoOcpp::ReceiveTXTcallback &receiveTXT) {
+    void setReceiveTXTcallback(ArduinoOcpp::ReceiveTXTcallback &receiveTXT) override {
         this->receiveTXTcallback = receiveTXT;
     }; //ReceiveTXTcallback is defined in OcppServer.h
 

src/MongooseOcppSocketClient.h

@@ -84,6 +84,11 @@ String tesla_vehicle_id;
 uint8_t led_brightness;
 #endif
 
+// RFID storage
+String rfid_storage;
+
+long max_current_soft;
+
 String esp_hostname_default = "openevse-"+ESPAL.getShortId();
 
 void config_changed(String name);
@@ -149,6 +154,9 @@ ConfigOpt *opts[] =
   new ConfigOptDefenition<uint64_t>(tesla_expires_in, -1, "tesla_expires_in", "tx"),
   new ConfigOptDefenition<String>(tesla_vehicle_id, "", "tesla_vehicle_id", "ti"),
 
+// RFID storage
+  new ConfigOptDefenition<String>(rfid_storage, "", "rfid_storage", "rs"),
+
 #if RGB_LED
 // LED brightness
   new ConfigOptDefenition<uint8_t>(led_brightness, LED_DEFAULT_BRIGHTNESS, "led_brightness", "lb"),
@@ -170,6 +178,7 @@ ConfigOpt *opts[] =
   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"),
+  new ConfigOptVirtualBool(flagsOpt, CONFIG_RFID, CONFIG_RFID, "rfid_enabled", "rf"),
   new ConfigOptVirtualMqttProtocol(flagsOpt, "mqtt_protocol", "mprt"),
   new ConfigOptVirtualChargeMode(flagsOpt, "charge_mode", "chmd")
 };
@@ -384,6 +393,17 @@ config_save_ohm(bool enable, String qohm)
   config.commit();
 }
 
+void
+config_save_rfid(bool enable, String storage){
+  uint32_t newflags = flags & ~CONFIG_RFID;
+  if(enable) {
+    newflags |= CONFIG_RFID;
+  }
+  config.set("flags", newflags);
+  config.set("rfid_storage", rfid_storage);
+  config.commit();
+}
+
 void
 config_save_flags(uint32_t newFlags) {
   config.set("flags", newFlags);

src/app_config.cpp

@@ -51,6 +51,9 @@ extern String ocpp_chargeBoxId;
 extern String ocpp_idTag;
 extern String tx_start_point;
 
+// RFID storage
+extern String rfid_storage;
+
 // Time
 extern String time_zone;
 
@@ -77,6 +80,7 @@ extern uint32_t flags;
 #define CONFIG_OCPP_ACCESS_SUSPEND  (1 << 15)
 #define CONFIG_OCPP_ACCESS_ENERGIZE (1 << 16)
 #define CONFIG_VEHICLE_RANGE_MILES  (1 << 17)
+#define CONFIG_RFID                 (1 << 18)
 
 inline bool config_emoncms_enabled() {
   return CONFIG_SERVICE_EMONCMS == (flags & CONFIG_SERVICE_EMONCMS);
@@ -133,6 +137,10 @@ inline bool config_pause_uses_disabled() {
 inline bool config_vehicle_range_miles() {
   return CONFIG_VEHICLE_RANGE_MILES == (flags & CONFIG_VEHICLE_RANGE_MILES);
 }
+  
+inline bool config_rfid_enabled() {
+  return CONFIG_RFID == (flags & CONFIG_RFID);
+}
 
 // Ohm Connect Settings
 extern String ohm;
@@ -178,6 +186,11 @@ extern void config_save_wifi(String qsid, String qpass);
 // -------------------------------------------------------------------
 extern void config_save_ohm(bool enable, String qohm);
 
+// -------------------------------------------------------------------
+// Save RFID settings
+// -------------------------------------------------------------------
+extern void config_save_rfid(bool enable, String storage);
+
 // -------------------------------------------------------------------
 // Save the flags
 // -------------------------------------------------------------------

src/app_config.h

@@ -32,6 +32,7 @@ typedef uint32_t EvseClient;
 #define EvseClient_OpenEVSE_Error             EVC(EvseClient_Vendor_OpenEVSE, 0x0007)
 #define EvseClient_OpenEVSE_Ohm               EVC(EvseClient_Vendor_OpenEVSE, 0x0008)
 #define EvseClient_OpenEVSE_Ocpp              EVC(EvseClient_Vendor_OpenEVSE, 0x0009)
+#define EvseClient_OpenEVSE_RFID              EVC(EvseClient_Vendor_OpenEVSE, 0x000A)
 
 #define EvseClient_OpenEnergyMonitor_DemandShaper EVC(EvseClient_Vendor_OpenEnergyMonitor, 0x0001)
 
@@ -44,6 +45,7 @@ typedef uint32_t EvseClient;
 #define EvseManager_Priority_API       500
 #define EvseManager_Priority_Ohm       500
 #define EvseManager_Priority_Manual   1000
+#define EvseManager_Priority_RFID     1030
 #define EvseManager_Priority_Ocpp     1050
 #define EvseManager_Priority_Limit    1100
 #define EvseManager_Priority_Error   10000

src/evse_man.h

@@ -17,6 +17,7 @@
 #include "emoncms.h"
 #include "tesla_client.h"
 #include "manual.h"
+#include "rfid.h"
 
 #include "LedManagerTask.h"
 
@@ -84,6 +85,9 @@ class InputTask : public MicroTasks::Task
 
 void create_rapi_json(JsonDocument &doc)
 {
+  if(config_rfid_enabled()) {
+    doc["rfid_auth"] = rfid.getAuthenticatedTag();
+  }
   doc["amp"] = evse.getAmps() * AMPS_SCALE_FACTOR;
   doc["voltage"] = evse.getVoltage() * VOLTS_SCALE_FACTOR;
   doc["pilot"] = evse.getChargeCurrent();

src/input.cpp

@@ -30,7 +30,6 @@
 #include <MongooseCore.h>
 #include <MicroTasks.h>
 #include <LITTLEFS.h>
-#include <ArduinoOcpp.h>
 
 #include "emonesp.h"
 #include "app_config.h"
@@ -50,6 +49,11 @@
 #include "tesla_client.h"
 #include "event.h"
 #include "ocpp.h"
+#include "rfid.h"
+
+#if defined(ENABLE_PN532)
+#include "pn532.h"
+#endif
 
 #include "LedManagerTask.h"
 #include "event_log.h"
@@ -117,6 +121,12 @@ void setup()
   scheduler.begin();
 
   lcd.begin(evse, scheduler, manual);
+#if defined(ENABLE_PN532)
+  pn532.begin();
+  rfid.begin(evse, pn532);
+#else
+  rfid.begin(evse, rfidNullDevice);
+#endif
   ledManager.begin(evse);
 
   // Initialise the WiFi
@@ -138,7 +148,7 @@ void setup()
 
   input_setup();
 
-  ocpp.begin(evse, lcd, eventLog);
+  ocpp.begin(evse, lcd, eventLog, rfid);
 
   lcd.display(F("OpenEVSE WiFI"), 0, 0, 0, LCD_CLEAR_LINE);
   lcd.display(currentfirmware, 0, 1, 5 * 1000, LCD_CLEAR_LINE);