Merge branch 'master' of https://github.com/espressif/arduino-esp32 into idf-update

Author: me-no-dev

.gitmodules

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

boards.txt

@@ -35,8 +35,10 @@ esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
 esp32.menu.PartitionScheme.minimal.build.partitions=minimal
 esp32.menu.PartitionScheme.no_ota=No OTA (Large APP)
 esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
 esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
 esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
 
 esp32.menu.FlashMode.qio=QIO
 esp32.menu.FlashMode.qio.build.flash_mode=dio
@@ -380,6 +382,15 @@ lolin32.menu.FlashFreq.80.build.flash_freq=80m
 lolin32.menu.FlashFreq.40=40MHz
 lolin32.menu.FlashFreq.40.build.flash_freq=40m
 
+lolin32.menu.PartitionScheme.default=Default
+lolin32.menu.PartitionScheme.default.build.partitions=default
+lolin32.menu.PartitionScheme.no_ota=No OTA (Large APP)
+lolin32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+lolin32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+lolin32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+lolin32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+lolin32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 lolin32.menu.UploadSpeed.921600=921600
 lolin32.menu.UploadSpeed.921600.upload.speed=921600
 lolin32.menu.UploadSpeed.115200=115200
@@ -964,6 +975,15 @@ mhetesp32devkit.menu.FlashFreq.80.build.flash_freq=80m
 mhetesp32devkit.menu.FlashFreq.40=40MHz
 mhetesp32devkit.menu.FlashFreq.40.build.flash_freq=40m
 
+mhetesp32devkit.menu.PartitionScheme.default=Default
+mhetesp32devkit.menu.PartitionScheme.default.build.partitions=default
+mhetesp32devkit.menu.PartitionScheme.no_ota=No OTA (Large APP)
+mhetesp32devkit.menu.PartitionScheme.no_ota.build.partitions=no_ota
+mhetesp32devkit.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+mhetesp32devkit.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+mhetesp32devkit.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+mhetesp32devkit.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 mhetesp32devkit.menu.UploadSpeed.921600=921600
 mhetesp32devkit.menu.UploadSpeed.921600.upload.speed=921600
 mhetesp32devkit.menu.UploadSpeed.115200=115200
@@ -979,6 +999,19 @@ mhetesp32devkit.menu.UploadSpeed.460800.upload.speed=460800
 mhetesp32devkit.menu.UploadSpeed.512000.windows=512000
 mhetesp32devkit.menu.UploadSpeed.512000.upload.speed=512000
 
+mhetesp32devkit.menu.DebugLevel.none=None
+mhetesp32devkit.menu.DebugLevel.none.build.code_debug=0
+mhetesp32devkit.menu.DebugLevel.error=Error
+mhetesp32devkit.menu.DebugLevel.error.build.code_debug=1
+mhetesp32devkit.menu.DebugLevel.warn=Warn
+mhetesp32devkit.menu.DebugLevel.warn.build.code_debug=2
+mhetesp32devkit.menu.DebugLevel.info=Info
+mhetesp32devkit.menu.DebugLevel.info.build.code_debug=3
+mhetesp32devkit.menu.DebugLevel.debug=Debug
+mhetesp32devkit.menu.DebugLevel.debug.build.code_debug=4
+mhetesp32devkit.menu.DebugLevel.verbose=Verbose
+mhetesp32devkit.menu.DebugLevel.verbose.build.code_debug=5
+
 ##############################################################
 
 mhetesp32minikit.name=MH ET LIVE ESP32MiniKit
@@ -1007,6 +1040,15 @@ mhetesp32minikit.menu.FlashFreq.80.build.flash_freq=80m
 mhetesp32minikit.menu.FlashFreq.40=40MHz
 mhetesp32minikit.menu.FlashFreq.40.build.flash_freq=40m
 
+mhetesp32minikit.menu.PartitionScheme.default=Default
+mhetesp32minikit.menu.PartitionScheme.default.build.partitions=default
+mhetesp32minikit.menu.PartitionScheme.no_ota=No OTA (Large APP)
+mhetesp32minikit.menu.PartitionScheme.no_ota.build.partitions=no_ota
+mhetesp32minikit.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+mhetesp32minikit.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+mhetesp32minikit.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+mhetesp32minikit.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 mhetesp32minikit.menu.UploadSpeed.921600=921600
 mhetesp32minikit.menu.UploadSpeed.921600.upload.speed=921600
 mhetesp32minikit.menu.UploadSpeed.115200=115200
