Merge branch 'master' into max_hardware_current_set

Author: jeremypoulter

gui-tft/lock.png

@@ -133,10 +133,14 @@ String esp_hostname_default = "openevse-"+ESPAL.getShortId();
 
 void config_changed(String name);
 
+#ifndef CONFIG_DEFAULT_STATE_DEFAULT
+#define CONFIG_DEFAULT_STATE_DEFAULT CONFIG_DEFAULT_STATE
+#endif
+
 #define CONFIG_DEFAULT_FLAGS (CONFIG_SERVICE_SNTP | \
                               CONFIG_OCPP_AUTO_AUTH | \
                               CONFIG_OCPP_OFFLINE_AUTH | \
-                              CONFIG_DEFAULT_STATE)
+                              CONFIG_DEFAULT_STATE_DEFAULT)
 
 ConfigOptDefinition<uint32_t> flagsOpt = ConfigOptDefinition<uint32_t>(flags, CONFIG_DEFAULT_FLAGS, "flags", "f");
 ConfigOptDefinition<uint32_t> flagsChanged = ConfigOptDefinition<uint32_t>(flags_changed, 0, "flags_changed", "c");
@@ -165,8 +169,8 @@ ConfigOpt *opts[] =
   new ConfigOptDefinition<String>(time_zone, DEFAULT_TIME_ZONE, "time_zone", "tz"),
 
 // Limit
-  new ConfigOptDefinition<String>(limit_default_type, {}, "limit_default_type", "ldt"),
-  new ConfigOptDefinition<uint32_t>(limit_default_value, {}, "limit_default_value", "ldv"),
+  new ConfigOptDefinition<String>(limit_default_type, LIMIT_DEFAULT_TYPE_DEFAULT, "limit_default_type", "ldt"),
+  new ConfigOptDefinition<uint32_t>(limit_default_value, LIMIT_DEFAULT_VALUE_DEFAULT, "limit_default_value", "ldv"),
 
 // EMONCMS SERVER strings
   new ConfigOptDefinition<String>(emoncms_server, "https://data.openevse.com/emoncms", "emoncms_server", "es"),
