Merge pull request #1 from espressif/master

Backmerge

Author: Curclamas

.gitignore

@@ -1,5 +1,6 @@
-
 tools/xtensa-esp32-elf
 tools/dist
 tools/esptool
 tools/esptool.exe
+tools/mkspiffs/mkspiffs
+tools/mkspiffs/mkspiffs.exe

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libraries/BLE"]
+	path = libraries/BLE
+	url = https://github.com/nkolban/ESP32_BLE_Arduino.git

.travis.yml

@@ -19,7 +19,9 @@ script:
   - mkdir espressif
   - cd espressif
   - ln -s $TRAVIS_BUILD_DIR esp32
-  - cd esp32/tools
+  - cd esp32
+  - git submodule update --init --recursive
+  - cd tools
   - python get.py
   - export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH"
   - which arduino

Kconfig

@@ -66,6 +66,16 @@ config ARDUHAL_LOG_COLORS
         Enable ANSI terminal color codes in bootloader output.
         In order to view these, your terminal program must support ANSI color codes.
 
+config ARDUHAL_ESP_LOG
+    bool "Forward ESP_LOGx to Arduino log output"
+    default "n"
+    help
+        This option will redefine the ESP_LOGx macros to Arduino's log_x macros.
+        To enable for your application, add the follwing after your includes:
+        #ifdef ARDUINO_ARCH_ESP32
+        #include "esp32-hal-log.h"
+        #endif
+
 endmenu
 
 config AUTOCONNECT_WIFI

Makefile.projbuild

@@ -9,7 +9,7 @@ endif
 BOOT_APP_BIN_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
 ESPTOOL_ALL_FLASH_ARGS += $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
 
-CPPFLAGS += -DARDUINO=180 -DESP32=1 -DARDUINO_ARCH_ESP32=1
+CPPFLAGS += -DARDUINO=10800 -DESP32=1 -DARDUINO_ARCH_ESP32=1
 
 boot-app0:
 	@echo "Rebooting to APP0"

README.md

@@ -24,6 +24,7 @@ Most of the framework is implemented. Most noticable is the missing analogWrite.
   + [Instructions for Mac](docs/arduino-ide/mac.md)
   + [Instructions for Debian/Ubuntu Linux](docs/arduino-ide/debian_ubuntu.md)
   + [Instructions for Fedora](docs/arduino-ide/fedora.md)
+  + [Instructions for openSUSE](docs/arduino-ide/opensuse.md)
 - [Using PlatformIO](docs/platformio.md)
 - [Building with make](docs/make.md)
 - [Using as ESP-IDF component](docs/esp-idf_component.md)

cores/esp32/Esp.cpp

@@ -119,7 +119,9 @@ uint32_t EspClass::getFreeHeap(void)
 
 uint8_t EspClass::getChipRevision(void)
 {
-    return (REG_READ(EFUSE_BLK0_RDATA3_REG) >> EFUSE_RD_CHIP_VER_RESERVE_S) && EFUSE_RD_CHIP_VER_RESERVE_V;
+    esp_chip_info_t chip_info;
+    esp_chip_info(&chip_info);
+    return chip_info.revision;
 }
 
 const char * EspClass::getSdkVersion(void)

cores/esp32/HardwareSerial.cpp

@@ -9,8 +9,12 @@ HardwareSerial Serial(0);
 
 HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL) {}
 
-void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin)
+void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert)
 {
+    if(0 > _uart_nr || _uart_nr > 2) {
+        log_e("Serial number is invalid, please use 0, 1 or 2");
+        return;
+    }
     if(_uart) {
         end();
     }
@@ -26,7 +30,7 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
         rxPin = 16;
         txPin = 17;
     }
-    _uart = uartBegin(_uart_nr, baud, config, rxPin, txPin, 256, false);
+    _uart = uartBegin(_uart_nr, baud, config, rxPin, txPin, 256, invert);
 }
 
 void HardwareSerial::end()
@@ -89,7 +93,11 @@ size_t HardwareSerial::write(const uint8_t *buffer, size_t size)
     uartWriteBuf(_uart, buffer, size);
     return size;
 }
+uint32_t  HardwareSerial::baudRate()
 
+{
+	return uartGetBaudRate(_uart);
+}
 HardwareSerial::operator bool() const
 {
     return true;

cores/esp32/HardwareSerial.h

@@ -37,7 +37,7 @@ class HardwareSerial: public Stream
 public:
     HardwareSerial(int uart_nr);
 
-    void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1);
+    void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1, bool invert=false);
     void end();
     int available(void);
     int peek(void);
@@ -66,6 +66,7 @@ class HardwareSerial: public Stream
     {
         return write((uint8_t) n);
     }
+    uint32_t baudRate();
     operator bool() const;
 
     void setDebugOutput(bool);

cores/esp32/WString.cpp

@@ -23,6 +23,7 @@
 
 #include "WString.h"
 #include "stdlib_noniso.h"
