Add analogRead, touchRead, dacWrite and updated esp-idf

tools/sdk/include/bt/bt.h

@@ -16,6 +16,7 @@
 #define __BT_H__
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "esp_err.h"
 
 #ifdef __cplusplus

tools/sdk/include/config/sdkconfig.h

@@ -17,13 +17,16 @@
 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1
 #define CONFIG_BT_RESERVE_DRAM 0x10000
 #define CONFIG_LOG_BOOTLOADER_LEVEL_ERROR 1
+#define CONFIG_CONSOLE_UART_BAUDRATE 115200
 #define CONFIG_LWIP_MAX_SOCKETS 4
 #define CONFIG_ESP32_ENABLE_STACK_BT 1
 #define CONFIG_ULP_COPROC_RESERVE_MEM 0
 #define CONFIG_ESPTOOLPY_BAUD 921600
 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-"
+#define CONFIG_CONSOLE_UART_NUM 0
 #define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
 #define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
+#define CONFIG_CONSOLE_UART_DEFAULT 1
 #define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
 #define CONFIG_AUTOSTART_ARDUINO 1
 #define CONFIG_LOG_DEFAULT_LEVEL_ERROR 1
@@ -58,6 +61,7 @@
 #define CONFIG_MBEDTLS_HARDWARE_SHA 1
 #define CONFIG_FREERTOS_CORETIMER_0 1
 #define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
+#define CONFIG_MBEDTLS_HAVE_TIME 1
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32

tools/sdk/include/driver/driver/adc.h

@@ -0,0 +1,122 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _DRIVER_ADC_H_
+#define _DRIVER_ADC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include "esp_err.h"
+
+typedef enum {
+    ADC_ATTEN_0db   = 0,  /*!<The input voltage of ADC will be reduced to about 1/1 */
+    ADC_ATTEN_2_5db = 1,  /*!<The input voltage of ADC will be reduced to about 1/1.34 */
+    ADC_ATTEN_6db   = 2,  /*!<The input voltage of ADC will be reduced to about 1/2 */
+    ADC_ATTEN_11db  = 3,  /*!<The input voltage of ADC will be reduced to about 1/3.6*/
+} adc_atten_t;
+
+typedef enum {
+    ADC_WIDTH_9Bit  = 0, /*!< ADC capture width is 9Bit*/
+    ADC_WIDTH_10Bit = 1, /*!< ADC capture width is 10Bit*/
+    ADC_WIDTH_11Bit = 2, /*!< ADC capture width is 11Bit*/
+    ADC_WIDTH_12Bit = 3, /*!< ADC capture width is 12Bit*/
+} adc_bits_width_t;
+
+typedef enum {
+    ADC1_CHANNEL_0 = 0, /*!< ADC1 channel 0 is GPIO36 */
+    ADC1_CHANNEL_1,     /*!< ADC1 channel 1 is GPIO37 */
+    ADC1_CHANNEL_2,     /*!< ADC1 channel 2 is GPIO38 */
+    ADC1_CHANNEL_3,     /*!< ADC1 channel 3 is GPIO39 */
+    ADC1_CHANNEL_4,     /*!< ADC1 channel 4 is GPIO32 */
+    ADC1_CHANNEL_5,     /*!< ADC1 channel 5 is GPIO33 */
+    ADC1_CHANNEL_6,     /*!< ADC1 channel 6 is GPIO34 */
+    ADC1_CHANNEL_7,     /*!< ADC1 channel 7 is GPIO35 */
+    ADC1_CHANNEL_MAX,
+} adc1_channel_t;
+
+/**
+ * @brief Configuration ADC1 capture width.
+ *
+ * The configuration is in effect for all channels of ADC1
+ *
+ * @param  width_bit ADC1
+ *
+ * @return
+ *     - ESP_OK success
+ *     - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_t adc1_config_width(adc_bits_width_t width_bit);
+
+/**
+ * @brief Configuration ADC1 capture attenuation of channels.
+ *
+ * @param  channel the ADC1 channel
+ * @param  atten attenuation
+ *
+ * @return
+ *     - ESP_OK success
+ *     - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_t adc1_config_channel_atten(adc1_channel_t channel, adc_atten_t atten);
+
+/**
+ * @brief ADC1 get the value of the voltage.
+ *
+ * @param  channel the ADC1 channel
+ *
+ * @return
+ *     - -1 Parameter error
+ *     -  Other the value of ADC1 channel
+ */
+int adc1_get_voltage(adc1_channel_t channel);
+
+/**
+ * @brief Hall  Sensor output value.
+ *        @note
+ *        The Hall Sensor uses Channel_0 and Channel_3 of ADC1.
+ *        So, firstly: please configure ADC1 module by calling adc1_config_width before calling hall_sensor_read.
+                 We recommend that the WIDTH ADC1 be configured as 12Bit, because the values of hall_sensor_read are small and almost the same if WIDTH ADC1 is configured as 9Bit, 10Bit or 11Bit.
+ *            secondly: when you use the hall sensor, please do not use Channel_0 and Channel_3 of ADC1 as
+ *                   ADC channels.
+ *
+ * @return the value of hall sensor
+ */
+int hall_sensor_read();
+
+/**
+ *----------EXAMPLE TO USE ADC1------------ *
+ * @code{c}
+ *     adc1_config_width(ADC_WIDTH_12Bit);//config adc1 width
+ *     adc1_config_channel_atten(ADC1_CHANNEL_0,ADC_ATTEN_0db);//config channel0 attenuation
+ *     int val=adc1_get_voltage(ADC1_CHANNEL_0);//get the  val of channel0
+ * @endcode
+ **/
+
+/**
+ *----------EXAMPLE TO USE HALL SENSOR------------ *
+ * @code{c}
+ *     adc1_config_width(ADC_WIDTH_12Bit);//config adc1 width
+ *     int val=hall_sensor_read();
+ * @endcode
+ **/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /*_DRIVER_ADC_H_*/
+

