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

Author: glynhudson

platformio.ini

@@ -81,7 +81,7 @@ platform = https://github.com/platformio/platform-espressif8266.git#release/v1.6
 platform_stage = https://github.com/platformio/platform-espressif8266.git#feature/stage
 #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].0
+platform_esp32 = [email protected].1
 
 [env:openevse]
 platform = ${common.platform}
@@ -200,31 +200,8 @@ extra_scripts = ${common.extra_scripts}
 board_build.partitions = ${common.build_partitions_esp32}
 
 [env:openevse_esp-wrover-kit_idf]
-platform = ${common.platform_esp32}
-board = esp-wrover-kit
+extends = env:openevse_esp-wrover-kit
 framework = arduino, espidf
-lib_deps = ${common.lib_deps}
-src_build_flags =
-  ${common.version}.dev
-  ${common.src_build_flags}
-  ${common.src_build_flags_esp32}
-  ${common.debug_flags_esp32}
-  -DWIFI_LED=4
-  -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}
-  -DRX1=25
-  -DTX1=27
-#upload_port = openevse.local
-#upload_speed = 921600
-upload_protocol = ftdi
-monitor_speed = 115200
-extra_scripts = ${common.extra_scripts}
-board_build.partitions = ${common.build_partitions_esp32}
 
 # export PLATFORMIO_UPLOAD_PORT=172.16.0.157
 # export PLATFORMIO_UPLOAD_FLAGS="-p 3232"
@@ -254,6 +231,10 @@ monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 board_build.partitions = ${common.build_partitions_esp32}
 
+[env:openevse_huzzah32_idf]
+extends = env:openevse_huzzah32
+framework = arduino, espidf
+
 [env:openevse_featheresp32]
 platform = ${common.platform_esp32}
 board = featheresp32

src/RapiSender.cpp

@@ -194,7 +194,7 @@ RapiSender::sendCmd(String &cmdstr, RapiCommandCompleteHandler callback, unsigne
     if(!_waitingForReply) {
       _sendNextCmd();
     }
-  } else {
+  } else if(nullptr != callback) {
     callback(RAPI_RESPONSE_QUEUE_FULL);
   }
 }

src/main.cpp

@@ -64,10 +64,9 @@ void setup()
   HAL.begin();
 
   DEBUG.println();
-  DEBUG.print("OpenEVSE WiFI ");
-  DEBUG.println(HAL.getShortId());
-  DEBUG.println("Firmware: " + currentfirmware);
-
+  DEBUG.printf("OpenEVSE WiFI %s\n", HAL.getShortId().c_str());
+  DEBUG.printf("Firmware: %s\n", currentfirmware.c_str());
+  DEBUG.printf("IDF version: %s\n", ESP.getSdkVersion());
   DEBUG.printf("Free: %d\n", HAL.getFreeHeap());
 
   // Read saved settings from the config

src/net_manager.cpp

@@ -111,15 +111,11 @@ startClient()
 
   client_disconnects = 0;
 
-  WiFi.begin(esid.c_str(), epass.c_str());
-#ifdef ESP32
-  WiFi.enableSTA(true);
-  WiFi.setHostname(esp_hostname.c_str());
-  DBUGVAR(WiFi.getHostname());
-#else
+#ifndef ESP32
   WiFi.hostname(esp_hostname.c_str());
-  WiFi.enableSTA(true);
 #endif // !ESP32
+
+  WiFi.begin(esid.c_str(), epass.c_str());
 }
 
 static void net_wifi_start()
@@ -138,8 +134,6 @@ static void net_wifi_start()
 
 static void display_state()
 {
-  DBUGVAR(WiFi.getHostname());
-
   lcd_display(F("Hostname:"), 0, 0, 0, LCD_CLEAR_LINE);
   lcd_display(esp_hostname.c_str(), 0, 1, 5000, LCD_CLEAR_LINE);
 
@@ -261,6 +255,22 @@ void net_event(WiFiEvent_t event, system_event_info_t info)
 
   switch (event)
   {
+    case SYSTEM_EVENT_AP_START:
+    {
+      if(WiFi.softAPsetHostname(esp_hostname.c_str())) {
+        DBUGF("Set host name to %s", WiFi.softAPgetHostname());
+      } else {
+        DBUGF("Setting host name failed: %s", esp_hostname.c_str());
+      }
+    } break;
+    case SYSTEM_EVENT_STA_START:
+    {
+      if(WiFi.setHostname(esp_hostname.c_str())) {
+        DBUGF("Set host name to %s", WiFi.getHostname());
+      } else {
+        DBUGF("Setting host name failed: %s", esp_hostname.c_str());
+      }
+    } break;
     case SYSTEM_EVENT_STA_CONNECTED:
     {
       auto& src = info.connected;
@@ -308,7 +318,11 @@ void net_event(WiFiEvent_t event, system_event_info_t info)
     case SYSTEM_EVENT_ETH_START:
       DBUGLN("ETH Started");
       //set eth hostname here
-      ETH.setHostname("esp32-ethernet");
+      if(ETH.setHostname(esp_hostname.c_str())) {
+        DBUGF("Set host name to %s", WiFi.getHostname());
+      } else {
+        DBUGF("Setting host name failed: %s", esp_hostname.c_str());
+      }
       break;
     case SYSTEM_EVENT_ETH_CONNECTED:
       DBUGLN("ETH Connected");