Merge remote-tracking branch 'upstream/master'

Author: HendrikVE

boards.txt

@@ -101,6 +101,82 @@ esp32.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+cw02.name=XinaBox CW02
+
+cw02.upload.tool=esptool
+cw02.upload.maximum_size=1310720
+cw02.upload.maximum_data_size=294912
+cw02.upload.wait_for_upload_port=true
+
+cw02.serial.disableDTR=true
+cw02.serial.disableRTS=true
+
+cw02.build.mcu=esp32
+cw02.build.core=esp32
+cw02.build.variant=xinabox
+cw02.build.board=ESP32_DEV
+
+cw02.build.f_cpu=240000000L
+cw02.build.flash_size=4MB
+cw02.build.flash_freq=40m
+cw02.build.flash_mode=dio
+cw02.build.boot=dio
+cw02.build.partitions=default
+
+cw02.menu.FlashMode.qio=QIO
+cw02.menu.FlashMode.qio.build.flash_mode=dio
+cw02.menu.FlashMode.qio.build.boot=qio
+cw02.menu.FlashMode.dio=DIO
+cw02.menu.FlashMode.dio.build.flash_mode=dio
+cw02.menu.FlashMode.dio.build.boot=dio
+cw02.menu.FlashMode.qout=QOUT
+cw02.menu.FlashMode.qout.build.flash_mode=dout
+cw02.menu.FlashMode.qout.build.boot=qout
+cw02.menu.FlashMode.dout=DOUT
+cw02.menu.FlashMode.dout.build.flash_mode=dout
+cw02.menu.FlashMode.dout.build.boot=dout
+
+cw02.menu.FlashFreq.80=80MHz
+cw02.menu.FlashFreq.80.build.flash_freq=80m
+cw02.menu.FlashFreq.40=40MHz
+cw02.menu.FlashFreq.40.build.flash_freq=40m
+
+cw02.menu.FlashSize.4M=4MB (32Mb)
+cw02.menu.FlashSize.4M.build.flash_size=4MB
+cw02.menu.FlashSize.2M=2MB (16Mb)
+cw02.menu.FlashSize.2M.build.flash_size=2MB
+cw02.menu.FlashSize.2M.build.partitions=minimal
+
+cw02.menu.UploadSpeed.921600=921600
+cw02.menu.UploadSpeed.921600.upload.speed=921600
+cw02.menu.UploadSpeed.115200=115200
+cw02.menu.UploadSpeed.115200.upload.speed=115200
+cw02.menu.UploadSpeed.256000.windows=256000
+cw02.menu.UploadSpeed.256000.upload.speed=256000
+cw02.menu.UploadSpeed.230400.windows.upload.speed=256000
+cw02.menu.UploadSpeed.230400=230400
+cw02.menu.UploadSpeed.230400.upload.speed=230400
+cw02.menu.UploadSpeed.460800.linux=460800
+cw02.menu.UploadSpeed.460800.macosx=460800
+cw02.menu.UploadSpeed.460800.upload.speed=460800
+cw02.menu.UploadSpeed.512000.windows=512000
+cw02.menu.UploadSpeed.512000.upload.speed=512000
+
+cw02.menu.DebugLevel.none=None
+cw02.menu.DebugLevel.none.build.code_debug=0
+cw02.menu.DebugLevel.error=Error
+cw02.menu.DebugLevel.error.build.code_debug=1
+cw02.menu.DebugLevel.warn=Warn
+cw02.menu.DebugLevel.warn.build.code_debug=2
+cw02.menu.DebugLevel.info=Info
+cw02.menu.DebugLevel.info.build.code_debug=3
+cw02.menu.DebugLevel.debug=Debug
+cw02.menu.DebugLevel.debug.build.code_debug=4
+cw02.menu.DebugLevel.verbose=Verbose
+cw02.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 esp32wrover.name=ESP32 Wrover Module
 
 esp32wrover.upload.tool=esptool

libraries/AsyncUDP/src/AsyncUDP.cpp

