This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new efec1cdaf apps/bttester: Add option to disable default NimBLE
configuration in app
efec1cdaf is described below
commit efec1cdafd084ea68a19e1d04d17b69fa129fdbe
Author: Andrzej Kaczmarek <[email protected]>
AuthorDate: Mon Feb 10 12:44:08 2025 +0100
apps/bttester: Add option to disable default NimBLE configuration in app
---
apps/bttester/pkg.yml | 9 +++----
apps/bttester/src/btp_pacs.c | 7 +++---
apps/bttester/syscfg.yml | 56 ++++++++++++++++++++++++--------------------
3 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/apps/bttester/pkg.yml b/apps/bttester/pkg.yml
index 851119545..ae05f1c9d 100644
--- a/apps/bttester/pkg.yml
+++ b/apps/bttester/pkg.yml
@@ -32,15 +32,16 @@ pkg.deps:
- "@apache-mynewt-core/sys/stats"
- "@apache-mynewt-core/sys/shell"
- "@apache-mynewt-nimble/nimble/host"
- - "@apache-mynewt-nimble/nimble/host/audio"
- "@apache-mynewt-nimble/nimble/host/util"
- "@apache-mynewt-nimble/nimble/host/services/gap"
- "@apache-mynewt-nimble/nimble/host/services/gatt"
- "@apache-mynewt-nimble/nimble/host/services/dis"
- - "@apache-mynewt-nimble/nimble/host/audio/services/bass"
- - "@apache-mynewt-nimble/nimble/host/audio/services/pacs"
- - "@apache-mynewt-nimble/nimble/host/audio/services/pacs/lc3"
- "@apache-mynewt-nimble/nimble/host/store/config"
- "@apache-mynewt-core/hw/drivers/uart"
- "@apache-mynewt-core/hw/drivers/rtt"
+pkg.deps.BLE_AUDIO:
+ - "@apache-mynewt-nimble/nimble/host/audio"
+ - "@apache-mynewt-nimble/nimble/host/audio/services/bass"
+ - "@apache-mynewt-nimble/nimble/host/audio/services/pacs"
+ - "@apache-mynewt-nimble/nimble/host/audio/services/pacs/lc3"
diff --git a/apps/bttester/src/btp_pacs.c b/apps/bttester/src/btp_pacs.c
index 217d44df2..9404cd946 100644
--- a/apps/bttester/src/btp_pacs.c
+++ b/apps/bttester/src/btp_pacs.c
@@ -19,16 +19,17 @@
/* btp_pacs.c - Bluetooth Published Audio Capacity Service Tester */
+#include "syscfg/syscfg.h"
+
+#if MYNEWT_VAL(BLE_AUDIO)
+
#include "audio/ble_audio.h"
#include "audio/ble_audio_codec.h"
#include "btp/bttester.h"
#include "host/ble_gap.h"
#include "os/util.h"
-#include "syscfg/syscfg.h"
#include <stdint.h>
-#if MYNEWT_VAL(BLE_AUDIO)
-
#include "btp/btp.h"
#include "btp/btp_pacs.h"
#include "services/pacs/ble_audio_svc_pacs.h"
diff --git a/apps/bttester/syscfg.yml b/apps/bttester/syscfg.yml
index 11daaae8d..0bab8b101 100644
--- a/apps/bttester/syscfg.yml
+++ b/apps/bttester/syscfg.yml
@@ -16,9 +16,12 @@
# under the License.
#
-# Package: apps/blemesh
-
syscfg.defs:
+ BTTESTER_NODEFAULT:
+ description: >
+ Disable any NimBLE configuration in bttester app.
+ This is useful for building bttester apps with custom
configuration.
+ value: 0
BTTESTER_UART_BAUD:
description: 'Console UART baud rate.'
value: '115200'
@@ -99,31 +102,10 @@ syscfg.defs:
value: '"test_broadcast"'
syscfg.vals:
- BLE_AUDIO_MAX_CODEC_RECORDS: 3
CONSOLE_IMPLEMENTATION: full
LOG_IMPLEMENTATION: full
STATS_IMPLEMENTATION: full
- BLE_ISO: 1
- BLE_AUDIO: 1
- BLE_AUDIO_BROADCAST_SINK: 1
- BLE_AUDIO_BROADCAST_SINK_MAX: 2
- BLE_PERIODIC_ADV_SYNC_TRANSFER: 1
- BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS: 1
- BLE_ROLE_BROADCASTER: 1
- BLE_ISO_BROADCAST_SOURCE: 1
- BLE_ISO_BROADCAST_SINK: 1
- BLE_ISO_MAX_BISES: 3
- BLE_ISO_MAX_BIGS: 3
- BLE_EXT_ADV: 1
- BLE_PHY_2M: 1
- BLE_EXT_ADV_MAX_SIZE: 40
- BLE_PERIODIC_ADV: 1
- BLE_ISO_BROADCAST_SOURCE: 1
- BLE_MULTI_ADV_INSTANCES: 3
- BLE_SVC_AUDIO_BASS_METADATA_MAX_SZ: 256
- BLE_SVC_AUDIO_BASS_SUB_NUM_MAX: 10
-
OS_MAIN_STACK_SIZE: 512
SHELL_TASK: 0
SHELL_NEWTMGR: 0
@@ -137,11 +119,15 @@ syscfg.vals:
RTT_NUM_BUFFERS_UP: 0
RTT_NUM_BUFFERS_DOWN: 0
+ BLE_STORE_CONFIG_PERSIST: 0
+
+syscfg.vals.!BTTESTER_NODEFAULT:
+ BLE_VERSION: 54
+
BLE_L2CAP_COC_MAX_NUM: 5
BLE_L2CAP_SIG_MAX_PROCS: 2
BLE_L2CAP_ENHANCED_COC: 1
BLE_EATT_CHAN_NUM: 5
- BLE_VERSION: 54
# Some testcases require MPS < MTU
BLE_L2CAP_COC_MPS: 100
BLE_RPA_TIMEOUT: 30
@@ -157,7 +143,26 @@ syscfg.vals:
BLE_SVC_GAP_APPEARANCE_WRITE_PERM: 0
BLE_SVC_GAP_DEVICE_NAME_WRITE_PERM: 0
BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH: 6
- BLE_STORE_CONFIG_PERSIST: 0
+
+ BLE_ISO: 1
+ BLE_AUDIO: 1
+ BLE_AUDIO_BROADCAST_SINK: 1
+ BLE_AUDIO_BROADCAST_SINK_MAX: 2
+ BLE_AUDIO_MAX_CODEC_RECORDS: 3
+ BLE_PERIODIC_ADV_SYNC_TRANSFER: 1
+ BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS: 1
+ BLE_ROLE_BROADCASTER: 1
+ BLE_ISO_BROADCAST_SOURCE: 1
+ BLE_ISO_BROADCAST_SINK: 1
+ BLE_ISO_MAX_BISES: 3
+ BLE_ISO_MAX_BIGS: 3
+ BLE_EXT_ADV: 1
+ BLE_PHY_2M: 1
+ BLE_EXT_ADV_MAX_SIZE: 40
+ BLE_PERIODIC_ADV: 1
+ BLE_MULTI_ADV_INSTANCES: 3
+ BLE_SVC_AUDIO_BASS_METADATA_MAX_SZ: 256
+ BLE_SVC_AUDIO_BASS_SUB_NUM_MAX: 10
BLE_MESH: 1
BLE_MESH_SHELL: 0
@@ -183,4 +188,3 @@ syscfg.vals:
BLE_MESH_RX_SEG_MAX: 13
BLE_MESH_TX_SEG_MSG_COUNT: 2
BLE_MAX_CONNECTIONS: 8
-