@@ -324,16 +328,19 @@ config_load_settings()
   if(0 == flags_changed)
   {
     // Assume all flags that do not match the default value have changed
-    uint32_t new_changed = (flags ^ CONFIG_DEFAULT_FLAGS) & ~CONFIG_DEFAULT_STATE;
+    uint32_t new_changed = (flags ^ CONFIG_DEFAULT_FLAGS);
 
+#if CONFIG_DEFAULT_STATE_DEFAULT != 0
     // Handle the default charge state differently as that was set as a default to 0 previously, but is now 1
     // We will assume that if set to 1 it was intentional, but if 0 we will assume it was the just the default
     // and not an intentinal change
+    new_changed &= ~CONFIG_DEFAULT_STATE;
     if(flags != CONFIG_DEFAULT_FLAGS &&
        CONFIG_DEFAULT_STATE == (flags & CONFIG_DEFAULT_STATE))
     {
       new_changed |= CONFIG_DEFAULT_STATE;
     }
+#endif
 
     // Save any changes
     if(flagsChanged.set(new_changed)) {
@@ -386,23 +393,7 @@ void config_changed(String name)
     ledManager.setBrightness(led_brightness);
 #endif
   } else if(name.startsWith("limit_default_")) {
-    LimitProperties limitprops;
-    LimitType limitType;
-    DBUGVAR(limit_default_type);
-    DBUGVAR((int)limit_default_value);
-    limitType.fromString(limit_default_type.c_str());
-    limitprops.setType(limitType);
-    limitprops.setValue(limit_default_value);
-    limitprops.setAutoRelease(false);
-    if (limitType == LimitType::None) {
-      limit.clear();
-      DBUGLN("No limit to set");
-    }
-    else if (limitprops.getValue())
-      limit.set(limitprops);
-    DBUGLN("Limit set");
-    DBUGVAR(limitprops.getType().toString());
-    DBUGVAR(limitprops.getValue());
+    limit.setDefaultLimit(limit_default_type.c_str(), limit_default_value);
   } else if(name == "sntp_enabled") {
     timeManager.setSntpEnabled(config_sntp_enabled());
   }

src/app_config.cpp

@@ -8,6 +8,18 @@
 #include "debug.h"
 #include "profile.h"
 
+// -------------------------------------------------------------------
+// Lock Screen Configuration
+// -------------------------------------------------------------------
+
+// Uncomment to enable lock screen when EVSE is disabled
+//#define ENABLE_LOCK_SCREEN
+
+// Default lock screen message displayed when EVSE is disabled
+#ifndef LOCK_SCREEN_MESSAGE
+#define LOCK_SCREEN_MESSAGE "STATION LOCKED"
+#endif
+
 #ifdef WIFI_LED
 #ifndef WIFI_LED_ON_STATE
 #define WIFI_LED_ON_STATE LOW
@@ -89,6 +101,14 @@
 #define DEFAULT_TIME_ZONE "Europe/London|GMT0BST,M3.5.0/1,M10.5.0"
 #endif
 
+#ifndef LIMIT_DEFAULT_TYPE_DEFAULT
+#define LIMIT_DEFAULT_TYPE_DEFAULT ""
+#endif
+
+#ifndef LIMIT_DEFAULT_VALUE_DEFAULT
+#define LIMIT_DEFAULT_VALUE_DEFAULT 0
+#endif
+
 #ifndef VOLTAGE_DEFAULT
 #define VOLTAGE_DEFAULT  240
 #endif

src/emonesp.h

@@ -27,7 +27,4 @@
 #define ARRAY_ITEMS(a) (sizeof(a) / sizeof(a[0]))
 #endif
 
-// Message line buffer - shared across screens
-extern char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
-
 #endif // __LCD_COMMON_H

src/lcd_common.h

@@ -0,0 +1,68 @@
+static const char CONTENT_LOCK_PNG[] PROGMEM = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 
+  0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 
+  0x87, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 
+  0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 
+  0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 
+  0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x03, 0xa9, 0x49, 
+  0x44, 0x41, 0x54, 0x68, 0x81, 0xed, 0x5a, 0x5b, 0x6c, 0x0c, 0x51, 0x18, 0xfe, 0xce, 0x99, 0x99, 
+  0xdd, 0x6e, 0xb7, 0x5a, 0x6d, 0xb7, 0x17, 0x45, 0x11, 0x34, 0x92, 0xd2, 0x20, 0x4a, 0x83, 0x20, 
+  0xfa, 0x40, 0x25, 0xbc, 0x78, 0xa0, 0x5e, 0x78, 0x73, 0x49, 0xf0, 0xa4, 0x21, 0x22, 0x2e, 0x89, 
+  0x88, 0x27, 0xe2, 0xd6, 0x78, 0xf3, 0x42, 0xf1, 0x20, 0x91, 0x10, 0x6d, 0x04, 0x91, 0xb8, 0xb4, 
+  0x55, 0x89, 0x6c, 0xdd, 0xe2, 0x4e, 0xdc, 0x1a, 0xbd, 0x6e, 0x2f, 0x76, 0x76, 0x66, 0xe7, 0x78, 
+  0x10, 0x95, 0xc9, 0x98, 0xdd, 0x9d, 0xb3, 0x67, 0xac, 0xca, 0x7e, 0x6f, 0x7b, 0xfe, 0xff, 0xfc, 
+  0xdf, 0xf7, 0xed, 0xcc, 0x9c, 0xb3, 0xe7, 0x9f, 0x25, 0x8c, 0x31, 0x86, 0x11, 0x0c, 0x59, 0x64, 
+  0x31, 0xd6, 0x13, 0x82, 0x76, 0xef, 0x11, 0xf4, 0x96, 0xc7, 0x30, 0x3e, 0x76, 0x80, 0x75, 0xf5, 
+  0x01, 0x00, 0x48, 0x20, 0x07, 0xb4, 0xa4, 0x10, 0x72, 0xd5, 0x0c, 0x28, 0xf3, 0x67, 0x82, 0xe4, 
+  0x66, 0x0b, 0xe3, 0x24, 0x22, 0xae, 0x00, 0xeb, 0x1f, 0x84, 0xda, 0xd0, 0x88, 0xc8, 0x95, 0xdb, 
+  0x80, 0xaa, 0xc5, 0x4e, 0xf6, 0x28, 0xf0, 0xac, 0x5c, 0x0c, 0x6f, 0xed, 0x72, 0x90, 0x51, 0xfe, 
+  0x64, 0xa9, 0x93, 0x37, 0x10, 0x7d, 0xfd, 0x11, 0xdf, 0x0f, 0x9c, 0x86, 0xf1, 0xb5, 0xd3, 0xd1, 
+  0x3c, 0x1a, 0xc8, 0x85, 0x6f, 0xef, 0x46, 0x48, 0x65, 0x13, 0x92, 0xa1, 0x4f, 0xce, 0x40, 0xf4, 
+  0xc9, 0x6b, 0x0c, 0xed, 0x3a, 0x06, 0xa6, 0x46, 0xf8, 0x0a, 0x78, 0x15, 0xf8, 0x0f, 0x6d, 0x87, 
+  0x54, 0x3e, 0x99, 0x57, 0x02, 0xbf, 0x01, 0xe3, 0x6b, 0x27, 0x06, 0xb7, 0x1d, 0x06, 0xeb, 0x1b, 
+  0xb0, 0xc4, 0xe8, 0x98, 0x00, 0xe4, 0xaa, 0x0a, 0xd0, 0xe2, 0xc0, 0xcf, 0xdc, 0x2f, 0xdf, 0xa0, 
+  0xb7, 0xb4, 0xc3, 0xf8, 0x62, 0xbd, 0x4a, 0x24, 0x27, 0x0b, 0xfe, 0xe3, 0x3b, 0x41, 0x8b, 0xf2, 
+  0x79, 0x64, 0xf0, 0x1b, 0x18, 0xda, 0x73, 0x12, 0x7a, 0xeb, 0x63, 0x73, 0xb1, 0x2c, 0x1f, 0x32, 
+  0xb6, 0xac, 0x85, 0xb2, 0xb4, 0x12, 0x20, 0xc4, 0x3c, 0x81, 0x31, 0x68, 0x37, 0x5b, 0x11, 0x3e, 
+  0x75, 0x01, 0x6c, 0xe0, 0xbb, 0x29, 0x24, 0x57, 0x55, 0x20, 0x73, 0xff, 0x66, 0x1e, 0x19, 0xa0, 
+  0x3c, 0x93, 0xf4, 0xe0, 0x0b, 0xab, 0xf8, 0x9c, 0x2c, 0xf8, 0x8f, 0xd6, 0x41, 0xa9, 0x9e, 0x6b, 
+  0x15, 0x0f, 0x00, 0x84, 0x40, 0xa9, 0x9e, 0x07, 0xff, 0x91, 0x3a, 0x90, 0x6c, 0xf3, 0xc3, 0xab, 
+  0x37, 0x07, 0x11, 0x0d, 0xbe, 0xe4, 0x91, 0xc2, 0x67, 0x40, 0x6b, 0xba, 0x6f, 0x19, 0xf3, 0xed, 
+  0xd8, 0x00, 0x3a, 0xbe, 0x38, 0x3e, 0x61, 0x69, 0x31, 0x7c, 0x3b, 0x36, 0x58, 0xc6, 0x23, 0xd7, 
+  0xad, 0x35, 0x13, 0x81, 0x73, 0x03, 0x86, 0x01, 0xbd, 0xa5, 0xdd, 0x34, 0x24, 0x4d, 0x9f, 0x02, 
+  0xb9, 0xb2, 0x3c, 0xe1, 0x12, 0xf2, 0xdc, 0xe9, 0x96, 0x07, 0x57, 0x6f, 0x0e, 0x02, 0x1c, 0x77, 
+  0xb3, 0x63, 0x03, 0x46, 0x77, 0x1f, 0x58, 0xff, 0xa0, 0x69, 0x4c, 0x59, 0x30, 0xd3, 0x31, 0xb1, 
+  0xb2, 0x70, 0x96, 0xe9, 0x33, 0x0b, 0x0d, 0x82, 0xf5, 0x84, 0x1c, 0xd7, 0x71, 0x6c, 0x80, 0x75, 
+  0x5b, 0x49, 0xe8, 0xb8, 0x22, 0xe7, 0xc4, 0x63, 0x0b, 0x2d, 0x63, 0x46, 0x67, 0xaf, 0xf3, 0x3a, 
+  0x4e, 0x27, 0xb0, 0xb0, 0x6a, 0x1d, 0xcc, 0xf0, 0x38, 0x26, 0x86, 0xcf, 0x9b, 0x58, 0xed, 0x38, 
+  0xe0, 0x7a, 0x88, 0xff, 0x25, 0xa4, 0x0d, 0xa4, 0x1a, 0x71, 0x77, 0xe2, 0xe8, 0xab, 0x0f, 0xd0, 
+  0x6e, 0x3f, 0x04, 0xeb, 0xe8, 0x06, 0x98, 0x01, 0xd6, 0x3b, 0x00, 0x3d, 0xf8, 0xc2, 0x94, 0x23, 
+  0x57, 0x94, 0x81, 0x8c, 0xce, 0x72, 0x44, 0x1c, 0xb3, 0x0e, 0xa1, 0xa0, 0x45, 0x79, 0x90, 0x17, 
+  0xcf, 0x81, 0x34, 0x65, 0x3c, 0xbf, 0x01, 0xf5, 0xcc, 0x65, 0xa8, 0xe7, 0x9b, 0xb8, 0xd6, 0x67, 
+  0x21, 0x20, 0x04, 0xde, 0xda, 0xe5, 0xf0, 0xae, 0x5f, 0x65, 0x9b, 0x62, 0x7b, 0x0b, 0x69, 0x37, 
+  0x5a, 0xa0, 0x36, 0x34, 0xa6, 0x4e, 0x3c, 0x00, 0x30, 0x06, 0xf5, 0xdc, 0x35, 0x68, 0xb7, 0x1e, 
+  0xd8, 0xa6, 0xd8, 0x1a, 0x88, 0x5c, 0xba, 0xe9, 0x8a, 0x26, 0x1e, 0x44, 0x2e, 0xdd, 0xb0, 0x8d, 
+  0xd9, 0x1a, 0x88, 0xbe, 0xff, 0xec, 0x8a, 0x18, 0x1e, 0x44, 0xdf, 0x7e, 0xb2, 0x8d, 0xd9, 0xaf, 
+  0x42, 0x9a, 0xee, 0x86, 0x16, 0x3e, 0xc4, 0xd0, 0x32, 0xe2, 0x97, 0xd1, 0xb4, 0x81, 0x54, 0x23, 
+  0x6d, 0x20, 0xd5, 0x10, 0xda, 0x99, 0xfb, 0x05, 0x92, 0x99, 0x01, 0xa5, 0x66, 0x21, 0xa4, 0x69, 
+  0x93, 0x00, 0x00, 0xd1, 0x67, 0x6f, 0xa0, 0x35, 0xde, 0x05, 0x1b, 0x0a, 0x0b, 0xe7, 0x12, 0x6e, 
+  0x80, 0x4e, 0x2c, 0x81, 0xff, 0xe0, 0x56, 0x90, 0xc0, 0xe8, 0xe1, 0x31, 0x65, 0xd1, 0x6c, 0x78, 
+  0x56, 0x57, 0x63, 0x68, 0xf7, 0x09, 0x18, 0xef, 0xc4, 0xee, 0x2f, 0x62, 0x6f, 0x21, 0x45, 0x46, 
+  0xe6, 0xbe, 0x4d, 0x26, 0xf1, 0xc3, 0x44, 0x81, 0x5c, 0x64, 0xee, 0xdd, 0x04, 0xc8, 0x62, 0xbf, 
+  0x33, 0xa1, 0x06, 0xe4, 0xca, 0x72, 0xd0, 0x31, 0x05, 0xf6, 0x64, 0x25, 0x05, 0x8e, 0x0e, 0xff, 
+  0x89, 0x40, 0xa8, 0x01, 0x29, 0x81, 0xb6, 0x8a, 0x54, 0x1a, 0x3f, 0xc7, 0x09, 0x84, 0x1a, 0x30, 
+  0x42, 0xd6, 0x36, 0xa3, 0x25, 0xa7, 0xb7, 0x5f, 0x24, 0xa5, 0x58, 0x03, 0x7a, 0x73, 0x7b, 0xcc, 
+  0xf6, 0x3a, 0x53, 0x23, 0x96, 0x8e, 0x5e, 0xb2, 0x10, 0x6a, 0x80, 0xf5, 0x84, 0x10, 0xae, 0xbf, 
+  0xf8, 0xe7, 0x33, 0x04, 0x63, 0x08, 0xd7, 0x5f, 0xe4, 0xea, 0xfd, 0xc4, 0x82, 0xf0, 0x65, 0x34, 
+  0x72, 0xed, 0x0e, 0x8c, 0x6f, 0xdd, 0xf0, 0xae, 0x5b, 0xf1, 0x7b, 0x1f, 0x78, 0xfe, 0x16, 0xea, 
+  0xd9, 0xab, 0xd0, 0x1f, 0x3e, 0x13, 0x4d, 0xe7, 0xce, 0x46, 0xa6, 0xb7, 0x3d, 0x85, 0xde, 0xf6, 
+  0xf4, 0x77, 0x93, 0xd7, 0xc5, 0x53, 0x9d, 0x2b, 0x06, 0x86, 0xf1, 0x17, 0x8e, 0xa3, 0x23, 0xfe, 
+  0xb7, 0x50, 0xda, 0x40, 0xaa, 0xf1, 0x1f, 0x1b, 0xf8, 0xd3, 0x6b, 0xa2, 0x54, 0x21, 0x86, 0x16, 
+  0x5b, 0x03, 0xb4, 0x20, 0xd7, 0x15, 0x2d, 0x3c, 0xa0, 0x85, 0x79, 0xf6, 0x31, 0xbb, 0x80, 0xbc, 
+  0x64, 0x8e, 0x2b, 0x62, 0x78, 0xa0, 0xc4, 0xd0, 0x62, 0x6b, 0xc0, 0xbb, 0xae, 0x06, 0xd2, 0xd4, 
+  0x52, 0x57, 0x04, 0x39, 0x81, 0x54, 0x36, 0x01, 0x9e, 0xda, 0x1a, 0xdb, 0x78, 0xcc, 0xe6, 0x2e, 
+  0x0b, 0xab, 0x88, 0x5c, 0x68, 0x82, 0x76, 0xab, 0x0d, 0x46, 0x47, 0x17, 0x60, 0x18, 0xae, 0x88, 
+  0xb4, 0x80, 0x52, 0xd0, 0xa2, 0x7c, 0x28, 0x4b, 0x2b, 0xe1, 0x59, 0xb3, 0x0c, 0xc4, 0x6b, 0xff, 
+  0x06, 0x48, 0xc8, 0x9f, 0x3d, 0x52, 0x89, 0x1f, 0x84, 0x04, 0x44, 0xbc, 0x01, 0xce, 0x27, 0xf2, 
+  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00 };
+static const char CONTENT_LOCK_PNG_ETAG[] PROGMEM = "2adc4e2aa7d940943c70a2bcce2e17dd05b6156d7d8b5841a86a63d816ee5d9c";