@@ -286,6 +286,8 @@ AsyncUDPPacket::AsyncUDPPacket(AsyncUDP *udp, pbuf *pb, const ip_addr_t *raddr,
     _len = pb->len;
     _index = 0;
 
+    pbuf_ref(_pb);
+
     //memcpy(&_remoteIp, raddr, sizeof(ip_addr_t));
     _remoteIp.type = raddr->type;
     _localIp.type = _remoteIp.type;

libraries/HTTPClient/src/HTTPClient.cpp

@@ -252,7 +252,7 @@ void HTTPClient::end(void)
 bool HTTPClient::connected()
 {
     if(_tcp) {
-        return (_tcp->connected() || (_tcp->available() > 0));
+        return ((_tcp->available() > 0) || _tcp->connected());
     }
     return false;
 }

libraries/WiFi/src/WiFiClient.cpp

@@ -438,22 +438,9 @@ uint8_t WiFiClient::connected()
     if (_connected) {
         uint8_t dummy;
         int res = recv(fd(), &dummy, 0, MSG_DONTWAIT);
-        if (res < 0) {
-            switch (errno) {
-                case ENOTCONN:
-                case EPIPE:
-                case ECONNRESET:
-                case ECONNREFUSED:
-                case ECONNABORTED:
-                    _connected = false;
-                    break;
-                default:
-                    _connected = true;
-                    break;
-            }
-        }
-        else {
-            _connected = true;
+        if (res <= 0 && errno != EWOULDBLOCK) {
+            _connected = false;
+            log_i("Disconnected: RES: %d, ERR: %d", res, errno);
         }
     }
     return _connected;

libraries/WiFi/src/WiFiGeneric.cpp

@@ -334,7 +334,7 @@ void WiFiGenericClass::removeEvent(wifi_event_id_t id)
  * @param arg
  */
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
-const char * system_event_names[] = { "WIFI_READY", "SCAN_DONE", "STA_START", "STA_STOP", "STA_CONNECTED", "STA_DISCONNECTED", "STA_AUTHMODE_CHANGE", "STA_GOT_IP", "STA_LOST_IP", "STA_WPS_ER_SUCCESS", "STA_WPS_ER_FAILED", "STA_WPS_ER_TIMEOUT", "STA_WPS_ER_PIN", "AP_START", "AP_STOP", "AP_STACONNECTED", "AP_STADISCONNECTED", "AP_PROBEREQRECVED", "AP_PROBEREQRECVED", "GOT_IP6", "ETH_START", "ETH_STOP", "ETH_CONNECTED", "ETH_DISCONNECTED", "ETH_GOT_IP", "MAX"};
+const char * system_event_names[] = { "WIFI_READY", "SCAN_DONE", "STA_START", "STA_STOP", "STA_CONNECTED", "STA_DISCONNECTED", "STA_AUTHMODE_CHANGE", "STA_GOT_IP", "STA_LOST_IP", "STA_WPS_ER_SUCCESS", "STA_WPS_ER_FAILED", "STA_WPS_ER_TIMEOUT", "STA_WPS_ER_PIN", "AP_START", "AP_STOP", "AP_STACONNECTED", "AP_STADISCONNECTED", "AP_STAIPASSIGNED", "AP_PROBEREQRECVED", "GOT_IP6", "ETH_START", "ETH_STOP", "ETH_CONNECTED", "ETH_DISCONNECTED", "ETH_GOT_IP", "MAX"};
 #endif
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN
 const char * system_event_reasons[] = { "UNSPECIFIED", "AUTH_EXPIRE", "AUTH_LEAVE", "ASSOC_EXPIRE", "ASSOC_TOOMANY", "NOT_AUTHED", "NOT_ASSOCED", "ASSOC_LEAVE", "ASSOC_NOT_AUTHED", "DISASSOC_PWRCAP_BAD", "DISASSOC_SUPCHAN_BAD", "UNSPECIFIED", "IE_INVALID", "MIC_FAILURE", "4WAY_HANDSHAKE_TIMEOUT", "GROUP_KEY_UPDATE_TIMEOUT", "IE_IN_4WAY_DIFFERS", "GROUP_CIPHER_INVALID", "PAIRWISE_CIPHER_INVALID", "AKMP_INVALID", "UNSUPP_RSN_IE_VERSION", "INVALID_RSN_IE_CAP", "802_1X_AUTH_FAILED", "CIPHER_SUITE_REJECTED", "BEACON_TIMEOUT", "NO_AP_FOUND", "AUTH_FAIL", "ASSOC_FAIL", "HANDSHAKE_TIMEOUT" };

tools/build-release.sh

@@ -229,6 +229,7 @@ find $outdir -name '*.DS_Store' -exec rm -f {} \;
 # handles tool paths differently when package is installed in hardware folder
 echo " - updating platform.txt..."
 cat $srcdir/platform.txt | \
+sed "s/version=.*/version=$ver$extent/g" | \
 sed 's/runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf//g' | \
 sed 's/tools.esptool.path={runtime.platform.path}\/tools\/esptool/tools.esptool.path=\{runtime.tools.esptool.path\}/g' \
  > $outdir/platform.txt

variants/xinabox/pins_arduino.h

@@ -0,0 +1,28 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+static const uint8_t LED_BUILTIN = 27;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 21;
+static const uint8_t SCL = 22;
+
+static const uint8_t SS    = 5;
+static const uint8_t MOSI  = 23;
+static const uint8_t MISO  = 19;
+static const uint8_t SCK   = 18;
+
+#endif /* Pins_Arduino_h */