From 5ab678298fe155faa90d7b72413f98253a48b991 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 25 Apr 2019 16:02:34 +0200
Subject: [PATCH] Compilation fixes

---
 radio/src/bluetooth.cpp             | 10 +++++-----
 radio/src/cli.cpp                   |  2 +-
 radio/src/targets/horus/board.cpp   |  2 +-
 radio/src/targets/horus/board.h     |  3 +--
 radio/src/targets/taranis/board.cpp |  2 +-
 radio/src/targets/taranis/board.h   |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp
index c8e6bbb13..fabd50159 100644
--- a/radio/src/bluetooth.cpp
+++ b/radio/src/bluetooth.cpp
@@ -292,7 +292,7 @@ void Bluetooth::wakeup(void)
     static tmr10ms_t waitEnd = 0;
     if (state != BLUETOOTH_STATE_IDLE) {
       if (state == BLUETOOTH_INIT) {
-        bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
+        bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE, true);
         char command[32];
         char * cur = strAppend(command, BLUETOOTH_COMMAND_NAME);
         uint8_t len = ZLEN(g_eeGeneral.bluetoothName);
@@ -316,7 +316,7 @@ void Bluetooth::wakeup(void)
             state = BLUETOOTH_STATE_IDLE;
           }
           else {
-            bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE);
+            bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE, true);
             writeString("TTM:BPS-115200");
             state = BLUETOOTH_WAIT_BAUDRATE_CHANGE;
             waitEnd = get_tmr10ms() + 250; // 2.5s
@@ -362,7 +362,7 @@ void Bluetooth::wakeup()
     wakeupTime = now + 10; /* 100ms */
   }
   else if (state == BLUETOOTH_STATE_OFF) {
-    bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE);
+    bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE, true);
     state = BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT;
   }
 
@@ -372,7 +372,7 @@ void Bluetooth::wakeup()
     wakeupTime = now + 10; /* 100ms */
   }
   else if (state == BLUETOOTH_STATE_BAUDRATE_SENT) {
-    bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
+    bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE, true);
     state = BLUETOOTH_STATE_BAUDRATE_INIT;
     readline(false);
     wakeupTime = now + 10; /* 100ms */
@@ -528,7 +528,7 @@ void Bluetooth::flashFirmware(const char * filename)
 
   pausePulses();
 
-  bluetoothInit(BLUETOOTH_BOOTLOADER_BAUDRATE);
+  bluetoothInit(BLUETOOTH_BOOTLOADER_BAUDRATE, true);
   bluetoothDisable();  /* go to bootloader mode */
 
   drawProgressScreen(getBasename(filename), "Bluetooth reset...", 0, 0);
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index c550f50b0..f43dd5eb8 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -1170,7 +1170,7 @@ int cliBlueTooth(const char ** argv)
   }
   else if (toInt(argv, 1, &baudrate) > 0) {
     if (baudrate > 0) {
-      bluetoothInit(baudrate);
+      bluetoothInit(baudrate, true);
       char * line = bluetooth.readline();
       serialPrint("<BT %s", line);
     }
diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index 1ed38bd03..b47d9b29c 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -215,7 +215,7 @@ void boardInit()
   hapticInit();
 
 #if defined(BLUETOOTH)
-  bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
+  bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE, true);
 #endif
 
 #if defined(INTERNAL_GPS)
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index ccd9dd54b..5514fe3c2 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -612,7 +612,7 @@ void serial2Stop(void);
 #define BLUETOOTH_BOOTLOADER_BAUDRATE   230400
 #define BLUETOOTH_FACTORY_BAUDRATE     57600
 #define BLUETOOTH_DEFAULT_BAUDRATE     115200
-void bluetoothInit(uint32_t baudrate, bool enable = true);
+void bluetoothInit(uint32_t baudrate, bool enable);
 void bluetoothWriteWakeup(void);
 uint8_t bluetoothIsWriting(void);
 void bluetoothDisable(void);
@@ -627,5 +627,4 @@ extern DMAFifo<512> telemetryFifo;
 extern DMAFifo<32> serial2RxFifo;
 #endif
 
-
 #endif // _BOARD_HORUS_H_
diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp
index 5026168d4..e0f660259 100644
--- a/radio/src/targets/taranis/board.cpp
+++ b/radio/src/targets/taranis/board.cpp
@@ -167,7 +167,7 @@ void boardInit()
                          BT_RCC_APB2Periph, ENABLE);
 
 #if defined(BLUETOOTH)
-  bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
+  bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE, true);
 #endif
 
 #if !defined(PCBX9E)
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 64ba077e7..8a8c8bb62 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -726,7 +726,7 @@ void serial2Stop(void);
 #else
 #define BLUETOOTH_FACTORY_BAUDRATE      57600
 #endif
-void bluetoothInit(uint32_t baudrate, bool enable = true);
+void bluetoothInit(uint32_t baudrate, bool enable);
 void bluetoothWriteWakeup(void);
 uint8_t bluetoothIsWriting(void);
 void bluetoothDisable(void);