+#include "esp32-hal-log.h"
 //extern "C" {
 //#include "esp_common.h"
 //}
@@ -165,19 +166,23 @@ unsigned char String::reserve(unsigned int size)
 
 unsigned char String::changeBuffer(unsigned int maxStrLen)
 {
-    size_t newSize = (maxStrLen + 16) & (~0xf);
-    char *newbuffer = (char *) malloc(newSize);
+    size_t newSize = ((maxStrLen + 16) & (~0xf)) - 1;
+    char *newbuffer = (char *) realloc(buffer, newSize+1);
     if(newbuffer) {
-        memset(newbuffer, 0, newSize);
-        memcpy(newbuffer, buffer, len);
-        if (buffer) {
-            free(buffer);
+        if(newSize > len){
+            if(newSize > capacity){
+                memset(newbuffer+capacity, 0, newSize-capacity);
+            }
+        } else {
+            //new buffer can not fit the old len
+            newbuffer[newSize] = 0;
+            len = newSize;
         }
-        capacity = newSize - 1;
+        capacity = newSize;
         buffer = newbuffer;
         return 1;
     }
-    buffer = newbuffer;
+    log_e("realloc failed! Buffer unchanged");
     return 0;
 }
 

cores/esp32/esp32-hal-bt.c

@@ -14,7 +14,8 @@
 
 #include "esp32-hal-bt.h"
 
-#if CONFIG_BT_ENABLED
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
+
 
 #include "bt.h"
 #include "esp_bt_defs.h"
@@ -51,7 +52,7 @@ bool btStop(){
         return true;
     }
     if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){
-        if (esp_bt_controller_disable(ESP_BT_MODE_BTDM)) {
+        if (esp_bt_controller_disable()) {
             log_e("BT Disable failed");
             return false;
         }

cores/esp32/esp32-hal-gpio.c

@@ -24,8 +24,6 @@
 #include "soc/gpio_struct.h"
 #include "soc/rtc_io_reg.h"
 
-#define ETS_GPIO_INUM       12
-
 const int8_t esp32_adc2gpio[20] = {36, -1, -1, 39, 32, 33, 34, 35, -1, -1, 4, 0, 2, 15, 13, 12, 14, 27, 25, 26};
 
 const DRAM_ATTR esp32_gpioMux_t esp32_gpioMux[GPIO_PIN_COUNT]={
@@ -193,6 +191,7 @@ extern int IRAM_ATTR __digitalRead(uint8_t pin)
     return 0;
 }
 
+static intr_handle_t gpio_intr_handle = NULL;
 
 static void IRAM_ATTR __onPinInterrupt(void *arg)
 {
@@ -229,38 +228,29 @@ static void IRAM_ATTR __onPinInterrupt(void *arg)
 extern void __attachInterrupt(uint8_t pin, voidFuncPtr userFunc, int intr_type)
 {
     static bool interrupt_initialized = false;
-    static int core_id = 0;
 
     if(!interrupt_initialized) {
         interrupt_initialized = true;
-        core_id = xPortGetCoreID();
-        ESP_INTR_DISABLE(ETS_GPIO_INUM);
-        intr_matrix_set(core_id, ETS_GPIO_INTR_SOURCE, ETS_GPIO_INUM);
-        xt_set_interrupt_handler(ETS_GPIO_INUM, &__onPinInterrupt, NULL);
-        ESP_INTR_ENABLE(ETS_GPIO_INUM);
+        esp_intr_alloc(ETS_GPIO_INTR_SOURCE, (int)ESP_INTR_FLAG_IRAM, __onPinInterrupt, NULL, &gpio_intr_handle);
     }
     __pinInterruptHandlers[pin] = userFunc;
-    //lock gpio
-    ESP_INTR_DISABLE(ETS_GPIO_INUM);
-    if(core_id) { //APP_CPU
+    esp_intr_disable(gpio_intr_handle);
+    if(esp_intr_get_cpu(gpio_intr_handle)) { //APP_CPU
         GPIO.pin[pin].int_ena = 1;
     } else { //PRO_CPU
         GPIO.pin[pin].int_ena = 4;
     }
     GPIO.pin[pin].int_type = intr_type;
-    ESP_INTR_ENABLE(ETS_GPIO_INUM);
-    //unlock gpio
+    esp_intr_enable(gpio_intr_handle);
 }
 
 extern void __detachInterrupt(uint8_t pin)
 {
-    //lock gpio
-    ESP_INTR_DISABLE(ETS_GPIO_INUM);
+    esp_intr_disable(gpio_intr_handle);
     __pinInterruptHandlers[pin] = NULL;
     GPIO.pin[pin].int_ena = 0;
     GPIO.pin[pin].int_type = 0;
-    ESP_INTR_ENABLE(ETS_GPIO_INUM);
-    //unlock gpio
+    esp_intr_enable(gpio_intr_handle);
 }