Update IDF to 1c3dd23

* Update mDNS and LEDC * update toolchain * Update IDF to 1c3dd23 * Advertise the board variant for Arduino OTA * Add generic variant definition for mDNS
2018-01-18 00:56:58 +02:00
parent 70d0d46487
commit 600f4c4130
150 changed files with 7113 additions and 3766 deletions
--- a/tools/sdk/include/bluedroid/bt_target.h
+++ b/tools/sdk/include/bluedroid/bt_target.h
@ -39,56 +39,57 @@

 #include "dyn_mem.h"    /* defines static and/or dynamic memory for components */

+/******************************************************************************
+**
+** Classic BT features
+**
+******************************************************************************/
 #if CONFIG_CLASSIC_BT_ENABLED
 #define CLASSIC_BT_INCLUDED         TRUE
+#define BTC_SM_INCLUDED             TRUE
+#define BTC_PRF_QUEUE_INCLUDED      TRUE
+#define BTC_GAP_BT_INCLUDED         TRUE
 #define BTA_SDP_INCLUDED            TRUE
-#define BTA_PAN_INCLUDED            FALSE
-#define BTA_HH_INCLUDED             FALSE
+#define SDP_INCLUDED                TRUE
+
+#if CONFIG_A2DP_ENABLE
 #define BTA_AR_INCLUDED             TRUE
 #define BTA_AV_INCLUDED             TRUE
-#define BTA_AV_SINK_INCLUDED        TRUE
-#define SDP_INCLUDED                TRUE
-#define RFCOMM_INCLUDED             FALSE
-#define PAN_INCLUDED                FALSE
-#define HID_HOST_INCLUDED           FALSE
 #define AVDT_INCLUDED               TRUE
 #define A2D_INCLUDED                TRUE
 #define AVCT_INCLUDED               TRUE
 #define AVRC_INCLUDED               TRUE
-#define SBC_DEC_INCLUDED            TRUE
-#define SBC_ENC_INCLUDED            FALSE
-#define MCA_INCLUDED                FALSE
-#define BTC_SM_INCLUDED             TRUE
-#define BTC_PRF_QUEUE_INCLUDED      TRUE
-#define BTC_GAP_BT_INCLUDED         TRUE
 #define BTC_AV_INCLUDED             TRUE
+#endif /* CONFIG_A2DP_ENABLE */

-#else /* #if CONFIG_CLASSIC_BT_ENABLED */
-#define CLASSIC_BT_INCLUDED         FALSE
-#define BTA_SDP_INCLUDED            FALSE
-#define BTA_PAN_INCLUDED            FALSE
-#define BTA_HH_INCLUDED             FALSE
-#define BTA_AR_INCLUDED             FALSE
-#define BTA_AV_INCLUDED             FALSE
-#define BTA_AV_SINK_INCLUDED        FALSE
-#define SDP_INCLUDED                FALSE
-#define RFCOMM_INCLUDED             FALSE
-#define PAN_INCLUDED                FALSE
-#define HID_HOST_INCLUDED           FALSE
-#define AVDT_INCLUDED               FALSE
-#define A2D_INCLUDED                FALSE
-#define AVCT_INCLUDED               FALSE
-#define AVRC_INCLUDED               FALSE
-#define SBC_DEC_INCLUDED            FALSE
-#define SBC_ENC_INCLUDED            FALSE
-#define MCA_INCLUDED                FALSE
-#define BTC_SM_INCLUDED             FALSE
-#define BTC_PRF_QUEUE_INCLUDED      FALSE
-#define BTC_GAP_BT_INCLUDED         FALSE
-#define BTC_AV_INCLUDED             FALSE
+#if CONFIG_A2DP_SINK_ENABLE
+#define BTA_AV_SINK_INCLUDED        TRUE
+#define BTC_AV_SINK_INCLUDED        TRUE
+#define SBC_DEC_INCLUDED            TRUE
+#endif /* CONFIG_A2DP_SINK_ENABLE */
+
+#if CONFIG_A2DP_SRC_ENABLE
+#define BTC_AV_SRC_INCLUDED         TRUE
+#define SBC_ENC_INCLUDED            TRUE
+#endif /* CONFIG_A2DP_SRC_ENABLE */
+
+#if CONFIG_BT_SPP_ENABLED
+#define RFCOMM_INCLUDED             TRUE
+#define BTA_JV_INCLUDED             TRUE
+#define BTC_SPP_INCLUDED            TRUE
+#endif /* CONFIG_BT_SPP_ENABLED */

 #endif /* #if CONFIG_CLASSIC_BT_ENABLED */

+#ifndef CLASSIC_BT_INCLUDED
+#define CLASSIC_BT_INCLUDED         FALSE
+#endif /* CLASSIC_BT_INCLUDED */
+
+/******************************************************************************
+**
+** BLE features
+**
+******************************************************************************/
 #if (CONFIG_GATTS_ENABLE)
 #define GATTS_INCLUDED              TRUE
 #else
@ -139,16 +140,62 @@
 #define BTIF_INCLUDED FALSE
 #endif

