Merge pull request #70 from basmeerman/work/plan-04

feat: EVCC integration — IEC 61851 state, phase switching, HTTP API

Author: basmeerman

SmartEVSE-3/src/esp32.cpp

@@ -231,6 +231,29 @@ void setMode(uint8_t NewMode) ;
 void BuzzConfirmation(void);
 void BuzzError(void);
 
+// HTTP handler helpers (used by http_handlers.cpp)
+uint8_t getErrorId(uint8_t ErrorCode);
+const char *getErrorNameWeb(uint8_t ErrorCode);
+void printRFID(char *buf, size_t bufsize);
+int StoreTimeString(String DelayedTimeStr, DelayedTimeStruct *DelayedTime);
+
+// String arrays used by HTTP response
+extern const char StrStateNameWeb[15][17];
+extern const char StrErrorNameWeb[9][20];
+extern const char StrRFIDStatusWeb[8][20];
+
+// MQTT cache (non-static, shared with http_handlers.cpp)
+#include "mqtt_publish.h"
+extern mqtt_cache_t mqtt_cache;
+
+// Modem (conditional)
+#if MODEM
+void RecomputeSoC(void);
+#endif
+
+// LCD PIN code (used by http_handlers.cpp)
+extern uint16_t LCDPin;
+
 #if ENABLE_OCPP && defined(SMARTEVSE_VERSION) //run OCPP only on ESP32
 void ocppUpdateRfidReading(const unsigned char *uuid, size_t uuidLen);
 bool ocppIsConnectorPlugged();

SmartEVSE-3/src/esp32.h

@@ -6,11 +6,68 @@
  */
 
 #include "http_api.h"
+#include "evse_ctx.h"
 
 #ifndef MIN_CURRENT
 #define MIN_CURRENT 6
 #endif
 
+/* Soft error flags that do not indicate an EVSE fault — these are
+ * temporary operational conditions (current too low, no solar surplus)
+ * and should not map to IEC 61851 state E. */
+#define SOFT_ERROR_MASK (LESS_6A | NO_SUN)
+
+char evse_state_to_iec61851(int state, int error_flags) {
+    /* Hard errors override the state-based mapping */
+    if (error_flags & ~SOFT_ERROR_MASK)
+        return 'E';
+
+    switch (state) {
+    case STATE_A:
+        return 'A';
+
+    case STATE_B:
+    case STATE_B1:
+    case STATE_COMM_B:
+    case STATE_COMM_B_OK:
+    case STATE_ACTSTART:
+    case STATE_MODEM_REQUEST:
+    case STATE_MODEM_WAIT:
+    case STATE_MODEM_DONE:
+        return 'B';
+
+    case STATE_C:
+    case STATE_C1:
+    case STATE_COMM_C:
+    case STATE_COMM_C_OK:
+        return 'C';
+
+    case STATE_D:
+        return 'D';
+
+    case STATE_MODEM_DENIED:
+        return 'E';
+
+    default:
+        return 'F';
+    }
+}
+
+bool evse_charging_enabled(int state) {
+    return (state == STATE_C || state == STATE_C1);
+}
+
+const char *http_api_validate_phase_switch(const http_phase_switch_request_t *req,
+                                           int enable_c2, int load_bl) {
+    if (req->phases != 1 && req->phases != 3)
+        return "Value not allowed!";
+    if (enable_c2 == NOT_PRESENT)
+        return "C2 contactor not present";
+    if (load_bl >= 2)
+        return "Value not allowed!";
+    return NULL;
+}
+
 bool http_api_parse_color(int r_val, int g_val, int b_val,
                           uint8_t *r_out, uint8_t *g_out, uint8_t *b_out) {
     if (r_val < 0 || r_val > 255 || g_val < 0 || g_val > 255 || b_val < 0 || b_val > 255)

SmartEVSE-3/src/http_api.c

@@ -86,6 +86,28 @@ const char *http_api_validate_mqtt_heartbeat(int value);
 // Validate mqtt_change_only (0 or 1).
 const char *http_api_validate_mqtt_change_only(int value);
 
+// Phase switch request — parsed from POST /settings "phases" parameter.
+typedef struct {
+    int phases;     // Requested phase count: 1 or 3
+} http_phase_switch_request_t;
+
+// Validate a phase switch request.
+// enable_c2: current EnableC2 setting (NOT_PRESENT=0 means no C2 hardware).
+// load_bl: load balancing role (>=2 means slave, cannot switch).
+// Returns NULL on success, or a static error message on failure.
+const char *http_api_validate_phase_switch(const http_phase_switch_request_t *req,
+                                           int enable_c2, int load_bl);
+
+// Map internal EVSE state + error flags to an IEC 61851-1 state letter (A-F).
+// Hard errors (CT_NOCOMM, TEMP_HIGH, EV_NOCOMM, RCM_TRIPPED, etc.) override to 'E'.
+// Soft errors (LESS_6A, NO_SUN) are temporary and do NOT override the state.
+// NOSTATE or unrecognized values return 'F' (not available).
+char evse_state_to_iec61851(int state, int error_flags);
+
+// Derive whether charging is actively enabled from internal state.
+// Returns true when the EVSE is delivering energy (STATE_C or STATE_C1).
+bool evse_charging_enabled(int state);
+
 #ifdef __cplusplus
 }
 #endif