From 17cb8f9459e8ba6a45bda5101f6deacfbe5b37c5 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 11 Aug 2015 22:06:30 +0200
Subject: [PATCH] Cli fixes

---
 radio/src/cli.cpp                            |  2 +-
 radio/src/debug.h                            | 12 +++++++++--
 radio/src/main_arm.cpp                       | 21 --------------------
 radio/src/targets/sky9x/board_sky9x.h        |  2 +-
 radio/src/targets/taranis/board_taranis.h    |  2 --
 radio/src/targets/taranis/serial2_driver.cpp |  5 +++++
 6 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index f17ee83bf..f41bb4bff 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -272,7 +272,7 @@ int cliExecLine(char * line)
 void cliTask(void * pdata)
 {
   char line[CLI_COMMAND_MAX_LEN+1];
-  uint8_t pos = 0;
+  int pos = 0;
 
   cliPrompt();
 
diff --git a/radio/src/debug.h b/radio/src/debug.h
index 3ec150d12..422d8b483 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -42,6 +42,14 @@
 #include "dump.h"
 #include "cli.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+uint8_t serial2TracesEnabled();
+#if defined(__cplusplus)
+}
+#endif
+
 #if defined(SIMU)
 typedef void (*traceCallbackFunc)(const char * text);
 extern traceCallbackFunc traceCallback;
@@ -49,9 +57,9 @@ void debugPrintf(const char * format, ...);
 #elif defined(DEBUG) && defined(CLI) && defined(USB_SERIAL)
 #define debugPrintf(...) do { if (cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0)
 #elif defined(DEBUG) && defined(CLI)
-#define debugPrintf(...) do { if (serialTracesEnabled() && cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0)
+#define debugPrintf(...) do { if (serial2TracesEnabled() && cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0)
 #elif defined(DEBUG) && defined(CPUARM)
-#define debugPrintf(...) do { if (serialTracesEnabled()) serialPrintf(__VA_ARGS__); } while(0)
+#define debugPrintf(...) do { if (serial2TracesEnabled()) serialPrintf(__VA_ARGS__); } while(0)
 #else
 #define debugPrintf(...)
 #endif
diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp
index 66b217ca3..d51992404 100644
--- a/radio/src/main_arm.cpp
+++ b/radio/src/main_arm.cpp
@@ -40,24 +40,6 @@ uint8_t currentSpeakerVolume = 255;
 uint8_t requiredSpeakerVolume = 255;
 uint8_t requestScreenshot = false;
 
-
-#if defined(USB_SERIAL)
-
-Fifo<64> cliRxFifo;
-
-void handleCli()
-{
-  uint8_t c;
-
-  while(cliRxFifo.pop(c)) {
-    //send back
-    usbSerialPutc(c);
-    usbSerialPutc('+');
-  }
-
-}
-#endif
-
 void handleUsbConnection()
 {
 #if defined(PCBTARANIS) && !defined(SIMU)
@@ -129,9 +111,6 @@ void perMain()
   handleUsbConnection();
   checkTrainerSettings();
   checkBattery();
-#if defined(USB_SERIAL)
-  handleCli();
-#endif
 
   uint8_t evt = getEvent(false);
   if (evt && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) backlightOn(); // on keypress turn the light on
diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h
index 92ef02035..f26b8d3c4 100644
--- a/radio/src/targets/sky9x/board_sky9x.h
+++ b/radio/src/targets/sky9x/board_sky9x.h
@@ -290,7 +290,7 @@ uint32_t telemetryTransmitPending();
 void telemetryTransmitBuffer(uint8_t * buffer, uint32_t size);
 
 // Second UART driver
-#define serialTracesEnabled()          false
+#define serial2TracesEnabled()          false
 void serial2TelemetryInit(unsigned int protocol);
 bool telemetrySecondPortReceive(uint8_t & data);
 
diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index 1ab9c1410..50c69970c 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -323,8 +323,6 @@ void hapticOff(void);
 
 // Second serial port driver
 #define DEBUG_BAUDRATE                 115200
-extern uint8_t serial2Mode;
-#define serialTracesEnabled()          (serial2Mode == 0)
 void serial2Init(unsigned int mode, unsigned int protocol);
 void serial2Putc(char c);
 #define serial2TelemetryInit(protocol) serial2Init(UART_MODE_TELEMETRY, protocol)
diff --git a/radio/src/targets/taranis/serial2_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp
index 74f2943d2..273c09873 100644
--- a/radio/src/targets/taranis/serial2_driver.cpp
+++ b/radio/src/targets/taranis/serial2_driver.cpp
@@ -113,6 +113,11 @@ void serial2Stop()
   USART_DeInit(SERIAL_USART);
 }
 
+uint8_t serial2TracesEnabled()
+{
+  return (serial2Mode == 0);
+}
+
 #if !defined(SIMU)
 extern "C" void SERIAL_USART_IRQHandler(void)
 {