Merge pull request #23 from espressif/master

catch up with main branch 09MAR2018 1923GMT

Author: stickbreaker

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-bt.c

@@ -17,7 +17,7 @@
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 
 
-#include "bt.h"
+#include "esp_bt.h"
 #include "esp_bt_defs.h"
 #include "esp_bt_main.h"
 

cores/esp32/esp32-hal-ledc.c

@@ -68,8 +68,8 @@ static void _ledcSetupTimer(uint8_t chan, uint32_t div_num, uint8_t bit_num, boo
 #endif
     }
     LEDC_MUTEX_LOCK();
-    LEDC_TIMER(group, timer).conf.div_num = div_num;//18 bit (10.8) This register is used to configure parameter for divider in timer the least significant eight bits represent the decimal part.
-    LEDC_TIMER(group, timer).conf.bit_num = bit_num;//5 bit This register controls the range of the counter in timer. the counter range is [0 2**bit_num] the max bit width for counter is 20.
+    LEDC_TIMER(group, timer).conf.clock_divider = div_num;//18 bit (10.8) This register is used to configure parameter for divider in timer the least significant eight bits represent the decimal part.
+    LEDC_TIMER(group, timer).conf.duty_resolution = bit_num;//5 bit This register controls the range of the counter in timer. the counter range is [0 2**bit_num] the max bit width for counter is 20.
     LEDC_TIMER(group, timer).conf.tick_sel = apb_clk;//apb clock
     if(group) {
         LEDC_TIMER(group, timer).conf.low_speed_update = 1;//This bit is only useful for low speed timer channels, reserved for high speed timers
@@ -111,8 +111,8 @@ static double _ledcTimerRead(uint8_t chan)
     bool apb_clk;
     uint8_t group=(chan/8), timer=((chan/2)%4);
     LEDC_MUTEX_LOCK();
-    div_num = LEDC_TIMER(group, timer).conf.div_num;//18 bit (10.8) This register is used to configure parameter for divider in timer the least significant eight bits represent the decimal part.
-    bit_num = LEDC_TIMER(group, timer).conf.bit_num;//5 bit This register controls the range of the counter in timer. the counter range is [0 2**bit_num] the max bit width for counter is 20.
+    div_num = LEDC_TIMER(group, timer).conf.clock_divider;//18 bit (10.8) This register is used to configure parameter for divider in timer the least significant eight bits represent the decimal part.
+    bit_num = LEDC_TIMER(group, timer).conf.duty_resolution;//5 bit This register controls the range of the counter in timer. the counter range is [0 2**bit_num] the max bit width for counter is 20.
     apb_clk = LEDC_TIMER(group, timer).conf.tick_sel;//apb clock
     LEDC_MUTEX_UNLOCK();
     uint64_t clk_freq = 1000000;

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:

cores/esp32/pgmspace.h

@@ -37,18 +37,33 @@ typedef unsigned long prog_uint32_t;
 #define _SFR_BYTE(n)  (n)
 
 #define pgm_read_byte(addr)   (*(const unsigned char *)(addr))
-#define pgm_read_word(addr)   (*(const unsigned short *)(addr))
-#define pgm_read_dword(addr)  (*(const unsigned long *)(addr))
-#define pgm_read_float(addr)  (*(const float *)(addr))
+#define pgm_read_word(addr) ({ \
+  typeof(addr) _addr = (addr); \
+  *(const unsigned short *)(_addr); \
+})
+#define pgm_read_dword(addr) ({ \
+  typeof(addr) _addr = (addr); \
+  *(const unsigned long *)(_addr); \
+})
+#define pgm_read_float(addr) ({ \
+  typeof(addr) _addr = (addr); \
+  *(const float *)(_addr); \
+})
+#define pgm_read_ptr(addr) ({ \
+  typeof(addr) _addr = (addr); \
+  *(void * const *)(_addr); \
+})
 
 #define pgm_read_byte_near(addr)  pgm_read_byte(addr)
 #define pgm_read_word_near(addr)  pgm_read_word(addr)
 #define pgm_read_dword_near(addr) pgm_read_dword(addr)
 #define pgm_read_float_near(addr) pgm_read_float(addr)
+#define pgm_read_ptr_near(addr)   pgm_read_ptr(addr)
 #define pgm_read_byte_far(addr)   pgm_read_byte(addr)
 #define pgm_read_word_far(addr)   pgm_read_word(addr)
 #define pgm_read_dword_far(addr)  pgm_read_dword(addr)
 #define pgm_read_float_far(addr)  pgm_read_float(addr)
+#define pgm_read_ptr_far(addr)    pgm_read_ptr(addr)
 
 #define memcmp_P      memcmp
 #define memccpy_P     memccpy

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/arduino-ide/windows.md

