From 1383afb36fd5447af6235a78b07851f3c13a1324 Mon Sep 17 00:00:00 2001 From: Kilrah Date: Mon, 18 Jun 2018 09:42:38 +0200 Subject: [PATCH] Use BT detection on X-Lite too (current prod has no module, preprod has one, future batches unknown) --- radio/src/bluetooth.h | 2 +- radio/src/targets/common/arm/stm32/bluetooth_driver.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/bluetooth.h b/radio/src/bluetooth.h index 0c3d8dddd..f0201e431 100644 --- a/radio/src/bluetooth.h +++ b/radio/src/bluetooth.h @@ -44,7 +44,7 @@ enum BluetoothStates { #define LEN_BLUETOOTH_ADDR 16 -#if defined(PCBX7) +#if (defined(PCBX7) || defined(PCBXLITE)) && !defined(SIMU) extern uint8_t btChipPresent; #define IS_BLUETOOTH_CHIP_PRESENT() (btChipPresent) #else diff --git a/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp b/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp index 7cbf06438..985b7b6f0 100644 --- a/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp +++ b/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp @@ -23,7 +23,7 @@ Fifo btTxFifo; Fifo btRxFifo; -#if defined(PCBX7) +#if defined(PCBX7) || defined(PCBXLITE) uint8_t btChipPresent = 0; #endif @@ -109,9 +109,9 @@ extern "C" void BT_USART_IRQHandler(void) USART_ClearITPendingBit(BT_USART, USART_IT_RXNE); uint8_t byte = USART_ReceiveData(BT_USART); btRxFifo.push(byte); -#if defined(PCBX7) +#if defined(PCBX7) || defined(PCBXLITE) if (!btChipPresent) { - // This is to differentiate X7 and X7S + // This is to differentiate X7 and X7S and X-Lite with/without BT btChipPresent = 1; bluetoothDone(); }