tools/sdk/include/driver/driver/dac.h

@@ -0,0 +1,57 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _DRIVER_DAC_H_
+#define _DRIVER_DAC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include "esp_err.h"
+
+typedef enum {
+    DAC_CHANNEL_1 = 1,  /*!< DAC channel 1 is GPIO25 */
+    DAC_CHANNEL_2,      /*!< DAC channel 2 is GPIO26 */
+    DAC_CHANNEL_MAX,
+} dac_channel_t;
+
+/**
+ * @brief Set Dac output voltage.
+ *
+ * Dac width is 8bit ,and the voltage max is vdd
+ *
+ * @param channel dac channel
+ * @param dac_value dac output value
+ *
+ * @return
+ *     - ESP_OK success
+ *     - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_t dac_out_voltage(dac_channel_t channel, uint8_t dac_value);
+
+/**
+ *----------EXAMPLE TO USE DAC------------ *
+ * @code{c}
+ * dac_out_voltage(DAC_CHANNEL_1,200);//the dac out voltage ≈ 200*vdd/255
+ * @endcode
+ **/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /*_DRIVER_DAC_H_*/
+

tools/sdk/include/driver/driver/gpio.h

@@ -117,32 +117,6 @@ extern const uint32_t GPIO_PIN_MUX_REG[GPIO_PIN_COUNT];
 #define GPIO_IS_VALID_GPIO(gpio_num)      ((gpio_num < GPIO_PIN_COUNT && GPIO_PIN_MUX_REG[gpio_num] != 0))   //to decide whether it is a valid GPIO number
 #define GPIO_IS_VALID_OUTPUT_GPIO(gpio_num)      ((GPIO_IS_VALID_GPIO(gpio_num)) && (gpio_num < 34))         //to decide whether it can be a valid GPIO number of output mode
 
