Merge pull request #1 from espressif/master

up to 11/05/2017

Author: stickbreaker

boards.txt

@@ -122,6 +122,44 @@ esp32thing.menu.UploadSpeed.512000.upload.speed=512000
 
 ##############################################################
 
+nina_w10.name=u-blox NINA-W10 series (ESP32)
+
+nina_w10.upload.tool=esptool
+nina_w10.upload.maximum_size=1310720
+nina_w10.upload.maximum_data_size=294912
+nina_w10.upload.wait_for_upload_port=true
+
+nina_w10.serial.disableDTR=true
+nina_w10.serial.disableRTS=true
+
+nina_w10.build.mcu=esp32
+nina_w10.build.core=esp32
+nina_w10.build.variant=nina_w10
+nina_w10.build.board=UBLOX_NINA_W10
+nina_w10.build.f_cpu=240000000L
+nina_w10.build.boot=bootloader
+nina_w10.build.partitions=minimal
+nina_w10.build.flash_mode=dio
+nina_w10.build.flash_size=2MB
+nina_w10.build.flash_freq=40m
+
+nina_w10.menu.UploadSpeed.921600=921600
+nina_w10.menu.UploadSpeed.921600.upload.speed=921600
+nina_w10.menu.UploadSpeed.115200=115200
+nina_w10.menu.UploadSpeed.115200.upload.speed=115200
+nina_w10.menu.UploadSpeed.256000.windows=256000
+nina_w10.menu.UploadSpeed.256000.upload.speed=256000
+nina_w10.menu.UploadSpeed.230400.windows.upload.speed=256000
+nina_w10.menu.UploadSpeed.230400=230400
+nina_w10.menu.UploadSpeed.230400.upload.speed=230400
+nina_w10.menu.UploadSpeed.460800.linux=460800
+nina_w10.menu.UploadSpeed.460800.macosx=460800
+nina_w10.menu.UploadSpeed.460800.upload.speed=460800
+nina_w10.menu.UploadSpeed.512000.windows=512000
+nina_w10.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+
 widora-air.name=Widora AIR
 
 widora-air.upload.tool=esptool
@@ -1377,4 +1415,4 @@ CoreESP32.menu.UploadSpeed.460800.linux=460800
 CoreESP32.menu.UploadSpeed.460800.macosx=460800
 CoreESP32.menu.UploadSpeed.460800.upload.speed=460800
 CoreESP32.menu.UploadSpeed.512000.windows=512000
-CoreESP32.menu.UploadSpeed.512000.upload.speed=512000
+CoreESP32.menu.UploadSpeed.512000.upload.speed=512000

cores/esp32/Arduino.h

@@ -33,6 +33,7 @@
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "esp32-hal.h"
+#include "esp8266-compat.h"
 #include "soc/gpio_reg.h"
 
 #include "stdlib_noniso.h"

cores/esp32/esp32-hal-i2c.c

