add the fixed menuconfig

Kconfig

@@ -23,114 +23,190 @@ if PKG_USING_BTSTACK
         string
         default "/packages/iot/btstack"
         
-menu "Bluetooth Role support"
-
-    config PKG_BTSTACK_ROLE_PERIPHERAL
-    bool "Peripheral Role support"
-    select PKG_BTSTACK_ROLE_BROADCASTER
+        
+        
+#  btstack office config
+menu "BTSTACK stack config"
+    config ENABLE_LOG_ERROR
+    bool "btstack error log support"
     default y
     help
-        Select this for LE Peripheral role support.
-
-    config PKG_BTSTACK_ROLE_CENTRAL
-    bool "Central Role support"
-    select PKG_BTSTACK_ROLE_OBSERVER
+        This option log error support.   
+        
+    config ENABLE_LOG_INFO
+    bool "btstack info log support"
     default n
     help
-        Select this for LE Central role support.
-
-    config PKG_BTSTACK_ROLE_BROADCASTER
-    bool "Broadcaster Role support"
-    default y
-    help
-        Select this for LE Broadcaster role support.
-
-    config PKG_BTSTACK_ROLE_OBSERVER
-    bool "Observer Role support"
-    help
-        Select this for LE Observer role support.
-        
+        This option log info log support.    
         
-    config PKG_BTSTACK_CLASS
-    bool "BR/EDR Role support"
-    help
-        Select this for BR/EDR role support.
-
-endmenu
-
-
-menu "Bluetooth Mesh support"
-    config PKG_BTSTACK_MESH
-    bool "Bluetooth Mesh support"
+    config ENABLE_LOG_DEBUG
+    bool "btstack debug log support"
     default n
-    depends on PKG_BTSTACK_ROLE_BROADCASTER && PKG_BTSTACK_ROLE_OBSERVER
     help
-        This option enables Bluetooth Mesh support. The specific
-        features that are available may depend on other features
-        that have been enabled in the stack, such as GATT support.
+        This option debug info log support.  
+        
+    config ENABLE_SDP_DES_DUMP
+    bool "btstack SDP Dump DataElement support"
+    default y
 endmenu
 
-menu "Bluetooth SMP support"
-    config PKG_BTSTACK_SMP
-    bool "Bluetooth SMP support"
+menuconfig ENABLE_LE
+    bool "BTSTACK BLE support"
     default n
-    help
-        This option enables SMP support.        
-endmenu
+    
+    if ENABLE_LE
+        config ENABLE_LE_PERIPHERAL
+        bool   "btstack LE peripheral support"
+        default y
 
-menu "Bluetooth BR_EDR support"
-    config PKG_BTSTACK_SBC_ENC
-    bool "Bluetooth SBC encode support"
+        config ENABLE_LE_CENTRAL
+        bool   "btstack LE central support"
+        default n
+
+        config ENABLE_LE_DATA_CHANNELS
+        bool  "btstack LE data channel support"
+        default y   
+
+        config ENABLE_LE_DATA_LENGTH_EXTENSION
+        bool  "btstack LE data length extension"
+        default n
+
+        config ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
+        bool  "btstack L2CAP ERTM support"
+        default n  
+    endif
+
+menuconfig ENABLE_CLASSIC
+    bool "BTSTACK BR_EDR SUPPORT"
     default n
-    help
-        This option enables Bluetooth Audio ENCODE support. 
+    
+    if ENABLE_CLASSIC
+        config NVM_NUM_LINK_KEYS
+        int  
+        default 16
+
+        config NVM_NUM_DEVICE_DB_ENTRIES
+        int  "btstack class device link support"
+        default 16  
         
-    config PKG_BTSTACK_SBC_DEC
-    bool "Bluetooth SBC encode decode support"
-    default n
-    help
-        This option enables Bluetooth Audio DECODE support.   
+        config HCI_INCOMING_PRE_BUFFER_SIZE
+        int  "HCI incomming pre in head BUFFER SIZE"
+        default 14    
         