@@ -1022,6 +1064,19 @@ mhetesp32minikit.menu.UploadSpeed.460800.upload.speed=460800
 mhetesp32minikit.menu.UploadSpeed.512000.windows=512000
 mhetesp32minikit.menu.UploadSpeed.512000.upload.speed=512000
 
+mhetesp32minikit.menu.DebugLevel.none=None
+mhetesp32minikit.menu.DebugLevel.none.build.code_debug=0
+mhetesp32minikit.menu.DebugLevel.error=Error
+mhetesp32minikit.menu.DebugLevel.error.build.code_debug=1
+mhetesp32minikit.menu.DebugLevel.warn=Warn
+mhetesp32minikit.menu.DebugLevel.warn.build.code_debug=2
+mhetesp32minikit.menu.DebugLevel.info=Info
+mhetesp32minikit.menu.DebugLevel.info.build.code_debug=3
+mhetesp32minikit.menu.DebugLevel.debug=Debug
+mhetesp32minikit.menu.DebugLevel.debug.build.code_debug=4
+mhetesp32minikit.menu.DebugLevel.verbose=Verbose
+mhetesp32minikit.menu.DebugLevel.verbose.build.code_debug=5
+
 #################################################################
 
 esp32vn-iot-uno.name=ESP32vn IoT Uno
@@ -1037,7 +1092,7 @@ esp32vn-iot-uno.serial.disableRTS=true
 esp32vn-iot-uno.build.mcu=esp32
 esp32vn-iot-uno.build.core=esp32
 esp32vn-iot-uno.build.variant=esp32vn-iot-uno
-esp32vn-iot-uno.build.board=esp32vn-iot-uno
+esp32vn-iot-uno.build.board=esp32vn_iot_uno
 
 esp32vn-iot-uno.build.f_cpu=240000000L
 esp32vn-iot-uno.build.flash_mode=dio
@@ -1134,7 +1189,7 @@ esp32-evb.serial.disableRTS=true
 esp32-evb.build.mcu=esp32
 esp32-evb.build.core=esp32
 esp32-evb.build.variant=esp32-evb
-esp32-evb.build.board=ESP32-EVB
+esp32-evb.build.board=ESP32_EVB
 
 esp32-evb.build.f_cpu=240000000L
 esp32-evb.build.flash_mode=dio
@@ -1166,7 +1221,7 @@ esp32-gateway.serial.disableRTS=true
 esp32-gateway.build.mcu=esp32
 esp32-gateway.build.core=esp32
 esp32-gateway.build.variant=esp32-gateway
-esp32-gateway.build.board=ESP32-GATEWAY
+esp32-gateway.build.board=ESP32_GATEWAY
 
 esp32-gateway.build.f_cpu=240000000L
 esp32-gateway.build.flash_mode=dio
@@ -1267,6 +1322,15 @@ m5stack-core-esp32.menu.FlashFreq.80.build.flash_freq=80m
 m5stack-core-esp32.menu.FlashFreq.40=40MHz
 m5stack-core-esp32.menu.FlashFreq.40.build.flash_freq=40m
 
+m5stack-core-esp32.menu.PartitionScheme.default=Default
+m5stack-core-esp32.menu.PartitionScheme.default.build.partitions=default
+m5stack-core-esp32.menu.PartitionScheme.no_ota=No OTA (Large APP)
+m5stack-core-esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+m5stack-core-esp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+m5stack-core-esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+m5stack-core-esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+m5stack-core-esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 m5stack-core-esp32.menu.UploadSpeed.921600=921600
 m5stack-core-esp32.menu.UploadSpeed.921600.upload.speed=921600
 m5stack-core-esp32.menu.UploadSpeed.115200=115200

cores/esp32/esp32-hal-misc.c

@@ -21,7 +21,7 @@
 #include "nvs.h"
 #include "esp_partition.h"
 #include "esp_log.h"
-#include "pthread.h"
+#include "esp_timer.h"
 #include <sys/time.h>
 
 //Undocumented!!! Get chip temperature in Farenheit
@@ -38,51 +38,14 @@ void yield()
     vPortYield();
 }
 
