From 5f8d6309996583350a020caf37e80c1b4248ea83 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Wed, 29 Jul 2026 03:29:29 +0200 Subject: [PATCH] supervisor: include settings.h when only the BLE serial service is enabled supervisor_bluetooth_init() calls settings_get_bool() under #if (CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_BLE_SERIAL_SERVICE) #if CIRCUITPY_SETTINGS_TOML but the include of settings.h is guarded by a condition that leaves CIRCUITPY_BLE_SERIAL_SERVICE out. Building with the serial service enabled and the file service disabled therefore fails: error: implicit declaration of function 'settings_get_bool' error: nested extern declaration of 'settings_get_bool' Add the missing symbol to the include condition so the two agree. No board in tree currently selects that combination, so nothing is broken today; this only bites when enabling the BLE serial service on its own. --- supervisor/shared/bluetooth/bluetooth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c index 7a3ca38de44..263aba7cbc9 100644 --- a/supervisor/shared/bluetooth/bluetooth.c +++ b/supervisor/shared/bluetooth/bluetooth.c @@ -36,7 +36,7 @@ #include "supervisor/shared/status_bar.h" #endif -#if (CIRCUITPY_BLE_FILE_SERVICE || (CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI)) && CIRCUITPY_SETTINGS_TOML +#if (CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_BLE_SERIAL_SERVICE || (CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI)) && CIRCUITPY_SETTINGS_TOML #include "supervisor/shared/settings.h" #endif