-    config PKG_BTSTACK_CVSD
-    bool "Bluetooth CVSD support"
+        config HCI_ACL_PAYLOAD_SIZE
+        int  "HCI acl payload size"
+        default 1695 
+#HFP
+        config ENABLE_HFP_WIDE_BAND_SPEECH
+        bool  "btstack class HFP WIDE BAND support"
+        default n
+
+
+        config PKG_BTSTACK_SBC_ENC
+        bool "Bluetooth SBC encode support"
+        default n
+        help
+            This option enables Bluetooth Audio ENCODE support. 
+            
+        config PKG_BTSTACK_SBC_DEC
+        bool "Bluetooth SBC encode decode support"
+        default n
+        help
+            This option enables Bluetooth Audio DECODE support.   
+            
+        config PKG_BTSTACK_CVSD
+        bool "Bluetooth CVSD support"
+        default n
+        help
+            This option enables Bluetooth CVSD support. 
+            
+        config PKG_BTSTACK_AUDIO
+        bool "Bluetooth audio support"
+        default n
+        help
+            This option enables Bluetooth audio support.  
+            
+        config PKG_BTSTACK_SDP_CLIENT
+        bool "Bluetooth SDP CLIENT support"
+        default n
+        help
+            This option enables Bluetooth SDP client support. 
+            
+        config PKG_BTSTACK_HFP_AUDIO
+        bool "Bluetooth CVSD support"
+        default n
+        select PKG_BTSTACK_CVSD
+        select PKG_BTSTACK_SBC_DEC
+        select PKG_BTSTACK_SBC_ENC
+        select PKG_BTSTACK_SDP_CLIENT
+        select PKG_BTSTACK_AUDIO
+        help
+            This option enables Bluetooth HFP support.
+    endif
+
+
+menuconfig ENABLE_MESH
+    bool "BTSTACK Mesh SUPPORT"
     default n
-    help
-        This option enables Bluetooth CVSD support. 
+    
+    if ENABLE_MESH
+        config ENABLE_MESH_ADV_BEARER
+        bool "support the adv bear"
+        default y
         
-    config PKG_BTSTACK_AUDIO
-    bool "Bluetooth audio support"
-    default n
-    help
-        This option enables Bluetooth audio support.  
+        config ENABLE_MESH_GATT_BEARER
+        bool "support the gatt bear"
+        default y   
         
-    config PKG_BTSTACK_SDP_CLIENT
-    bool "Bluetooth SDP CLIENT support"
-    default n
-    help
-        This option enables Bluetooth SDP client support. 
+        config ENABLE_MESH_PB_ADV
+        bool "support the gatt bear"
+        default y   
+
+        config ENABLE_MESH_PB_GATT
+        bool  "provisioner gatt"
+        default y   
         
-    config PKG_BTSTACK_HFP_AUDIO
-    bool "Bluetooth CVSD support"
-    default n
-    select PKG_BTSTACK_CVSD
-    select PKG_BTSTACK_SBC_DEC
-    select PKG_BTSTACK_SBC_ENC
-    select PKG_BTSTACK_SDP_CLIENT
-    select PKG_BTSTACK_AUDIO
-    help
-        This option enables Bluetooth HFP support.
+        config ENABLE_MESH_PROXY_SERVER
+        bool  "provisioner server"
+        default y   
         
- 
+        config ENABLE_MESH_PROVISIONER
+        bool  "provisioner server"
+        default y 
+        config MAX_NR_MESH_TRANSPORT_KEYS
+        int 
+        default 16  
         
+        config MAX_NR_MESH_VIRTUAL_ADDRESSES
+        int 
+        default 16 
         
-endmenu
+        config MAX_NR_MESH_SUBNETS
+        int 
+        default 2  
+
+        config MAX_NR_MESH_NETWORK_KEYS
+        int 
+        default 3      
+    endif
+
+
+menuconfig PKG_BTSTACK_SMP
+        bool "BTSTACK SMP SUPPORT"
+        default n
+        if PKG_BTSTACK_SMP
+            config ENABLE_ECC_P256
+            bool 
+            default y
+        endif
+
 
 
 
 # example
 choice
-    prompt "Bluetooth Samples"
-    default PKG_BTSTACK_SAMPLE_LE_COUNTER
+    prompt "BTSTACK example ALL"
+    default PKG_BTSTACK_SAMPLE_LE_BLUFI_SERVER
     help
         select the BTSTACK samples
         