src/lcd_static/lcd_gui.lock_png.h

@@ -7,6 +7,7 @@
 #include "lcd_gui.connected_png.h"
 #include "lcd_gui.disabled_png.h"
 #include "lcd_gui.error_png.h"
+#include "lcd_gui.lock_png.h"
 #include "lcd_gui.logo_png.h"
 #include "lcd_gui.no_wifi_png.h"
 #include "lcd_gui.not_connected_png.h"
@@ -23,6 +24,7 @@ StaticFile lcd_gui_static_files[] = {
   { "/connected.png", CONTENT_CONNECTED_PNG, sizeof(CONTENT_CONNECTED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_CONNECTED_PNG_ETAG, false },
   { "/disabled.png", CONTENT_DISABLED_PNG, sizeof(CONTENT_DISABLED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_DISABLED_PNG_ETAG, false },
   { "/error.png", CONTENT_ERROR_PNG, sizeof(CONTENT_ERROR_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_ERROR_PNG_ETAG, false },
+  { "/lock.png", CONTENT_LOCK_PNG, sizeof(CONTENT_LOCK_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_LOCK_PNG_ETAG, false },
   { "/logo.png", CONTENT_LOGO_PNG, sizeof(CONTENT_LOGO_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_LOGO_PNG_ETAG, false },
   { "/no_wifi.png", CONTENT_NO_WIFI_PNG, sizeof(CONTENT_NO_WIFI_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_NO_WIFI_PNG_ETAG, false },
   { "/not_connected.png", CONTENT_NOT_CONNECTED_PNG, sizeof(CONTENT_NOT_CONNECTED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_NOT_CONNECTED_PNG_ETAG, false },