log upload integration

Author: matth-x

src/main.cpp

@@ -134,7 +134,7 @@ void setup()
 
   input_setup();
 
-  ocpp.begin(evse, lcd);
+  ocpp.begin(evse, lcd, eventLog);
 
   lcd.display(F("OpenEVSE WiFI"), 0, 0, 0, LCD_CLEAR_LINE);
   lcd.display(currentfirmware, 0, 1, 5 * 1000, LCD_CLEAR_LINE);

src/ocpp.cpp

@@ -34,10 +34,11 @@ ArduinoOcppTask::~ArduinoOcppTask() {
     instance = NULL;
 }
 
-void ArduinoOcppTask::begin(EvseManager &evse, LcdTask &lcd) {
+void ArduinoOcppTask::begin(EvseManager &evse, LcdTask &lcd, EventLog &eventLog) {
 
     this->evse = &evse;
     this->lcd = &lcd;
+    this->eventLog = &eventLog;
 
     initializeArduinoOcpp();
     loadEvseBehavior();
@@ -79,7 +80,7 @@ void ArduinoOcppTask::initializeArduinoOcpp() {
                     if (!updateUserNotified && index > 0) {
                         updateUserNotified = true;
 
-                        DEBUG_PORT.printf("Update via OCPP start\n");
+                        DBUG("Update via OCPP start\n");
 
                         lcd->display(F("Updating WiFi"), 0, 0, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
                         lcd->display(F(""), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
@@ -95,7 +96,7 @@ void ArduinoOcppTask::initializeArduinoOcpp() {
                         DBUGVAR(percent);
                         String text = String(percent) + F("%");
                         if (lcd) lcd->display(text, 0, 1, 10 * 1000, LCD_DISPLAY_NOW);
-                        DEBUG_PORT.printf("Update: %d%%\n", percent);
+                        DBUGF("Update: %d%%\n", percent);
                     } else {
                         lcd->display(F("Complete"), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
                     }
@@ -109,7 +110,7 @@ void ArduinoOcppTask::initializeArduinoOcpp() {
 //                });
 
 #endif
-                DEBUG_PORT.println(F("[ocpp] FW download not implemented yet! Ignore request"));
+                DBUGLN(F("[ocpp] FW download not implemented yet! Ignore request"));
 
                 return true;
             });
@@ -137,18 +138,98 @@ void ArduinoOcppTask::initializeArduinoOcpp() {
                 unsigned int port_i = 0;
                 struct mg_str scheme, query, fragment;
                 if (mg_parse_uri(mg_mk_str(location.c_str()), &scheme, NULL, NULL, &port_i, NULL, &query, &fragment)) {
-                    DEBUG_PORT.print(F("[ocpp] Diagnostics upload, invalid URL: "));
-                    DEBUG_PORT.print(location);
+                    DBUG(F("[ocpp] Diagnostics upload, invalid URL: "));
+                    DBUGLN(location);
+                    diagFailure = true;
+                    return false;
+                }
+
+                if (eventLog == NULL) {
                     diagFailure = true;
                     return false;
                 }
 
                 //create file to upload
-                
+                #define BOUNDARY_STRING "-----------------------------WebKitFormBoundary7MA4YWxkTrZu0gW025636501"
+                const char *bodyPrefix PROGMEM = BOUNDARY_STRING "\r\n"
+                        "Content-Disposition: form-data; name=\"file\"; filename=\"diagnostics.log\"\r\n"
+                        "Content-Type: application/octet-stream\r\n\r\n";
+                const char *bodySuffix PROGMEM = "\r\n\r\n" BOUNDARY_STRING "--\r\n";
+                const char *overflowMsg PROGMEM = "{\"diagnosticsMsg\":\"requested search period exceeds maximum diagnostics upload size\"}";
+
+                const size_t MAX_BODY_SIZE = 10000; //limit length of message
+                String body = String('\0');
+                body.reserve(MAX_BODY_SIZE);
+                body += bodyPrefix;
+                body += "[";
+                const size_t SUFFIX_RESERVED_AREA = MAX_BODY_SIZE - strlen(bodySuffix) - strlen(overflowMsg) - 2;
+
+                bool firstEntry = true;
+                bool overflow = false;
+                for (uint32_t i = 0; i <= (eventLog->getMaxIndex() - eventLog->getMinIndex()) && !overflow; i++) {
+                    uint32_t index = eventLog->getMinIndex() + i;
+
+                    eventLog->enumerate(index, [this, startTime, stopTime, &body, SUFFIX_RESERVED_AREA, &firstEntry, &overflow] (String time, EventType type, const String &logEntry, EvseState managerState, uint8_t evseState, uint32_t evseFlags, uint32_t pilot, double energy, uint32_t elapsed, double temperature, double temperatureMax, uint8_t divertMode) {
+                        if (overflow) return;
+                        ArduinoOcpp::OcppTimestamp timestamp = ArduinoOcpp::OcppTimestamp();
+                        if (!timestamp.setTime(time.c_str())) {
+                            DBUG(F("[ocpp] Diagnostics upload, cannot parse timestamp format: "));
+                            DBUGLN(time);
+                            return;
+                        }
 
+                        if (timestamp < startTime || timestamp > stopTime) {
+                            return;
+                        }
 
-                diagClient.post("abc", "def", "ghj");
-                
+                        if (body.length() + logEntry.length() + 10 < SUFFIX_RESERVED_AREA) {
+                            if (firstEntry)
+                                firstEntry = false;
+                            else
+                                body += ",";
+                            
+                            body += logEntry;
+                            body += "\n";
+                        } else {
+                            overflow = true;
+                            return;
+                        }
+                    });
+
+                }
+
+                if (overflow) {
+                    if (!firstEntry)
+                        body += ",\r\n";
+                    body += overflowMsg;
+                }
+
+                body += "]";
+
+                body += bodySuffix;
+
+                DBUG(F("[ocpp] POST diagnostics file to "));
+                DBUGLN(location);
+
+                MongooseHttpClientRequest *request =
+                        diagClient.beginRequest(location.c_str());
+                request->setMethod(HTTP_POST);
+                request->addHeader("Content-Type", "multipart/form-data; boundary=" BOUNDARY_STRING);
+                request->setContent(body.c_str());
+                request->onResponse([this] (MongooseHttpClientResponse *response) {
+                    if (response->respCode() == 200) {
+                        diagSuccess = true;
+                    } else {
+                        diagFailure = true;
+                    }
+                });
+                request->onClose([this] (MongooseHttpClientResponse *response) {
+                    if (!diagSuccess) {
+                        //triggered onClose before onResponse
+                        diagFailure = true;
+                    }
+                });
+                diagClient.send(request);
 
                 return true;
             });

src/ocpp.h

@@ -19,6 +19,7 @@ class ArduinoOcppTask: public MicroTasks::Task {
     MongooseOcppSocketClient *ocppSocket = NULL;
     EvseManager *evse;
     LcdTask *lcd;
+    EventLog *eventLog;
 
     /*
      * OCPP state
@@ -68,7 +69,7 @@ class ArduinoOcppTask: public MicroTasks::Task {
     ArduinoOcppTask();
     ~ArduinoOcppTask();
 
-    void begin(EvseManager &evse, LcdTask &lcd);
+    void begin(EvseManager &evse, LcdTask &lcd, EventLog &eventLog);
 
     void updateEvseClaim();