@@ -139,167 +215,126 @@ choice
          
     config PKG_BTSTACK_SAMPLE_LE_BLUFI_SERVER
     bool "[LE_SRV] rtthread blufi server"
-    select BTSTACK_ROLE_PERIPHERAL
+    select ENABLE_LE
     
 
     config PKG_BTSTACK_SAMPLE_LE_COUNTER
     bool "[LE_SRV] BLE peripheral le counter"
-    select BTSTACK_ROLE_PERIPHERAL
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
     config PKG_BTSTACK_SAMPLE_LE_DATA_CHANNEL_SERVER
     bool "[LE_SRV] BLE peripheral le data channel server"
-    select BTSTACK_ROLE_PERIPHERAL
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
 
     
     config PKG_BTSTACK_SAMPLE_LE_STREAMER
     bool "[LE_SRV] Nordic le streamer server"
-    select BTSTACK_ROLE_PERIPHERAL  
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL 
     
     config PKG_BTSTACK_SAMPLE_NORDIC_LE_COUNTER
     bool "[LE_SRV] Nordic le counter server"
-    select BTSTACK_ROLE_PERIPHERAL 
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
     config PKG_BTSTACK_SAMPLE_UBLOX_LE_COUNTER
     bool "[LE_SRV] Nordic spp ublox server"
-    select BTSTACK_ROLE_PERIPHERAL 
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
     config PKG_BTSTACK_SAMPLE_ATT_DELAYED_RESPONSE
     bool "[LE_SRV] gatt dealyed response"
-    select BTSTACK_ROLE_PERIPHERAL  
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
     config PKG_BTSTACK_SAMPLE_SM_PAIRING_PERIPHERAL
     bool "[LE_SMP_SRV] smp peripherals"
-    select BTSTACK_ROLE_PERIPHERAL      
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL 
     
     config PKG_BTSTACK_SAMPLE_GATT_STREAMER_PERIPHERAL
     bool "[LE_SRV] gatt streamer peipheral"
-    select BTSTACK_ROLE_PERIPHERAL   
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
     config PKG_BTSTACK_SAMPLE_ANCS_CLIENT_DEMO
     bool "[LE_SRV] ancs_client_demo"
-    select BTSTACK_ROLE_PERIPHERAL 
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
  
     config PKG_BTSTACK_SAMPLE_HOGP_KEYBOARD_DEMO
     bool "[LE_SRV_hogp] hogp keyboard demo"
-    select BTSTACK_ROLE_PERIPHERAL 
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
     config PKG_BTSTACK_SAMPLE_HOGP_MOUSER_DEMO
     bool "[LE_SRV_hogp] hogp mouser demo"
-    select BTSTACK_ROLE_PERIPHERAL 
+    select ENABLE_LE
+    select ENABLE_LE_PERIPHERAL
     
+# MESH role
     config PKG_BTSTACK_SAMPLE_MESH_DEMO
     bool "[MESH_NODE] MESH DEMO"
-    select BTSTACK_ROLE_PERIPHERAL  
-    select PKG_BTSTACK_MESH
+    select ENABLE_LE  
+    select ENABLE_MESH
     select PKG_BTSTACK_SMP
- 
 
     config PKG_BTSTACK_SAMPLE_TMALL_MESH_DEMO
     bool "[MESH_NODE] MESH DEMO ON TMALL ALIGEN"
-    select BTSTACK_ROLE_PERIPHERAL  
-    select PKG_BTSTACK_MESH
+    select ENABLE_LE  
+    select ENABLE_MESH
     select PKG_BTSTACK_SMP 
     
+# dule mode le and bredr     
     config PKG_BTSTACK_SAMPLE_SPP_GATT_COUNTER_DEMO
     bool "[EDR_LE_SLAVE] spp and gatt counter"
-    select BTSTACK_ROLE_PERIPHERAL  
-    select PKG_BTSTACK_CLASS    
+    select ENABLE_LE  
+    select ENABLE_CLASSIC    
     
     config PKG_BTSTACK_SAMPLE_SPP_GATT_STREAMER_DEMO
     bool "[EDR_LE_SLAVE] spp and gatt streamer"