@@ -340,7 +340,8 @@ i2c_err_t i2cRead(i2c_t * i2c, uint16_t address, bool addr_10bit, uint8_t * data
             // Save bytes from the buffer as they arrive instead of doing them at the end of the loop since there is no
             // pause from an END operation in this approach.
             if((!isEndNear) && (nextCmdCount < 2)) {
-                if (willRead = ((len>32)?32:len)) {
+                willRead = ((len>32)?32:len);
+                if (willRead > 0) {
                     if (willRead > 1) {
                         i2cSetCmd(i2c, cmdIdx, I2C_CMD_READ, (amountRead[ inc( &cmdIdx ) ] = willRead -1), false, false, false);
                         nextCmdCount++;

tools/sdk/include/lwip/port/netinet/in.h renamed to cores/esp32/esp8266-compat.h

@@ -1,22 +1,24 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef IN_H_
-#define IN_H_
-
-#include "lwip/inet.h"
-
-#define IN6_IS_ADDR_MULTICAST(a)    IN_MULTICAST(a)
-
-#endif /* IN_H_ */
+// esp8266-compat.h - Compatibility functions to help ESP8266 libraries and user code run on ESP32
+
+// Copyright (c) 2017 Evandro Luis Copercini. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _ESP8266_COMPAT_H_
+#define _ESP8266_COMPAT_H_
+
+#define ICACHE_FLASH_ATTR
+#define ICACHE_RAM_ATTR IRAM_ATTR
+
+
+#endif /* _ESP8266_COMPAT_H_ */

libraries/ArduinoOTA/src/ArduinoOTA.cpp

@@ -122,11 +122,11 @@ void ArduinoOTAClass::begin() {
 }
 
 int ArduinoOTAClass::parseInt(){
-    char data[16];
+    char data[INT_BUFFER_SIZE];
     uint8_t index = 0;
     char value;
     while(_udp_ota.peek() == ' ') _udp_ota.read();
-    while(true){
+    while(index < INT_BUFFER_SIZE - 1){
         value = _udp_ota.peek();
         if(value < '0' || value > '9'){
             data[index++] = '\0';
@@ -347,15 +347,27 @@ void ArduinoOTAClass::_runUpdate() {
     }
 }
 
+void ArduinoOTAClass::end() {
+    _initialized = false;
+    _udp_ota.stop();
+    if(_mdnsEnabled){
+        MDNS.end();
+    }
+    _state = OTA_IDLE;
+#ifdef OTA_DEBUG
+    OTA_DEBUG.println("OTA server stopped.");
+#endif
+}
+
 void ArduinoOTAClass::handle() {
     if (_state == OTA_RUNUPDATE) {
         _runUpdate();
         _state = OTA_IDLE;
     }
     if(_udp_ota.parsePacket()){
         _onRx();
-        _udp_ota.flush();
     }
+    _udp_ota.flush(); // always flush, even zero length packets must be flushed.
 }
 
 int ArduinoOTAClass::getCommand() {

libraries/ArduinoOTA/src/ArduinoOTA.h

@@ -5,6 +5,9 @@
 #include <functional>
 #include "Update.h"
 
+#define INT_BUFFER_SIZE 16
+
+
 typedef enum {
   OTA_IDLE,
   OTA_WAITAUTH,
@@ -63,6 +66,9 @@ class ArduinoOTAClass
     //Starts the ArduinoOTA service
     void begin();
 
+    //Ends the ArduinoOTA service
+    void end();
+
     //Call this in loop() to run the service
     void handle();
 

libraries/HTTPClient/src/HTTPClient.cpp

@@ -54,8 +54,8 @@ class TransportTraits
 class TLSTraits : public TransportTraits
 {
 public:
-    TLSTraits(const char* CAcert) :
-        _cacert(CAcert)
+    TLSTraits(const char* CAcert, const char* clicert = nullptr, const char* clikey = nullptr) :
+        _cacert(CAcert), _clicert(clicert), _clikey(clikey)
     {
     }
 
@@ -67,12 +67,16 @@ class TLSTraits : public TransportTraits
     bool verify(WiFiClient& client, const char* host) override
     {
          WiFiClientSecure& wcs = static_cast<WiFiClientSecure&>(client);
-		 wcs.setCACert(_cacert);
+         wcs.setCACert(_cacert);
+         wcs.setCertificate(_clicert);
+         wcs.setPrivateKey(_clikey);
          return true;
     }
 
 protected:
     const char* _cacert;
+    const char* _clicert;
+    const char* _clikey;
 };
 
 /**
@@ -203,6 +207,20 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
     return true;
 }
 
+bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcert, const char* cli_cert, const char* cli_key)
+{
+    clear();
+    _host = host;
+    _port = port;
+    _uri = uri;
+
+    if (strlen(CAcert) == 0) {
+        return false;
+    }
+    _transportTraits = TransportTraitsPtr(new TLSTraits(CAcert, cli_cert, cli_key));
+    return true;
+}
+
 /**
  * end
  * called after the payload is handled

libraries/HTTPClient/src/HTTPClient.h

@@ -129,6 +129,7 @@ class HTTPClient
     bool begin(String url, const char* CAcert);
     bool begin(String host, uint16_t port, String uri = "/");
     bool begin(String host, uint16_t port, String uri, const char* CAcert);
+    bool begin(String host, uint16_t port, String uri, const char* CAcert, const char* cli_cert, const char* cli_key);
 
     void end(void);
 

platform.txt

@@ -3,9 +3,10 @@ version=0.0.1
 
 runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
 
-tools.esptool.cmd="{runtime.platform.path}/tools/esptool"
-tools.esptool.cmd.linux=python "{runtime.platform.path}/tools/esptool.py"
-tools.esptool.cmd.windows="{runtime.platform.path}/tools/esptool.exe"
+tools.esptool.path={runtime.platform.path}/tools
+tools.esptool.cmd=esptool
+tools.esptool.cmd.linux=esptool.py
+tools.esptool.cmd.windows=esptool.exe
 
 tools.esptool.network_cmd=python "{runtime.platform.path}/tools/espota.py"
 tools.esptool.network_cmd.windows="{runtime.platform.path}/tools/espota.exe"
@@ -78,7 +79,8 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
 recipe.objcopy.eep.pattern={tools.gen_esp32part.cmd} -q "{runtime.platform.path}/tools/partitions/{build.partitions}.csv" "{build.path}/{build.project_name}.partitions.bin"
 
 ## Create hex
-recipe.objcopy.hex.pattern={tools.esptool.cmd} --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
+recipe.objcopy.hex.pattern="{tools.esptool.path}/{tools.esptool.cmd}" --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
+recipe.objcopy.hex.pattern.linux=python "{tools.esptool.path}/{tools.esptool.cmd}" --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin
@@ -94,5 +96,6 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
 tools.esptool.upload.protocol=esp32
 tools.esptool.upload.params.verbose=
 tools.esptool.upload.params.quiet=
-tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
+tools.esptool.upload.pattern="{path}/{cmd}" --chip esp32 --port "{serial.port}" --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
+tools.esptool.upload.pattern.linux=python "{path}/{cmd}" --chip esp32 --port "{serial.port}" --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
 tools.esptool.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"

tools/get.py

@@ -24,7 +24,7 @@
 if 'Windows' in platform.system():
     import requests
 
-current_dir = os.path.dirname(os.path.realpath(__file__))
+current_dir = os.path.dirname(os.path.realpath(unicode(__file__)))
 dist_dir = current_dir + '/dist/'
 
 def sha256sum(filename, blocksize=65536):

tools/sdk/bin/bootloader.bin

@@ -68,7 +68,6 @@
 #define CONFIG_CONSOLE_UART_NUM 0
 #define CONFIG_ESP32_APPTRACE_LOCK_ENABLE 1
 #define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
-#define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
 #define CONFIG_TCP_OVERSIZE_MSS 1
 #define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
 #define CONFIG_CONSOLE_UART_DEFAULT 1
@@ -85,7 +84,7 @@
 #define CONFIG_TCPIP_TASK_STACK_SIZE 2560
 #define CONFIG_FATFS_CODEPAGE_850 1
 #define CONFIG_TASK_WDT 1
-#define CONFIG_MAIN_TASK_STACK_SIZE 8192
+#define CONFIG_MAIN_TASK_STACK_SIZE 4096
 #define CONFIG_SPIFFS_PAGE_CHECK 1
 #define CONFIG_TASK_WDT_TIMEOUT_S 5
 #define CONFIG_INT_WDT_TIMEOUT_MS 300

tools/sdk/bin/bootloader_qio.bin

@@ -107,6 +107,8 @@ esp_err_t esp_console_cmd_register(const esp_console_cmd_t *cmd);
  * @param[out] cmd_ret return code from the command (set if command was run)
  * @return
  *      - ESP_OK, if command was run
+ *      - ESP_ERR_INVALID_ARG, if the command line is empty, or only contained
+ *        whitespace
  *      - ESP_ERR_NOT_FOUND, if command with given name wasn't registered
  *      - ESP_ERR_INVALID_STATE, if esp_console_init wasn't called
  */