Merge branch 'master' of github.com:OpenEVSE/ESP32_WiFi_V3.x

Author: glynhudson

.travis.yml

@@ -34,6 +34,7 @@ env:
   - PIO_ENV=openevse_featheresp32
   - PIO_ENV=openevse_esp32-gateway
   - PIO_ENV=openevse_esp32-gateway-e
+  - PIO_ENV=openevse_esp32-heltec-wifi-lora-v2
   # - SCRIPT=ci_arduino.sh
   #   BUILD_TARGET=esp8266:esp8266:huzzah:FlashSize=4M1M
 

gui

@@ -34,7 +34,7 @@ version = -DBUILD_TAG=3.0.2
 monitor_speed = 115200
 lib_deps =
   [email protected]
-  [email protected].6
+  [email protected].7
 extra_scripts = scripts/extra_script.py
 debug_flags =
   -DENABLE_DEBUG
@@ -82,6 +82,7 @@ platform_stage = https://github.com/platformio/platform-espressif8266.git#featur
 #platform_esp32 = https://github.com/platformio/platform-espressif32.git#feature/stage
 #platform_esp32 = https://github.com/platformio/platform-espressif32.git#develop
 platform_esp32 = [email protected]
+#platform_esp32 = espressif32
 
 [env:openevse]
 platform = ${common.platform}
@@ -278,23 +279,38 @@ extra_scripts = ${common.extra_scripts}
 board_build.partitions = ${common.build_partitions_esp32}
 
 [env:openevse_esp32-gateway-e]
+extends = env:openevse_esp32-gateway
+framework = arduino
+build_flags =
+  ${common.build_flags}
+  ${common.build_flags_esp32}
+  -DRX2=16
+  -DTX2=32
+board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'E\'"
+
+[env:openevse_esp32-heltec-wifi-lora-v2]
 platform = ${common.platform_esp32}
-board = esp32-gateway
+board = heltec_wifi_lora_32_V2
 framework = arduino
 lib_deps = ${common.lib_deps}
 src_build_flags =
   ${common.version}.dev
   ${common.src_build_flags}
   ${common.src_build_flags_esp32}
   ${common.debug_flags_esp32}
-  ${common.src_build_flags_esp32_gateway}
+  -DWIFI_LED=25
+  -DWIFI_BUTTON=2
+  -DWIFI_LED_ON_STATE=HIGH
+  -DRAPI_PORT=Serial1
+  -DONBOARD_LEDS=0,2,4
 build_flags =
   ${common.build_flags}
   ${common.build_flags_esp32}
-  -DRX2=16
-  -DTX2=32
-upload_speed = 115200
+  -DRX1=25
+  -DTX1=27
+#upload_port = openevse.local
+#upload_speed = 921600
+upload_protocol = esptool
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 board_build.partitions = ${common.build_partitions_esp32}
-board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'E\'"

platformio.ini

@@ -204,7 +204,7 @@ config_load_settings() {
   EEPROM_read_string(EEPROM_EMON_API_KEY_START, EEPROM_EMON_API_KEY_SIZE,
                      emoncms_apikey);
   EEPROM_read_string(EEPROM_EMON_SERVER_START, EEPROM_EMON_SERVER_SIZE,
-                     emoncms_server, "data.openevse.com/emoncms");
+                     emoncms_server, "https://data.openevse.com/emoncms");
   EEPROM_read_string(EEPROM_EMON_NODE_START, EEPROM_EMON_NODE_SIZE,
                      emoncms_node, esp_hostname);
   EEPROM_read_string(EEPROM_EMON_FINGERPRINT_START, EEPROM_EMON_FINGERPRINT_SIZE,

src/app_config.cpp

@@ -15,7 +15,6 @@ MongooseMqttClient mqttclient;
 long lastMqttReconnectAttempt = 0;
 int clientTimeout = 0;
 int i = 0;
-String payload_str = "";
 bool connecting = false;
 
 String lastWill = "";
@@ -34,7 +33,7 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {
   DBUGLN("MQTT received:");
   DBUGLN("Topic: " + topic_string);
 
-  payload_str = payload.toString();
+  String payload_str = payload.toString();
   DBUGLN("Payload: " + payload_str);
 
   // If MQTT message is solar PV
@@ -61,6 +60,7 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {
     // Detect if MQTT message is a RAPI command e.g to set 13A <base-topic>/rapi/$SC 13
     // Locate '$' character in the MQTT message to identify RAPI command
     int rapi_character_index = topic_string.indexOf('$');
+    DBUGVAR(rapi_character_index);
     if (rapi_character_index > 1) {
       DBUGF("Processing as RAPI");
       // Print RAPI command from mqtt-sub topic e.g $SC

src/mqtt.cpp

@@ -319,7 +319,7 @@ void net_event(WiFiEvent_t event, system_event_info_t info)
       DBUGLN("ETH Started");
       //set eth hostname here
       if(ETH.setHostname(esp_hostname.c_str())) {
-        DBUGF("Set host name to %s", WiFi.getHostname());
+        DBUGF("Set host name to %s", ETH.getHostname());
       } else {
         DBUGF("Setting host name failed: %s", esp_hostname.c_str());
       }

src/net_manager.cpp

@@ -588,6 +588,8 @@ handleConfig(MongooseHttpServerRequest *request) {
   s += "\",";
   s += "\"mqtt_solar\":\""+mqtt_solar+"\",";
   s += "\"mqtt_grid_ie\":\""+mqtt_grid_ie+"\",";
+  s += "\"mqtt_supported_protocols\":[\"mqtt\"],";
+  s += "\"http_supported_protocols\":[\"http\",\"https\"],";
   s += "\"www_username\":\"" + www_username + "\",";
   s += "\"www_password\":\"";
   if(www_password != 0) {