Merge remote-tracking branch 'refs/remotes/espressif/master'

Author: Chuck Todd

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/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/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

@@ -5,7 +5,7 @@ Installation instructions for using PlatformIO
 
 - [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)
+- [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)

libraries/ESP32/examples/Time/SimpleTime/SimpleTime.ino

@@ -0,0 +1,47 @@
+#include <WiFi.h>
+#include "time.h"
+
+const char* ssid       = "YOUR_SSID";
+const char* password   = "YOUR_PASS";
+
+const char* ntpServer = "pool.ntp.org";
+const long  gmtOffset_sec = 3600;
+const int   daylightOffset_sec = 3600;
+
+void printLocalTime()
+{
+  struct tm timeinfo;
+  if(!getLocalTime(&timeinfo)){
+    Serial.println("Failed to obtain time");
+    return;
+  }
+  Serial.println(&timeinfo, "%A, %B %d %Y %H:%M:%S");
+}
+
+void setup()
+{
+  Serial.begin(115200);
+  
+  //connect to WiFi
+  Serial.printf("Connecting to %s ", ssid);
+  WiFi.begin(ssid, password);
+  while (WiFi.status() != WL_CONNECTED) {
+      delay(500);
+      Serial.print(".");
+  }
+  Serial.println(" CONNECTED");
+  
+  //init and get the time
+  configTime(gmtOffset_sec, daylightOffset_sec, ntpServer);
+  printLocalTime();
+
+  //disconnect WiFi as it's no longer needed
+  WiFi.disconnect(true);
+  WiFi.mode(WIFI_OFF);
+}
+
+void loop()
+{
+  delay(1000);
+  printLocalTime();
+}

libraries/ESP32/examples/Timer/WatchdogTimer/WatchdogTimer.ino

@@ -0,0 +1,39 @@
+#include "esp_system.h"
+
+const int button = 0;         //gpio to use to trigger delay
+const int wdtTimeout = 3000;  //time in ms to trigger the watchdog
+hw_timer_t *timer = NULL;
+
+void IRAM_ATTR resetModule() {
+  ets_printf("reboot\n");
+  esp_restart_noos();
+}
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println("running setup");
+
+  pinMode(button, INPUT_PULLUP);                    //init control pin
+  timer = timerBegin(0, 80, true);                  //timer 0, div 80
+  timerAttachInterrupt(timer, &resetModule, true);  //attach callback
+  timerAlarmWrite(timer, wdtTimeout * 1000, false); //set time in us
+  timerAlarmEnable(timer);                          //enable interrupt
+}
+
+void loop() {
+  Serial.println("running main loop");
+
+  timerWrite(timer, 0); //reset timer (feed watchdog)
+  long loopTime = millis();
+  //while button is pressed, delay up to 3 seconds to trigger the timer
+  while (!digitalRead(button)) {
+    Serial.println("button pressed");
+    delay(500);
+  }
+  delay(1000); //simulate work
+  loopTime = millis() - loopTime;
+  
+  Serial.print("loop time is = ");
+  Serial.println(loopTime); //should be under 3000
+}