Merge branch 'master' of https://github.com/stickbreaker/arduino-esp32

Author: Chuck Todd

boards.txt

@@ -82,6 +82,58 @@ esp32.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+pico32.name=ESP32 Pico Kit
+
+pico32.upload.tool=esptool
+pico32.upload.maximum_size=1310720
+pico32.upload.maximum_data_size=294912
+pico32.upload.wait_for_upload_port=true
+
+pico32.serial.disableDTR=true
+pico32.serial.disableRTS=true
+
+pico32.build.mcu=esp32
+pico32.build.core=esp32
+pico32.build.variant=pico32
+pico32.build.board=ESP32_PICO
+
+pico32.build.f_cpu=240000000L
+pico32.build.flash_size=4MB
+pico32.build.flash_freq=80m
+pico32.build.flash_mode=qio
+pico32.build.boot=qio
+pico32.build.partitions=default
+
+pico32.menu.UploadSpeed.921600=921600
+pico32.menu.UploadSpeed.921600.upload.speed=921600
+pico32.menu.UploadSpeed.115200=115200
+pico32.menu.UploadSpeed.115200.upload.speed=115200
+pico32.menu.UploadSpeed.256000.windows=256000
+pico32.menu.UploadSpeed.256000.upload.speed=256000
+pico32.menu.UploadSpeed.230400.windows.upload.speed=256000
+pico32.menu.UploadSpeed.230400=230400
+pico32.menu.UploadSpeed.230400.upload.speed=230400
+pico32.menu.UploadSpeed.460800.linux=460800
+pico32.menu.UploadSpeed.460800.macosx=460800
+pico32.menu.UploadSpeed.460800.upload.speed=460800
+pico32.menu.UploadSpeed.512000.windows=512000
+pico32.menu.UploadSpeed.512000.upload.speed=512000
+
+pico32.menu.DebugLevel.none=None
+pico32.menu.DebugLevel.none.build.code_debug=0
+pico32.menu.DebugLevel.error=Error
+pico32.menu.DebugLevel.error.build.code_debug=1
+pico32.menu.DebugLevel.warn=Warn
+pico32.menu.DebugLevel.warn.build.code_debug=2
+pico32.menu.DebugLevel.info=Info
+pico32.menu.DebugLevel.info.build.code_debug=3
+pico32.menu.DebugLevel.debug=Debug
+pico32.menu.DebugLevel.debug.build.code_debug=4
+pico32.menu.DebugLevel.verbose=Verbose
+pico32.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 esp32thing.name=SparkFun ESP32 Thing
 
 esp32thing.upload.tool=esptool
@@ -952,7 +1004,7 @@ mhetesp32minikit.menu.UploadSpeed.512000.upload.speed=512000
 esp32vn-iot-uno.name=ESP32vn IoT Uno
 
 esp32vn-iot-uno.upload.tool=esptool
-esp32vn-iot-uno.upload.maximum_size=1044464
+esp32vn-iot-uno.upload.maximum_size=1310720
 esp32vn-iot-uno.upload.maximum_data_size=294912
 esp32vn-iot-uno.upload.wait_for_upload_port=true
 
@@ -1166,7 +1218,7 @@ m5stack-core-esp32.serial.disableRTS=true
 m5stack-core-esp32.build.mcu=esp32
 m5stack-core-esp32.build.core=esp32
 m5stack-core-esp32.build.variant=esp32
-m5stack-core-esp32.build.board=M5Stack-Core-ESP32
+m5stack-core-esp32.build.board=M5Stack_Core_ESP32
 
 m5stack-core-esp32.build.f_cpu=240000000L
 m5stack-core-esp32.build.flash_size=4MB
@@ -1225,7 +1277,7 @@ m5stack-core-esp32.menu.DebugLevel.verbose.build.code_debug=5
 heltec_wifi_kit_32.name=Heltec_WIFI_Kit_32
 
 heltec_wifi_kit_32.upload.tool=esptool
-heltec_wifi_kit_32.upload.maximum_size=1044464
+heltec_wifi_kit_32.upload.maximum_size=1310720
 heltec_wifi_kit_32.upload.maximum_data_size=294912
 heltec_wifi_kit_32.upload.wait_for_upload_port=true
 