-/**
- * @brief Pullup/pulldown information for a single GPIO pad
- */
-typedef struct {
-    uint32_t reg;       /*!< Register to modify to enable or disable pullups or pulldowns */
-    uint32_t pu;        /*!< Bit to set or clear in the above register to enable or disable the pullup, respectively */
-    uint32_t pd;        /*!< Bit to set or clear in the above register to enable or disable the pulldown, respectively */
-} gpio_pu_pd_desc_t;
-
-
-/**
- * Per-GPIO pullup/pulldown information
- * On the ESP32, some GPIOs need their pullups and pulldowns enabled and disabled in the RTC 
- * peripheral instead of in the GPIO peripheral. This array documents for every GPIO what bit
- * to set or clear.
- * 
- * This array is non-static, so if you need a very quick way of toggling the pull-up/downs, you can just
- * do e.g. REG_SET_BIT(gpio_pu_pd_desc[gpio_num].reg, gpio_pu_pd_desc[gpio_num].pu); inline.
- * 
- * ToDo: Functions using the contents of this array will do a read/modify/write on GPIO as well as RTC
- * registers. We may need to look into muxes/locks for other code that accesses these RTC registers when we
- * write drivers for the RTC stuff.
- */
-extern const gpio_pu_pd_desc_t gpio_pu_pd_desc[GPIO_PIN_COUNT];
-
-
 typedef enum {
     GPIO_NUM_0 = 0,     /*!< GPIO0, input and output */
     GPIO_NUM_1 = 1,     /*!< GPIO1, input and output */

tools/sdk/include/driver/driver/pcnt.h

@@ -27,9 +27,9 @@ typedef enum {
 } pcnt_ctrl_mode_t;
 
 typedef enum {
-    PCNT_COUNT_DIS = 0,            /*!< Counter mode: Decrease counter value*/
+    PCNT_COUNT_DIS = 0,            /*!< Counter mode: Inhibit counter(counter value will not change in this condition)*/
     PCNT_COUNT_INC = 1,            /*!< Counter mode: Increase counter value*/
-    PCNT_COUNT_DEC = 2,            /*!< Counter mode: Inhibit counter(counter value will not change in this condition)*/
+    PCNT_COUNT_DEC = 2,            /*!< Counter mode: Decrease counter value*/
     PCNT_COUNT_MAX
 } pcnt_count_mode_t;
 
@@ -45,7 +45,7 @@ typedef enum {
     PCNT_UNIT_MAX,
 } pcnt_unit_t; 
 
-typedef enum{
+typedef enum {
     PCNT_CHANNEL_0 = 0x00,           /*!< PCNT channel0 */
     PCNT_CHANNEL_1 = 0x01,           /*!< PCNT channel1 */
     PCNT_CHANNEL_MAX,

tools/sdk/include/driver/driver/rtc_io.h

@@ -0,0 +1,167 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _DRIVER_RTC_GPIO_H_
+#define _DRIVER_RTC_GPIO_H_
+
+#include <stdint.h>
+#include "esp_err.h"
+#include "driver/gpio.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Pullup/pulldown information for a single GPIO pad
+ */
+typedef struct {
+    uint32_t reg;       /*!< Register of Rtc Pad */
+    uint32_t mux;       /*!< Mux seletct the Rtc pad is Digital Pad or Rtc pad */
+    uint32_t func;      /*!< Select Rtc Pad Func */
+    uint32_t ie;        /*!< Input Enable */
+    uint32_t pullup;    /*!< Pullup Enable */
+    uint32_t pulldown;  /*!< PullDown Enable */
+    int rtc_num;        /*!< The Rtc number */
+} rtc_gpio_desc_t;
+
+typedef enum {
+    RTC_GPIO_MODE_INPUT_ONLY , /*!< Pad output           */
+    RTC_GPIO_MODE_OUTPUT_ONLY, /*!< Pad input          */
+    RTC_GPIO_MODE_INPUT_OUTUT, /*!< Pad pull output + input      */
+    RTC_GPIO_MODE_DISABLED, /*!< Pad (output + input) disable       */
+} rtc_gpio_mode_t;
+
+#define RTC_GPIO_IS_VALID_GPIO(gpio_num)      ((gpio_num < GPIO_PIN_COUNT && rtc_gpio_desc[gpio_num].reg != 0))   //to decide whether it is a valid GPIO number
+
+extern const rtc_gpio_desc_t rtc_gpio_desc[GPIO_PIN_COUNT] ;
+
+/*
+ * @brief Init a gpio as rtc gpio
+ *
+ *        when init a pad as analog function,need to call this funciton
+ *
+ * @param  gpio_num gpio_num GPIO number. If you want to set the trigger type of e.g. of GPIO16, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - ESP_OK success
+ *     - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_t rtc_gpio_init(gpio_num_t gpio_num);
+
+/**
+ * @brief Init a gpio as digital gpio
+ *
+ * @param  gpio_num gpio_num GPIO number. If you want to set the trigger type of e.g. of GPIO16, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - ESP_OK success
+ *     - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_t rtc_gpio_deinit(gpio_num_t gpio_num);
+
+/**
+ * @brief Get the rtc io input level
+ *
+ * @param  gpio_num gpio_num GPIO number. If you want to set the trigger type of e.g. of GPIO16, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - 1 High level
+ *     - 0 Low level
+ */
+uint32_t rtc_gpio_get_level(gpio_num_t gpio_num);
+
+/**
+ * @brief Set the rtc io output level
+ *
+ * @param  gpio_num  GPIO number. If you want to set the trigger type of e.g. of GPIO16, gpio_num should be GPIO_NUM_12 (12);
+ * @param  level output level;
+ *
+ * @return
+ *     - 1 High level
+ *     - 0 Low level
+ */
+esp_err_t rtc_gpio_set_level(gpio_num_t gpio_num, uint32_t level);
+
+/**
+ * @brief    Rtc gpio set direction
+ *
+ * Configure Rtc gpio direction,such as output_only,input_only,output_and_input
+ *
+ * @param  gpio_num  Configure GPIO pins number, it should be GPIO number. If you want to set direction of e.g. GPIO12, gpio_num should be GPIO_NUM_12 (12);
+ * @param  mode GPIO direction
+ *
+ * @return
+ *     - ESP_OK Success
+ *     - ESP_ERR_INVALID_ARG GPIO error
+ */
+esp_err_t rtc_gpio_set_direction(gpio_num_t gpio_num, rtc_gpio_mode_t mode);
+
+/**
+ * @brief  Rtc gpio pullup enable
+ *
+ * If the user needs to configure the GPIO pull ,Please call gpio_set_pull_mode.This function will be called in gpio_set_pull
+ *
+ * @param  gpio_num GPIO number. If you want to set pull up or down mode for e.g. GPIO12, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - True  the gpio number is Rts pad
+ *     - False the gpio number is Digital pad
+ */
+esp_err_t rtc_gpio_pullup_en(gpio_num_t gpio_num);
+
+/**
+ * @brief  Rtc gpio pulldown enable
+ *
+ * If the user needs to configure the GPIO pull ,Please call gpio_set_pull_mode.This function will be called in gpio_set_pull
+ *
+ * @param  gpio_num GPIO number. If you want to set pull up or down mode for e.g. GPIO12, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - True  the gpio number is Rts pad
+ *     - False the gpio number is Digital pad
+ */
+esp_err_t rtc_gpio_pulldown_en(gpio_num_t gpio_num);
+
+/**
+ * @brief  Rtc gpio pullup clear
+ *
+ * If the user needs to configure the GPIO pull ,Please call gpio_set_pull_mode.This function will be called in gpio_set_pull
+ *
+ * @param  gpio_num GPIO number. If you want to set pull up or down mode for e.g. GPIO12, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - True  the gpio number is Rts pad
+ *     - False the gpio number is Digital pad
+ */
+esp_err_t rtc_gpio_pullup_dis(gpio_num_t gpio_num);
+
+/**
+ * @brief  Rtc gpio pulldown clear
+ *
+ * If the user needs to configure the GPIO pull ,Please call gpio_set_pull_mode.This function will be called in gpio_set_pull
+ *
+ * @param  gpio_num GPIO number. If you want to set pull up or down mode for e.g. GPIO12, gpio_num should be GPIO_NUM_12 (12);
+ *
+ * @return
+ *     - True  the gpio number is Rts pad
+ *     - False the gpio number is Digital pad
+ */
+esp_err_t rtc_gpio_pulldown_dis(gpio_num_t gpio_num);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

tools/sdk/include/driver/driver/touch_pad.h

@@ -0,0 +1,165 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _DRIVER_TOUCH_PAD_H_
+#define _DRIVER_TOUCH_PAD_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "esp_intr.h"
+#include "esp_err.h"
+#define TOUCH_PAD_SLEEP_CYCLE_CONFIG   (0x1000)//The Time is 150Khz,the Max value is 0xffff
+#define TOUCH_PAD_MEASURE_CYCLE_CONFIG (0xffff)//The Time is 8Mhz,the Max value is 0xffff
+typedef enum {
+    TOUCH_PAD_NUM0 = 0, /*!< Touch pad channel 0 is GPIO4 */
+    TOUCH_PAD_NUM1,    /*!< Touch pad channel 0 is GPIO0 */
+    TOUCH_PAD_NUM2,    /*!< Touch pad channel 0 is GPIO2 */
+    TOUCH_PAD_NUM3,    /*!< Touch pad channel 0 is GPIO15 */
+    TOUCH_PAD_NUM4,    /*!< Touch pad channel 0 is GPIO13 */
+    TOUCH_PAD_NUM5,    /*!< Touch pad channel 0 is GPIO12 */
+    TOUCH_PAD_NUM6,    /*!< Touch pad channel 0 is GPIO14 */
+    TOUCH_PAD_NUM7,    /*!< Touch pad channel 0 is GPIO27*/
+    TOUCH_PAD_NUM8,    /*!< Touch pad channel 0 is GPIO33*/
+    TOUCH_PAD_NUM9,    /*!< Touch pad channel 0 is GPIO32*/
+    TOUCH_PAD_MAX,
+} touch_pad_t;
+/**
+ * @brief       Initialize touch module.
+ *
+ *This function int touch pad module ,enable touch module
+ *
+ * @return    None
+ *
+ */
+void touch_pad_init();
+
+/**
+ * @brief       Configure touch pad interrupt threshold.
+ *
+ *
+ * @param[in]  touch_num  : config touch num
+ *
+ * @param[in]  threshold : interrupt threshold  ,When the touch_pad_register less than threshold,
+ *                         will trigger the touch interrupt.User can use touch_pad_read function
+ *                         to determine the threshold.
+ *
+ * @return    - ESP_OK Success
+ *            - ESP_ERR_INVALID_ARG Touch pad error
+ *
+ */
+esp_err_t touch_pad_config(touch_pad_t touch_num, uint16_t threshold);
+
+/**
+ * @brief       get touch pad touch_pad_register counter.
+ *
+ *User can use this function to determine the the interrupt threshold .When you do not touch  the
+ *pad ,read the touch_pad_read number(NumNotTouch) by the touch_pad_register.When you touch the pad ,read the touch_pad_register
+ *number(NumTouch) by the touch_pad_read.Normal NumNotTouch>NumTouch,so you can select a interrupt threshold.
+ *
+ * @param[in]  touch_num    : touch num
+ * @param[out]  touch_value : touch output value
+ *
+ *  @return   - ESP_OK Success
+ *            - ESP_ERR_INVALID_ARG Touch pad error
+ *
+ */
+esp_err_t touch_pad_read(touch_pad_t touch_num, uint16_t * touch_value);
+
+/**
+ * @brief   register TouchPad interrupt handler, the handler is an ISR.
+ *          The handler will be attached to the same CPU core that this function is running on.
+ *          @note
+ *          Users should know that which CPU is running and then pick a INUM that is not used by system.
+ *          We can find the information of INUM and interrupt level in soc.h.
+ *
+ * @param  touch_intr_num  Touch interrupt number,check the info in soc.h, and please see the core-isa.h for more details
+ * @param  fn  Interrupt handler function.
+ *
+ *         @note
+ *         Note that the handler function MUST be defined with attribution of "IRAM_ATTR".
+ *
+ * @param  arg  Parameter for handler function
+ *
+ * @return
+ *     - ESP_OK Success ;
+ *     - ESP_ERR_INVALID_ARG GPIO error
+ */
+esp_err_t touch_pad_isr_handler_register(uint32_t touch_intr_num, void(*fn)(void*), void *arg);
+
+
+/**
+ * ***************        ATTENTION       ********************/
+/**
+ *@attention
+*Touch button is through the body's capacitive characteristics, 
+*there is a charge discharge circuit inside the. When the hands touch, 
+*the charge and discharge time will be slow.
+*Because of the different hardware, each pad needs to be calibrated at the factory.
+*We use touch_pad_read to determine factory parament.
+*/
+/**
+ *----------EXAMPLE TO CONIFGURE GPIO AS OUTPUT ------------ *
+ * @code{c}
+ *  touch_pad_init();                            
+ *  void taskA(void* arg)
+ *  {
+ *      for(;;){
+ *          vtaskDelay(20/portTICK_PERIOD_MS);
+ *          ets_printf("tocuch pad value %u\n",touch_pad_read(0));//Take the touched status and untouched status value
+ *      } 
+ *  }
+ * @endcode
+ **/
+/**
+ *----------EXAMPLE TO SET ISR HANDLER ----------------------
+ * @code{c}
+ * //the first parameter is INUM, you can pick one form interrupt level 1/2 which is not used by the system.
+ * touch_pad_isr_handler_register(19,rtc_intr,NULL);    //hook the isr handler for TouchPad interrupt
+ * @endcode
+ * @note
+ *     1. user should arrange the INUMs that used, better not to use a same INUM for different interrupt.
+ *     2. do not pick the INUM that already occupied by the system.
+ *     3. refer to soc.h to check which INUMs that can be used.
+ */
+/**
+ *----------EXAMPLE TO USE TOUCH_PAD------------ *
+ * @code{c}
+ *   touch_pad_init();//only init one time
+ *   touch_pad_config(0,300);//set the intr threshold,use touch_pad_read to determine this threshold 
+ *   touch_pad_isr_handler_register(19,rtc_intr,NULL)
+ *   #include "esp_attr.h"
+ *   void IRAM_ATTR rtc_intr(void * arg)
+ *   {
+ *       uint32_t pad_intr = READ_PERI_REG(SARADC_SAR_TOUCH_CTRL2_REG) & 0x3ff;
+ *       uint8_t i = 0;
+ *       uint32_t rtc_intr = READ_PERI_REG(RTC_CNTL_INT_ST_REG);
+ *       WRITE_PERI_REG(RTC_CNTL_INT_CLR_REG, rtc_intr);
+ *       SET_PERI_REG_MASK(SARADC_SAR_TOUCH_CTRL2_REG, SARADC_TOUCH_MEAS_EN_CLR);
+ *       if (rtc_intr & RTC_CNTL_TOUCH_INT_ST) {
+ *           for (i = 0; i < TOUCH_PAD_MAX; ++i) {
+ *               if ((pad_intr >> i) & 0x01) {
+ *                   ets_printf("touch pad intr %u\n",i);
+ *               }
+ *           }
+ *       }
+ *  }
+ * @endcode
+ **/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif/*_DRIVER_TOUCH_PAD_H_*/
+

tools/sdk/include/esp32/esp_coexist.h

@@ -0,0 +1,46 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Init software coexist
+ *
+ * @return Init ok or failed.
+ */
+esp_err_t coex_init(void);
+
+/**
+ * @brief Get software coexist enable or not
+ *
+ * @return software coexist enable status.
+ */
+bool coexist_get_enable(void);
+
+/**
+ * @brief Set software coexist enable or not
+ *
+ * @param enable software coexist or disable it
+ *
+ * @return Void.
+ */
+void coexist_set_enable(bool enable);
+
+#ifdef __cplusplus
+}
+#endif

tools/sdk/include/esp32/rom/uart.h

@@ -18,6 +18,8 @@
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "ets_sys.h"
+#include "soc/soc.h"
+#include "soc/uart_reg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -260,11 +262,16 @@ void uart_tx_flush(uint8_t uart_no);
 /**
   * @brief Wait until uart tx full empty and the last char send ok.
   *
-  * @param  uint8_t uart_no : 0 for UART0, 1 for UART1.
+  * @param  uart_no : 0 for UART0, 1 for UART1, 2 for UART2
   *
-  * @return None.
+  * The function defined in ROM code has a bug, so we define the correct version
+  * here for compatibility.
   */
-void uart_tx_wait_idle(uint8_t uart_no);
+static inline void uart_tx_wait_idle(uint8_t uart_no) {
+    while(REG_GET_FIELD(UART_STATUS_REG(uart_no), UART_ST_UTX_OUT)) {
+        ;
+    }
+}
 
 /**
   * @brief Get an input char from message channel.

tools/sdk/include/esp32/soc/soc.h

@@ -153,7 +153,7 @@
 #define DR_REG_FRC_TIMER_BASE                   0x3ff47000
 #define DR_REG_RTCCNTL_BASE                     0x3ff48000
 #define DR_REG_RTCIO_BASE                       0x3ff48400
-#define DR_REG_SARADC_BASE                      0x3ff48800
+#define DR_REG_SENS_BASE                      0x3ff48800
 #define DR_REG_IO_MUX_BASE                      0x3ff49000
 #define DR_REG_RTCMEM0_BASE                     0x3ff61000
 #define DR_REG_RTCMEM1_BASE                     0x3ff62000
@@ -213,10 +213,10 @@
 #define ETS_TG1_LACT_LEVEL_INTR_SOURCE          21/**< interrupt of TIMER_GROUP1, LACT, level*/
 #define ETS_GPIO_INTR_SOURCE                    22/**< interrupt of GPIO, level*/
 #define ETS_GPIO_NMI_SOURCE                     23/**< interrupt of GPIO, NMI*/
-#define ETS_FROM_CPU_INTR0_SOURCE               24/**< interrupt0 generated from a CPU, level*/
-#define ETS_FROM_CPU_INTR1_SOURCE               25/**< interrupt1 generated from a CPU, level*/
-#define ETS_FROM_CPU_INTR2_SOURCE               26/**< interrupt2 generated from a CPU, level*/
-#define ETS_FROM_CPU_INTR3_SOURCE               27/**< interrupt3 generated from a CPU, level*/
+#define ETS_FROM_CPU_INTR0_SOURCE               24/**< interrupt0 generated from a CPU, level*/ /* Used for FreeRTOS */
+#define ETS_FROM_CPU_INTR1_SOURCE               25/**< interrupt1 generated from a CPU, level*/ /* Used for FreeRTOS */
+#define ETS_FROM_CPU_INTR2_SOURCE               26/**< interrupt2 generated from a CPU, level*/ /* Used for VHCI */
+#define ETS_FROM_CPU_INTR3_SOURCE               27/**< interrupt3 generated from a CPU, level*/ /* Reserved */
 #define ETS_SPI0_INTR_SOURCE                    28/**< interrupt of SPI0, level, SPI0 is for Cache Access, do not use this*/
 #define ETS_SPI1_INTR_SOURCE                    29/**< interrupt of SPI1, level, SPI1 is for flash read/write, do not use this*/
 #define ETS_SPI2_INTR_SOURCE                    30/**< interrupt of SPI2, level*/

tools/sdk/ld/esp32.rom.ld

@@ -1841,3 +1841,22 @@ PROVIDE ( _xtos_syscall_handler = 0x40000790 );
 PROVIDE ( _xtos_unhandled_exception = 0x4000c024 );
 PROVIDE ( _xtos_unhandled_interrupt = 0x4000c01c );
 PROVIDE ( _xtos_vpri_enabled = 0x3ffe0654 );
+/* Following are static data, but can be used, not generated by script <<<<< btdm data */
+PROVIDE ( ld_acl_env = 0x3ffb8258 );
+PROVIDE ( ld_active_ch_map = 0x3ffb8334 );
+PROVIDE ( ld_bcst_acl_env = 0x3ffb8274 );
+PROVIDE ( ld_csb_rx_env = 0x3ffb8278 );
+PROVIDE ( ld_csb_tx_env = 0x3ffb827c );
+PROVIDE ( ld_env = 0x3ffb9510 );
+PROVIDE ( ld_fm_env = 0x3ffb8284 );
+PROVIDE ( ld_inq_env = 0x3ffb82e4 );
+PROVIDE ( ld_iscan_env = 0x3ffb82e8 );
+PROVIDE ( ld_page_env = 0x3ffb82f0 );
+PROVIDE ( ld_pca_env = 0x3ffb82f4 );
+PROVIDE ( ld_pscan_env = 0x3ffb8308 );
+PROVIDE ( ld_sched_env = 0x3ffb830c );
+PROVIDE ( ld_sched_params = 0x3ffb96c0 );
+PROVIDE ( ld_sco_env = 0x3ffb824c );
+PROVIDE ( ld_sscan_env = 0x3ffb832c );
+PROVIDE ( ld_strain_env = 0x3ffb8330 );
+/* Above are static data, but can be used, not generated by script >>>>> btdm data */