-    select BTSTACK_ROLE_PERIPHERAL  
-    select PKG_BTSTACK_CLASS    
+    select ENABLE_LE  
+    select ENABLE_CLASSIC    
     
     config PKG_BTSTACK_SAMPLE_SPP_COUNTER_DEMO
     bool "[EDR_SPP_SLAVE] spp counter"
-    select PKG_BTSTACK_CLASS 
+    select ENABLE_CLASSIC 
 
 
     config PKG_BTSTACK_SAMPLE_SPP_STREAMER_DEMO
     bool "[EDR_SPP_SLAVE] spp streamer"
-    select PKG_BTSTACK_CLASS 
-    
+    select ENABLE_CLASSIC 
+
+# classic example
     config PKG_BTSTACK_SAMPLE_HFP_HF_DEMO
     bool "[EDR_HFP_SLAVE] hfp handsfree demo"
-    select PKG_BTSTACK_CLASS 
+    select ENABLE_CLASSIC 
     select PKG_BTSTACK_HFP_AUDIO
     select PKG_BTSTACK_AUDIO
     
     config PKG_BTSTACK_SAMPLE_HFP_AG_DEMO
     bool "[EDR_HFP_MASTER] hfp AG demo"
-    select PKG_BTSTACK_CLASS 
+    select ENABLE_CLASSIC 
     select PKG_BTSTACK_HFP_AUDIO
     select PKG_BTSTACK_AUDIO
  
     config PKG_BTSTACK_SAMPLE_HSP_HS_DEMO
     bool "[EDR_HSP_SLAVE] hfp headset demo"
-    select PKG_BTSTACK_CLASS 
+    select ENABLE_CLASSIC 
     select PKG_BTSTACK_HFP_AUDIO
     select PKG_BTSTACK_AUDIO
     
     config PKG_BTSTACK_SAMPLE_HSP_AG_DEMO
     bool "[EDR_HSP_MASTER] hfp ag demo"
-    select PKG_BTSTACK_CLASS 
+    select ENABLE_CLASSIC 
     select PKG_BTSTACK_HFP_AUDIO
     
 endchoice
 
 # btstack config
 
-if PKG_BTSTACK_SMP
-    config ENABLE_ECC_P256
-    bool 
-    default y
-endif
-
-if PKG_BTSTACK_MESH
-    config ENABLE_MESH
-    bool 
-    default y
-
-    config ENABLE_MESH_ADV_BEARER
-    bool 
-    default y
-    
-    config ENABLE_MESH_GATT_BEARER
-    bool 
-    default y   
-    
-    config ENABLE_MESH_PB_ADV
-    bool 
-    default y   
-
-    config ENABLE_MESH_PB_GATT
-    bool 
-    default y   
-    
-    config ENABLE_MESH_PROXY_SERVER
-    bool 
-    default y   
-    
-    config ENABLE_MESH_PROVISIONER
-    bool 
-    default y 
-  
-
-    config MAX_NR_MESH_TRANSPORT_KEYS
-    int 
-    default 16  
-    
-    config MAX_NR_MESH_VIRTUAL_ADDRESSES
-    int 
-    default 16 
-    
-    config MAX_NR_MESH_SUBNETS
-    int 
-    default 2  
-
-    config MAX_NR_MESH_NETWORK_KEYS
-    int 
-    default 3      
-    
-endif
-
     choice
         prompt "Version"
         default PKG_USING_BTSTACK_LATEST_VERSION

SConscript

@@ -65,7 +65,7 @@ path += [cwd + '/rtt_adapter']
 path += [cwd + '/src/ble/gatt-service']
 
 #CLASS
-if GetDepend(['PKG_BTSTACK_CLASS']):
+if GetDepend(['ENABLE_CLASSIC']):
      path += [cwd + '/src/class']
      src += Split("""
         src/classic/sdp_util.c
@@ -136,7 +136,7 @@ if GetDepend(['PKG_BTSTACK_CVSD']):
         
         
 #MESH
-if GetDepend(['PKG_BTSTACK_MESH']):
+if GetDepend(['ENABLE_MESH']):
      path += [cwd + '/src/mesh']
      src += Split("""
 			src/mesh/adv_bearer.c