@@ -1268,7 +1320,7 @@ heltec_wifi_kit_32.menu.UploadSpeed.512000.upload.speed=512000
 heltec_wifi_lora_32.name=Heltec_WIFI_LoRa_32
 
 heltec_wifi_lora_32.upload.tool=esptool
-heltec_wifi_lora_32.upload.maximum_size=1044464
+heltec_wifi_lora_32.upload.maximum_size=1310720
 heltec_wifi_lora_32.upload.maximum_data_size=294912
 heltec_wifi_lora_32.upload.wait_for_upload_port=true
 

cores/esp32/Esp.cpp

@@ -218,7 +218,7 @@ bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size)
 
 uint64_t EspClass::getEfuseMac(void)
 {
-    uint64_t _chipmacid;
+    uint64_t _chipmacid = 0LL;
     esp_efuse_mac_get_default((uint8_t*) (&_chipmacid));
     return _chipmacid;
 }

cores/esp32/esp32-hal-misc.c

@@ -21,6 +21,7 @@
 #include "nvs.h"
 #include "esp_partition.h"
 #include "esp_log.h"
+#include "pthread.h"
 #include <sys/time.h>
 
 //Undocumented!!! Get chip temperature in Farenheit
@@ -40,40 +41,43 @@ void yield()
 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);
+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);
-  }
+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
+    uint32_t *ptr;// [0] is lastCount, [1] is overFlow
 
-ptr = pthread_getspecific(microsStore); // get address of storage
+    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) );
-if(ccount < ptr[0]){
-  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);
+    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);
 }
 
 unsigned long IRAM_ATTR millis()

cores/esp32/esp32-hal-spi.c

