bricks: PB_LIB_BTSTACK as string variable

The PB_LIB_BTSTACK library has to be compiled
with different sources if it is being used to drive
a classic module vs. a dual or LE module.
Per PR feedback, adjust the PB_LIB_BTSTACK variable
to signal which state we are in, rather than using separate
PB_LIB_BTSTACK and PB_LIB_BTSTACK_CLASSIC variables.

Author: jaguilar

bricks/_common/arm_none_eabi.mk

@@ -52,7 +52,7 @@ $(error failed)
 endif
 endif
 endif
-ifeq ($(or $(PB_LIB_BTSTACK),$(PB_LIB_BTSTACK_CLASSIC)),1)
+ifneq ($(strip $(PB_LIB_BTSTACK)),)
 ifeq ("$(wildcard $(PBTOP)/lib/btstack/README.md)","")
 $(info GIT cloning btstack submodule)
 $(info $(shell cd $(PBTOP) && git submodule update --checkout --init lib/btstack))
@@ -124,7 +124,7 @@ endif
 ifeq ($(PB_LIB_BLE5STACK),1)
 INC += -I$(PBTOP)/lib/ble5stack/central
 endif
-ifeq ($(or $(PB_LIB_BTSTACK),$(PB_LIB_BTSTACK_CLASSIC)),1)
+ifneq ($(strip $(PB_LIB_BTSTACK)),)
 INC += -I$(PBTOP)/lib/btstack/chipset/cc256x
 INC += -I$(PBTOP)/lib/btstack/src
 endif
@@ -509,11 +509,11 @@ ifeq ($(PB_LIB_BLE5STACK),1)
 OBJ += $(addprefix $(BUILD)/, $(BLE5STACK_SRC_C:.c=.o))
 endif
 
-ifeq ($(PB_LIB_BTSTACK_CLASSIC),1)
+ifeq ($(PB_LIB_BTSTACK),classic)
 OBJ += $(addprefix $(BUILD)/, $(BTSTACK_SRC_C:.c=.o))
 endif
 
-ifeq ($(PB_LIB_BTSTACK),1)
+ifeq ($(PB_LIB_BTSTACK),lowenergy)
 OBJ += $(addprefix $(BUILD)/, $(BTSTACK_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(BTSTACK_BLE_SRC_C:.c=.o))
 endif
@@ -571,9 +571,9 @@ TARGETS := $(BUILD)/firmware.zip
 
 all: $(TARGETS)
 
-# handle BTStack .gatt files
+# handle BTStack .gatt files (only for BLE / lowenergy)
 
-ifeq ($(PB_LIB_BTSTACK),1)
+ifeq ($(PB_LIB_BTSTACK),lowenergy)
 
 GATT_FILES := $(addprefix lib/pbio/drv/bluetooth/,\
 	pybricks_service.gatt \

bricks/essentialhub/Makefile

@@ -9,7 +9,7 @@ PB_MCU_EXT_OSC_HZ = 16000000
 PB_LIB_STM32_HAL = 1
 PB_LIB_LSM6DS3TR_C = 1
 PB_LIB_BLUENRG = 0
-PB_LIB_BTSTACK = 1
+PB_LIB_BTSTACK = lowenergy
 PB_LIB_STM32_USB_DEVICE = 1
 TEXT0_ADDR = 0x8008000
 DFU_VID = 0x0694

bricks/ev3/Makefile

@@ -2,6 +2,6 @@ PBIO_PLATFORM = ev3
 PB_MCU_FAMILY = TIAM1808
 
 PB_LIB_UMM_MALLOC = 1
-PB_LIB_BTSTACK_CLASSIC = 1
+PB_LIB_BTSTACK = classic
 
 include ../_common/arm_none_eabi.mk

bricks/primehub/Makefile

@@ -9,7 +9,7 @@ PB_MCU_EXT_OSC_HZ = 16000000
 PB_LIB_STM32_HAL = 1
 PB_LIB_LSM6DS3TR_C = 1
 PB_LIB_BLUENRG = 0
-PB_LIB_BTSTACK = 1
+PB_LIB_BTSTACK = lowenergy
 PB_LIB_STM32_USB_DEVICE = 1
 TEXT0_ADDR = 0x8008000
 DFU_VID = 0x0694