-portMUX_TYPE microsMux = portMUX_INITIALIZER_UNLOCKED;
-static pthread_key_t microsStore=NULL; // Thread Local Storage Handle
-
-void microsStoreDelete(void * storage) {  // release thread local data when task is delete.
-    if(storage) free(storage);
-}
-
 unsigned long IRAM_ATTR micros()
 {
-    if (!microsStore) { // first Time Ever thread local not init'd
-        portENTER_CRITICAL_ISR(&microsMux);
-        pthread_key_create(&microsStore,microsStoreDelete); // create initial holder
-        portEXIT_CRITICAL_ISR(&microsMux);
-    }
-  
-    uint32_t *ptr;// [0] is lastCount, [1] is overFlow
-
-    ptr = pthread_getspecific(microsStore); // get address of storage
- 
-    if(ptr == NULL) { // first time in this thread, allocate mem, init it.  
-        portENTER_CRITICAL_ISR(&microsMux);
-        ptr = (uint32_t*)malloc(sizeof(uint32_t)*2);
-        pthread_setspecific(microsStore,ptr); // store the pointer to this thread's values
-        ptr[0] = 0; // lastCount value
-        ptr[1] = 0; // overFlow
-        portEXIT_CRITICAL_ISR(&microsMux);
-    }  
-
-    unsigned long ccount;
-    
-    portENTER_CRITICAL_ISR(&microsMux);
-    __asm__ __volatile__ ( "rsr     %0, ccount" : "=a" (ccount) ); //get cycle count
-    if(ccount < ptr[0]) { // overflow occurred
-        ptr[1] += UINT32_MAX / CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
-    }
-    
-    ptr[0] = ccount;
-    portEXIT_CRITICAL_ISR(&microsMux);
-
-    return ptr[1] + (ccount / CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ);
+    return (unsigned long) esp_timer_get_time();
 }
 
 unsigned long IRAM_ATTR millis()
 {
-    return xTaskGetTickCount() * portTICK_PERIOD_MS;
+    return (unsigned long) (esp_timer_get_time() / 1000);
 }
 
 void delay(uint32_t ms)

cores/esp32/esp32-hal-sigmadelta.c

@@ -60,7 +60,7 @@ void sigmaDeltaWrite(uint8_t channel, uint8_t duty) //chan 0-7 duty 8 bit
     if(channel > 7) {
         return;
     }
-    duty += 128;
+    duty -= 128;
     SD_MUTEX_LOCK();
     SIGMADELTA.channel[channel].duty = duty;
     SD_MUTEX_UNLOCK();
@@ -72,7 +72,7 @@ uint8_t sigmaDeltaRead(uint8_t channel) //chan 0-7
         return 0;
     }
     SD_MUTEX_LOCK();
-    uint8_t duty = SIGMADELTA.channel[channel].duty - 128;
+    uint8_t duty = SIGMADELTA.channel[channel].duty + 128;
     SD_MUTEX_UNLOCK();
     return duty;
 }

cores/esp32/main.cpp

@@ -14,7 +14,6 @@ void loopTask(void *pvParameters)
 {
     setup();
     for(;;) {
-        micros(); //update overflow
         loop();
     }
 }

cores/esp32/pgmspace.h

@@ -71,7 +71,7 @@ typedef unsigned long prog_uint32_t;
 #define memcpy_P      memcpy
 #define strcpy_P      strcpy
 #define strncpy_P     strncpy
-#define strcat_p      strcat
+#define strcat_P      strcat
 #define strncat_P     strncat
 #define strcmp_P      strcmp
 #define strncmp_P     strncmp

docs/arduino-ide/mac.md

@@ -13,11 +13,13 @@ Installation instructions for Mac OS
   cd tools && \
   python get.py
   ```
+  Where `~/Documents/Arduino` represents your sketch book location as per "Arduino" > "Preferences" > "Sketchbook location" (in the IDE once started). Adjust the command above accordingly if necessary!
+  
 - If you get the error below. Install the command line dev tools with xcode-select --install and try the command above again:
 
-```xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun```
-
-```xcode-select --install```
+  ```xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun```
+  
+  ```xcode-select --install```
 
 - Restart Arduino IDE
 

docs/esp-idf_component.md

@@ -68,3 +68,6 @@ If you are writing code that does not require Arduino to compile and you want yo
 #endif
 ```
 
