Merge branch 'espressif:master' into speed_OTA

Author: Jason2866

boards.txt

@@ -491,6 +491,10 @@ void HardwareSerial::setRxInvert(bool invert)
 // negative Pin value will keep it unmodified
 void HardwareSerial::setPins(int8_t rxPin, int8_t txPin, int8_t ctsPin, int8_t rtsPin)
 {
+    if(_uart == NULL) {
+        log_e("setPins() shall be called after begin() - nothing done");
+        return;
+    }
     uartSetPins(_uart, rxPin, txPin, ctsPin, rtsPin);
 }
 

cores/esp32/HardwareSerial.cpp

@@ -91,9 +91,9 @@ static InterruptHandle_t __pinInterruptHandlers[SOC_GPIO_PIN_COUNT] = {0,};
 
 extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 {
-#ifdef BOARD_HAS_NEOPIXEL
-    if (pin == LED_BUILTIN){
-        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
+#ifdef RGB_BUILTIN
+    if (pin == RGB_BUILTIN){
+        __pinMode(RGB_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
         return;
     }
 #endif
@@ -134,11 +134,11 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 
 extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
 {
-    #ifdef BOARD_HAS_NEOPIXEL
-        if(pin == LED_BUILTIN){
+    #ifdef RGB_BUILTIN
+        if(pin == RGB_BUILTIN){
             //use RMT to set all channels on/off
-            const uint8_t comm_val = val != 0 ? LED_BRIGHTNESS : 0;
-            neopixelWrite(LED_BUILTIN, comm_val, comm_val, comm_val);
+            const uint8_t comm_val = val != 0 ? RGB_BRIGHTNESS : 0;
+            neopixelWrite(RGB_BUILTIN, comm_val, comm_val, comm_val);
             return;
         }
     #endif

cores/esp32/esp32-hal-gpio.c

@@ -72,6 +72,7 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency){
     } else if(frequency > 1000000UL){
         frequency = 1000000UL;
     }
+    log_i("Initialising I2C Master: sda=%d scl=%d freq=%d", sda, scl, frequency);
 
     i2c_config_t conf = { };
     conf.mode = I2C_MODE_MASTER;

cores/esp32/esp32-hal-i2c.c

@@ -226,3 +226,7 @@ void analogWrite(uint8_t pin, int value) {
     ledcWrite(pin_to_channel[pin] - 1, value);
   }
 }
+
+int8_t analogGetChannel(uint8_t pin) {
+    return pin_to_channel[pin] - 1;
+}

cores/esp32/esp32-hal-ledc.c

@@ -7,9 +7,9 @@ void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue
   static bool initialized = false;
 
   uint8_t _pin = pin;
-#ifdef BOARD_HAS_NEOPIXEL
-  if(pin == LED_BUILTIN){
-    _pin = LED_BUILTIN-SOC_GPIO_PIN_COUNT;
+#ifdef RGB_BUILTIN
+  if(pin == RGB_BUILTIN){
+    _pin = RGB_BUILTIN-SOC_GPIO_PIN_COUNT;
   }
 #endif
 

cores/esp32/esp32-hal-rgb-led.c

@@ -7,8 +7,8 @@ extern "C" {
 
 #include "esp32-hal.h"
 
-#ifndef LED_BRIGHTNESS
-  #define LED_BRIGHTNESS 64
+#ifndef RGB_BRIGHTNESS
+  #define RGB_BRIGHTNESS 64
 #endif
 
 void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);

cores/esp32/esp32-hal-rgb-led.h

@@ -92,6 +92,7 @@ void yield(void);
 #include "esp32-hal-cpu.h"
 
 void analogWrite(uint8_t pin, int value);
+int8_t analogGetChannel(uint8_t pin);
 
 //returns chip temperature in Celsius
 float temperatureRead();

cores/esp32/esp32-hal.h

@@ -1,3 +1,13 @@
 ##########################
 Frequently Asked Questions
 ##########################
+
+How to modify an sdkconfig option in Arduino?
+---------------------------------------------
+
+Arduino-esp32 project is based on ESP-IDF. While ESP-IDF supports configuration of various compile-time options (known as "Kconfig options" or "sdkconfig options") via a "menuconfig" tool, this feature is not available in Arduino IDE.
+
+To use the arduino-esp32 core with a modified sdkconfig option, you need to use ESP-IDF to compile Arduino libraries. Please see :doc:`esp-idf_component` and :doc:`lib_builder` for the two solutions available.
+
+Note that modifying ``sdkconfig`` or ``sdkconfig.h`` files found in the arduino-esp32 project tree **does not** result in changes to these options. This is because ESP-IDF libraries are included into the arduino-esp32 project tree as pre-built libraries.
+

docs/source/faq.rst

@@ -12,6 +12,7 @@
 #include <esp_gattc_api.h>
 
 #include <map>
+#include <vector>
 
 #include "BLEAddress.h"
 #include "BLEScan.h"