Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2019-12-13 12:30:02 +01:00
52 changed files with 10502 additions and 7011 deletions
@@ -24,7 +24,7 @@
Fifo<uint8_t, BT_TX_FIFO_SIZE> btTxFifo;
Fifo<uint8_t, BT_RX_FIFO_SIZE> btRxFifo;
#if defined(PCBX7) || defined(PCBXLITE)
#if defined(BLUETOOTH_PROBE)
volatile uint8_t btChipPresent = 0;
#endif
@@ -117,7 +117,7 @@ extern "C" void BT_USART_IRQHandler(void)
uint8_t byte = USART_ReceiveData(BT_USART);
btRxFifo.push(byte);
TRACE("BT %02X", byte);
#if defined(PCBX7) || defined(PCBXLITE)
#if defined(BLUETOOTH_PROBE)
if (!btChipPresent) {
// This is to differentiate X7 and X7S and X-Lite with/without BT
btChipPresent = 1;
@@ -23,7 +23,12 @@
#include "stamp.h"
#define BOOTLOADER_TITLE " OTX Bootloader - " VERSION
#if LCD_W < 212
#define BOOTLOADER_TITLE " OTX Bootloader - " VERSION
#else
#define BOOTLOADER_TITLE " OpenTX Bootloader - " VERSION
#endif
#define DISPLAY_CHAR_WIDTH (LCD_COLS+4)
#if LCD_W >= 480