@@ -309,9 +309,9 @@ uint8_t spiGetDataMode(spi_t * spi)
     bool outEdge = spi->dev->user.ck_out_edge;
     if(idleEdge) {
         if(outEdge) {
-            return SPI_MODE3;
+            return SPI_MODE2;
         }
-        return SPI_MODE2;
+        return SPI_MODE3;
     }
     if(outEdge) {
         return SPI_MODE1;
@@ -713,11 +713,11 @@ void spiTransaction(spi_t * spi, uint32_t clockDiv, uint8_t dataMode, uint8_t bi
             break;
         case SPI_MODE2:
             spi->dev->pin.ck_idle_edge = 1;
-            spi->dev->user.ck_out_edge = 0;
+            spi->dev->user.ck_out_edge = 1;
             break;
         case SPI_MODE3:
             spi->dev->pin.ck_idle_edge = 1;
-            spi->dev->user.ck_out_edge = 1;
+            spi->dev->user.ck_out_edge = 0;
             break;
         case SPI_MODE0:
         default:

docs/arduino-ide/debian_ubuntu.md

@@ -16,7 +16,7 @@ Installation instructions for Debian / Ubuntu OS
   cd esp32 && \
   git submodule update --init --recursive && \
   cd tools && \
-  python get.py
+  python2 get.py
   ```
 - Restart Arduino IDE
 
@@ -32,4 +32,4 @@ Installation instructions for Debian / Ubuntu OS
   cd esp32 && \
   git submodule update --init --recursive && \
   cd tools && \
-  python get.py```
+  python2 get.py```

docs/platformio.md

@@ -1,12 +1,11 @@
 Installation instructions for using PlatformIO
 =================================================
 
-[PlatformIO](http://platformio.org) is an open source ecosystem for IoT development with cross platform build system, library manager and full support for Espressif ESP32 development. It works on the popular host OS: Mac OS X, Windows,Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard).
-
-- [What is PlatformIO?](http://docs.platformio.org/page/what-is-platformio.html)
-- [PlatformIO IDE](http://platformio.org/platformio-ide)
-- [PlatformIO Core (CLI)](http://docs.platformio.org/page/core.html)
-- [Integration with Cloud and Standalone IDEs](http://docs.platformio.org/page/ide.html) -
-  Cloud9, Codeanywehre, Eclipse Che (Codenvy), Atom, CLion, Eclipse, Emacs, NetBeans, Qt Creator, Sublime Text, VIM and Visual Studio
-- [Project Examples](https://github.com/platformio/platform-espressif32/tree/develop/examples)
-- [Using "Stage" (Git) version of Arduino Core](http://docs.platformio.org/page/platforms/espressif32.html#using-arduino-framework-with-staging-version)
+- [What is PlatformIO?](http://docs.platformio.org/en/latest/what-is-platformio.html?utm_source=github&utm_medium=arduino-esp32)
+- [PlatformIO IDE](http://platformio.org/platformio-ide?utm_source=github&utm_medium=arduino-esp32)
+- [PlatformIO Core](http://docs.platformio.org/en/latest/core.html?utm_source=github&utm_medium=arduino-esp32) (command line tool)
+- [Advanced usage](http://docs.platformio.org/en/latest/platforms/espressif32.html?utm_source=github&utm_medium=arduino-esp32) -
+  custom settings, uploading to SPIFFS, Over-the-Air (OTA), staging version
+- [Integration with Cloud and Standalone IDEs](http://docs.platformio.org/en/latest/ide.html?utm_source=github&utm_medium=arduino-esp32) -
+  Cloud9, Codeanywhere, Eclipse Che (Codenvy), Atom, CLion, Eclipse, Emacs, NetBeans, Qt Creator, Sublime Text, VIM, Visual Studio, and VSCode
+- [Project Examples](http://docs.platformio.org/en/latest/platforms/espressif32.html?utm_source=github&utm_medium=arduino-esp32#examples)

libraries/ArduinoOTA/examples/BasicOTA/BasicOTA.ino

@@ -65,4 +65,4 @@ void setup() {
 
 void loop() {
   ArduinoOTA.handle();
-}
+}

libraries/ArduinoOTA/keywords.txt

@@ -15,10 +15,10 @@ ArduinoOTA	KEYWORD1
 begin	KEYWORD2
 setup	KEYWORD2
 handle	KEYWORD2
-onStart KEYWORD2
-onEnd   KEYWORD2
-onError KEYWORD2
-onProgress KEYWORD2
+onStart	KEYWORD2
+onEnd	KEYWORD2
+onError	KEYWORD2
+onProgress	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)

libraries/BLE

@@ -0,0 +1,19 @@
+### Bluetooth Serial Library
+
+A simple Serial compatible library using ESP32 classical bluetooth (SPP)
+
+
+
+#### How to use it?
+
+- Download one bluetooth terminal app in your smartphone<br>
+For Android: https://play.google.com/store/apps/details?id=de.kai_morich.serial_bluetooth_terminal <br>
+For iOS: https://itunes.apple.com/us/app/hm10-bluetooth-serial-lite/id1030454675
+
+- Flash an example sketch to your ESP32
+
+- Scan and pair the device in your smartphone
+
+- Open the bluetooth terminal app
+
+- Enjoy

libraries/BluetoothSerial/README.md

@@ -0,0 +1,29 @@
+//This example code is in the Public Domain (or CC0 licensed, at your option.)
+//By Evandro Copercini - 2018
+//
+//This example creates a bridge between Serial and Classical Bluetooth (SPP)
+//and also demonstrate that SerialBT have the same functionalities of a normal Serial
+
+#include "BluetoothSerial.h"
+
+#if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
+#error Bluetooth is not enabled! Please run `make menuconfig` to and enable it
+#endif
+
+BluetoothSerial SerialBT;
+
+void setup() {
+  Serial.begin(115200);
+  SerialBT.begin("ESP32test"); //Bluetooth device name
+  Serial.println("The device started, now you can pair it with bluetooth!");
+}
+
+void loop() {
+  if (Serial.available()) {
+    SerialBT.write(Serial.read());
+  }
+  if (SerialBT.available()) {
+    Serial.write(SerialBT.read());
+  }
+  delay(20);
+}

libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino

@@ -0,0 +1,26 @@
+#######################################
+# Syntax Coloring Map For BluetoothSerial
+#######################################
+
+#######################################
+# Library (KEYWORD3)
+#######################################
+
+BluetoothSerial	KEYWORD3
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+BluetoothSerial	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+SerialBT	KEYWORD2
+hasClient	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################

libraries/BluetoothSerial/keywords.txt

@@ -0,0 +1,9 @@
+name=BluetoothSerial
+version=1.0
+author=Evandro Copercini
+maintainer=Evandro Copercini
+sentence=Simple UART to Classical Bluetooth bridge for ESP32
+paragraph=
+category=Communication
+url=
+architectures=esp32