Bluetooth: samples: Fine-tune mesh_demo on bbc_microbit

Fine tune the mesh_demo app for bbc_microbit.

Signed-off-by: Johan Hedberg <[email protected]>

Author: jhedberg

samples/bluetooth/mesh_demo/boards/bbc_microbit.conf

@@ -1,17 +1,20 @@
-CONFIG_ISR_STACK_SIZE=768
+CONFIG_ISR_STACK_SIZE=700
 CONFIG_MAIN_STACK_SIZE=512
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1200
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256
 CONFIG_GPIO=y
 CONFIG_DISPLAY=y
 CONFIG_MICROBIT_DISPLAY=y
 CONFIG_PWM=y
 
-CONFIG_BT_RX_STACK_SIZE=1280
+CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=1
+CONFIG_BT_MESH_ADV_STACK_SIZE=200
+
+CONFIG_BT_RX_STACK_SIZE=2000
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
 CONFIG_BT_PHY_UPDATE=n
 CONFIG_BT_DATA_LEN_UPDATE=n
 CONFIG_BT_EXT_ADV=n
-CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=15
+CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 
 CONFIG_BT_MESH_SEG_BUFS=6
 CONFIG_BT_MESH_ADV_BUF_COUNT=3

samples/bluetooth/mesh_demo/src/microbit.c

@@ -20,21 +20,14 @@
 
 #define SCROLL_SPEED   300
 
-#define BUZZER_PWM_CHANNEL 0
-#define BEEP_DURATION  K_MSEC(60)
-
 #define SEQ_PER_BIT  976
 #define SEQ_PAGE     (NRF_FICR->CODEPAGESIZE * (NRF_FICR->CODESIZE - 1))
 #define SEQ_MAX      (NRF_FICR->CODEPAGESIZE * 8 * SEQ_PER_BIT)
 
 static const struct gpio_dt_spec button_a =
-	GPIO_DT_SPEC_GET(DT_NODELABEL(buttona), gpios);
+	GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
 static const struct gpio_dt_spec button_b =
-	GPIO_DT_SPEC_GET(DT_NODELABEL(buttonb), gpios);
-static const struct device *const nvm =
-	DEVICE_DT_GET(DT_CHOSEN(zephyr_flash_controller));
-static const struct device *const pwm =
-	DEVICE_DT_GET_ANY(nordic_nrf_sw_pwm);
+	GPIO_DT_SPEC_GET(DT_ALIAS(sw1), gpios);
 
 static struct k_work button_work;
 
@@ -64,6 +57,13 @@ static void button_pressed(const struct device *dev, struct gpio_callback *cb,
 	}
 }
 
+#if defined(CONFIG_PWM)
+#define BUZZER_PWM_CHANNEL 0
+#define BEEP_DURATION  K_MSEC(60)
+
+static const struct device *const pwm =
+	DEVICE_DT_GET_ANY(nordic_nrf_sw_pwm);
+
 static const struct {
 	char  note;
 	uint32_t period;
@@ -139,6 +139,11 @@ void board_play_tune(const char *str)
 		pwm_set(pwm, BUZZER_PWM_CHANNEL, 0, 0, 0);
 	}
 }
+#else
+void board_play_tune(const char *str)
+{
+}
+#endif /* CONFIG_PWM */
 
 void board_heartbeat(uint8_t hops, uint16_t feat)
 {
@@ -267,13 +272,6 @@ int board_init(uint16_t *addr)
 {
 	struct mb_display *disp = mb_display_get();
 
-	if (!(device_is_ready(nvm) && device_is_ready(pwm) &&
-	      gpio_is_ready_dt(&button_a) &&
-	      gpio_is_ready_dt(&button_b))) {
-		printk("One or more devices are not ready\n");
-		return -ENODEV;
-	}
-
 	*addr = NRF_UICR->CUSTOMER[0];
 	if (!*addr || *addr == 0xffff) {
 #if defined(NODE_ADDR)