+/******************************************************************************
+**
+** BTC-layer components
+**
+******************************************************************************/
+#ifndef BTC_GAP_BT_INCLUDED
+#define BTC_GAP_BT_INCLUDED FALSE
+#endif
+
+#ifndef BTC_PRF_QUEUE_INCLUDED
+#define BTC_PRF_QUEUE_INCLUDED FALSE
+#endif
+
+#ifndef BTC_SM_INCLUDED
+#define BTC_SM_INCLUDED FALSE
+#endif
+
+#ifndef BTC_AV_INCLUDED
+#define BTC_AV_INCLUDED FALSE
+#endif
+
+#ifndef BTC_AV_SINK_INCLUDED
+#define BTC_AV_SINK_INCLUDED FALSE
+#endif
+
+#ifndef BTC_AV_SRC_INCLUDED
+#define BTC_AV_SRC_INCLUDED FALSE
+#endif
+
+#ifndef BTC_SPP_INCLUDED
+#define BTC_SPP_INCLUDED FALSE
+#endif
+
+#ifndef SBC_DEC_INCLUDED
+#define SBC_DEC_INCLUDED FALSE
+#endif
+
+#ifndef SBC_ENC_INCLUDED
+#define SBC_ENC_INCLUDED FALSE
+#endif
+
+/******************************************************************************
+**
+** BTA-layer components
+**
+******************************************************************************/
 #ifndef BTA_INCLUDED
 #define BTA_INCLUDED TRUE
 #endif

 #ifndef BTA_PAN_INCLUDED
-#define BTA_PAN_INCLUDED FALSE//TRUE
+#define BTA_PAN_INCLUDED FALSE
 #endif

 #ifndef BTA_HH_INCLUDED
-#define BTA_HH_INCLUDED FALSE//TRUE
+#define BTA_HH_INCLUDED FALSE
 #endif

 #ifndef BTA_HH_ROLE
@ -156,21 +203,47 @@
 #endif

 #ifndef BTA_HH_LE_INCLUDED
-#define BTA_HH_LE_INCLUDED FALSE//TRUE
+#define BTA_HH_LE_INCLUDED FALSE
 #endif

 #ifndef BTA_AR_INCLUDED
-#define BTA_AR_INCLUDED TRUE//TRUE
+#define BTA_AR_INCLUDED FALSE
 #endif

 #ifndef BTA_AV_INCLUDED
-#define BTA_AV_INCLUDED TRUE//TRUE
+#define BTA_AV_INCLUDED FALSE
 #endif

 #ifndef BTA_AV_SINK_INCLUDED
-#define BTA_AV_SINK_INCLUDED TRUE//FALSE
+#define BTA_AV_SINK_INCLUDED FALSE
 #endif

+#ifndef BTA_JV_INCLUDED
+#define BTA_JV_INCLUDED FALSE
+#endif
+
+#ifndef BTA_SDP_INCLUDED
+#define BTA_SDP_INCLUDED FALSE
+#endif
+
+/******************************************************************************
+**
+** Stack-layer components
+**
+******************************************************************************/
+#ifndef AVCT_INCLUDED
+#define AVCT_INCLUDED FALSE
+#endif
+
+#ifndef AVDT_INCLUDED
+#define AVDT_INCLUDED FALSE
+#endif
+
+/******************************************************************************
+**
+** Parameter Configurations for components
+**
+******************************************************************************/
 #ifndef BTA_DISABLE_DELAY
 #define BTA_DISABLE_DELAY 200 /* in milliseconds */
 #endif
@ -647,7 +720,8 @@

 /* 4.1/4.2 secure connections feature */
 #ifndef SC_MODE_INCLUDED
-#define SC_MODE_INCLUDED                TRUE
+// Disable AES-CCM (BT 4.1) for BT Classic to workaround controller AES issue. E0 encryption (BT 4.0) will be used.
+#define SC_MODE_INCLUDED                FALSE
 #endif

 /* Used for conformance testing ONLY */
@ -1045,7 +1119,7 @@
 ******************************************************************************/

 #ifndef SDP_INCLUDED
-#define SDP_INCLUDED                FALSE //TRUE
+#define SDP_INCLUDED                FALSE
 #endif

 /* This is set to enable SDP server functionality. */
@ -1432,7 +1506,7 @@ Range: 2 octets
 ******************************************************************************/

 #ifndef PAN_INCLUDED
-#define PAN_INCLUDED                     FALSE//TRUE
+#define PAN_INCLUDED                     FALSE
 #endif

 /* This will enable the PANU role */
@ -1577,7 +1651,7 @@ Range: 2 octets
 ** Definitions for HID-Host
 */
 #ifndef  HID_HOST_INCLUDED
-#define HID_HOST_INCLUDED           FALSE//TRUE
+#define HID_HOST_INCLUDED           FALSE
 #endif

 #ifndef HID_HOST_MAX_DEVICES
@ -1604,7 +1678,7 @@ Range: 2 octets
 * A2DP Definitions
 */
 #ifndef A2D_INCLUDED
-#define A2D_INCLUDED            FALSE//TRUE
+#define A2D_INCLUDED            FALSE
 #endif

 /******************************************************************************
@ -1629,7 +1703,7 @@ Range: 2 octets
 **
 ******************************************************************************/
 #ifndef AVRC_INCLUDED
-#define AVRC_INCLUDED               TRUE
+#define AVRC_INCLUDED               FALSE
 #endif

 #ifndef AVRC_METADATA_INCLUDED