@@ -1,49 +1,49 @@
-## Steps to install Arduino ESP32 support on Windows
-### Tested on 32 and 64 bit Windows 10 machines
-
-1. Download and install the latest Arduino IDE ```Windows Installer``` from [arduino.cc](https://www.arduino.cc/en/Main/Software)
-2. Download and install Git from [git-scm.com](https://git-scm.com/download/win)
-3. Start ```Git GUI``` and run through the following steps:
-    - Select ```Clone Existing Repository```
-
-        ![Step 1](win-screenshots/win-gui-1.png)
-
-    - Select source and destination
-        - Source Location: ```https://github.com/espressif/arduino-esp32.git```
-        - Target Directory: ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino/hardware/espressif/esp32```
-        - Change this to your Sketchbook Location if you have a different directory listed underneath the "Sketchbook location" in Arduino preferences.
-        - Click ```Clone``` to start cloning the repository
-
-            ![Step 2](win-screenshots/win-gui-2.png)
-            ![Step 3](win-screenshots/win-gui-3.png)
-
-    - Open ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino/hardware/espressif/esp32/tools``` and double-click ```get.exe```
-
-        ![Step 4](win-screenshots/win-gui-4.png)
-
-    - When ```get.exe``` finishes, you should see the following files in the directory
-
-        ![Step 5](win-screenshots/win-gui-5.png)
-
-4. Plug your ESP32 board and wait for the drivers to install (or install manually any that might be required)
-5. Start Arduino IDE
-6. Select your board in ```Tools > Board``` menu
-7. Select the COM port that the board is attached to
-8. Compile and upload (You might need to hold the boot button while uploading)
-
-    ![Arduino IDE Example](win-screenshots/arduino-ide.png)
-
-### How to update to the latest code
-
-1. Start ```Git GUI``` and you should see the repository under ```Open Recent Repository```. Click on it!
-
-    ![Update Step 1](win-screenshots/win-gui-update-1.png)
-
-2. From menu ```Remote``` select ```Fetch from``` > ```origin```
-
-    ![Update Step 2](win-screenshots/win-gui-update-2.png)
-
-3. Wait for git to pull any changes and close ```Git GUI```
-4. Open ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino/hardware/espressif/esp32/tools``` and double-click ```get.exe```
-
-    ![Step 4](win-screenshots/win-gui-4.png)
+## Steps to install Arduino ESP32 support on Windows
+### Tested on 32 and 64 bit Windows 10 machines
+
+1. Download and install the latest Arduino IDE ```Windows Installer``` from [arduino.cc](https://www.arduino.cc/en/Main/Software)
+2. Download and install Git from [git-scm.com](https://git-scm.com/download/win)
+3. Start ```Git GUI``` and run through the following steps:
+    - Select ```Clone Existing Repository```
+
+        ![Step 1](win-screenshots/win-gui-1.png)
+
+    - Select source and destination
+        - Sketchbook Directory: Usually ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino``` and is listed underneath the "Sketchbook location" in Arduino preferences.
+        - Source Location: ```https://github.com/espressif/arduino-esp32.git```
+        - Target Directory: ```[ARDUINO_SKETCHBOOK_DIR]/hardware/espressif/esp32```
+        - Click ```Clone``` to start cloning the repository
+
+            ![Step 2](win-screenshots/win-gui-2.png)
+            ![Step 3](win-screenshots/win-gui-3.png)
+    - open a `Git Bash` session pointing to ```ARDUINO_SKETCHBOOK_DIR``` and execute ```git submodule update --init --recursive``` 
+    - Open ```[ARDUINO_SKETCHBOOK_DIR]/hardware/espressif/esp32/tools``` and double-click ```get.exe```
+
+        ![Step 4](win-screenshots/win-gui-4.png)
+
+    - When ```get.exe``` finishes, you should see the following files in the directory
+
+        ![Step 5](win-screenshots/win-gui-5.png)
+
+4. Plug your ESP32 board and wait for the drivers to install (or install manually any that might be required)
+5. Start Arduino IDE
+6. Select your board in ```Tools > Board``` menu
+7. Select the COM port that the board is attached to
+8. Compile and upload (You might need to hold the boot button while uploading)
+
+    ![Arduino IDE Example](win-screenshots/arduino-ide.png)
+
+### How to update to the latest code
+
+1. Start ```Git GUI``` and you should see the repository under ```Open Recent Repository```. Click on it!
+
+    ![Update Step 1](win-screenshots/win-gui-update-1.png)
+
+2. From menu ```Remote``` select ```Fetch from``` > ```origin```
+
+    ![Update Step 2](win-screenshots/win-gui-update-2.png)
+
+3. Wait for git to pull any changes and close ```Git GUI```
+4. Open ```[ARDUINO_SKETCHBOOK_DIR]/hardware/espressif/esp32/tools``` and double-click ```get.exe```
+
+    ![Step 4](win-screenshots/win-gui-4.png)

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)
-- Quick Start with [PlatformIO IDE](http://docs.platformio.org/page/ide/atom.html#quick-start) or [PlatformIO Core](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();
-}
+}