+## Compilation Errors
+
+As commits are made to esp-idf and submodules, the codebases can develop incompatibilities which cause compilation errors.  If you have problems compiling, follow the instructions in [Issue #1142](https://github.com/espressif/arduino-esp32/issues/1142) to roll esp-idf back to a known good version.

libraries/AzureIoT

@@ -69,7 +69,7 @@ void setup(){
   esp_sleep_enable_ext0_wakeup(GPIO_NUM_33,1); //1 = High, 0 = Low
 
   //If you were to use ext1, you would use it like
-  //esp_deep_sleep_enable_ext1_wakeup(BUTTON_PIN_BITMASK,ESP_EXT1_WAKEUP_ANY_HIGH);
+  //esp_sleep_enable_ext1_wakeup(BUTTON_PIN_BITMASK,ESP_EXT1_WAKEUP_ANY_HIGH);
 
   //Go to sleep now
   Serial.println("Going to sleep now");

libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ExternalWakeUp.ino

@@ -0,0 +1,77 @@
+
+
+/* The ESP32 has four SPi buses, however as of right now only two of
+ * them are available to use, HSPI and VSPI. Simply using the SPI API 
+ * as illustrated in Arduino examples will use HSPI, leaving VSPI unused.
+ * 
+ * However if we simply intialise two instance of the SPI class for both
+ * of these buses both can be used. However when just using these the Arduino
+ * way only will actually be outputting at a time.
+ * 
+ * Logic analyser capture is in the same folder as this example as
+ * "multiple_bus_output.png"
+ * 
+ * created 30/04/2018 by Alistair Symonds
+ */
+#include <SPI.h>
+
+static const int spiClk = 1000000; // 1 MHz
+
+//uninitalised pointers to SPI objects
+SPIClass * vspi = NULL;
+SPIClass * hspi = NULL;
+
+void setup() {
+  //initialise two instances of the SPIClass attached to VSPI and HSPI respectively
+  vspi = new SPIClass(VSPI);
+  hspi = new SPIClass(HSPI);
+  
+  //clock miso mosi ss
+
+  //initialise vspi with default pins
+  //SCLK = 18, MISO = 19, MOSI = 23, SS = 5
+  vspi->begin();
+  //alternatively route through GPIO pins of your choice
+  //hspi->begin(0, 2, 4, 33); //SCLK, MISO, MOSI, SS
+  
+  //initialise hspi with default pins
+  //SCLK = 14, MISO = 12, MOSI = 13, SS = 15
+  hspi->begin(); 
+  //alternatively route through GPIO pins
+  //hspi->begin(25, 26, 27, 32); //SCLK, MISO, MOSI, SS
+
+  //set up slave select pins as outputs as the Arduino API
+  //doesn't handle automatically pulling SS low
+  pinMode(5, OUTPUT); //VSPI SS
+  pinMode(15, OUTPUT); //HSPI SS
+
+}
+
+// the loop function runs over and over again until power down or reset
+void loop() {
+  //use the SPI buses
+  vspiCommand();
+  hspiCommand();
+  delay(100);
+}
+
+void vspiCommand() {
+  byte data = 0b01010101; // junk data to illustrate usage
+
+  //use it as you would the regular arduino SPI API
+  vspi->beginTransaction(SPISettings(spiClk, MSBFIRST, SPI_MODE0));
+  digitalWrite(5, LOW); //pull SS slow to prep other end for transfer
+  vspi->transfer(data);  
+  digitalWrite(5, HIGH); //pull ss high to signify end of data transfer
+  vspi->endTransaction();
+}
+
+void hspiCommand() {
+  byte stuff = 0b11001100;
+  
+  hspi->beginTransaction(SPISettings(spiClk, MSBFIRST, SPI_MODE0));
+  digitalWrite(15, LOW);
+  hspi->transfer(stuff);
+  digitalWrite(15, HIGH);
+  hspi->endTransaction();
+}

libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino

@@ -31,7 +31,7 @@ SPIClass::SPIClass(uint8_t spi_bus)
     ,_ss(-1)
     ,_div(0)
     ,_freq(1000000)
-    , _inTransaction(false)
+    ,_inTransaction(false)
 {}
 
 void SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss)
@@ -109,6 +109,11 @@ void SPIClass::setClockDivider(uint32_t clockDiv)
     spiSetClockDiv(_spi, _div);
 }
 
+uint32_t SPIClass::getClockDivider()
+{
+    return spiGetClockDiv(_spi);
+}
+
 void SPIClass::setDataMode(uint8_t dataMode)
 {
     spiSetDataMode(_spi, dataMode);

libraries/SPI/examples/SPI_Multiple_Buses/multiple_bus_output.PNG

@@ -60,6 +60,8 @@ class SPIClass
     void setDataMode(uint8_t dataMode);
     void setFrequency(uint32_t freq);
     void setClockDivider(uint32_t clockDiv);
+    
+    uint32_t getClockDivider();
 
     void beginTransaction(SPISettings settings);
     void endTransaction(void);