Merge pull request #1994 from martinbudden/bf_cli_move

Moved serial_cli to fc directory

Makefile

@@ -530,6 +530,7 @@ COMMON_SRC = \
             fc/rc_controls.c \
             fc/rc_curves.c \
             fc/runtime_config.c \
+            fc/serial_cli.c \
             flight/altitudehold.c \
             flight/failsafe.c \
             flight/imu.c \
@@ -541,7 +542,6 @@ COMMON_SRC = \
             io/serial_4way.c \
             io/serial_4way_avrootloader.c \
             io/serial_4way_stk500v2.c \
-            io/serial_cli.c \
             io/statusindicator.c \
             msp/msp_serial.c \
             rx/ibus.c \

src/main/fc/fc_init.c

@@ -69,6 +69,7 @@
 #include "fc/fc_tasks.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
+#include "fc/serial_cli.h"
 
 #include "msp/msp_serial.h"
 
@@ -86,7 +87,6 @@
 #include "io/ledstrip.h"
 #include "io/dashboard.h"
 #include "io/asyncfatfs/asyncfatfs.h"
-#include "io/serial_cli.h"
 #include "io/transponder_ir.h"
 #include "io/osd.h"
 #include "io/displayport_msp.h"

src/main/fc/fc_main.c

@@ -43,6 +43,7 @@
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 #include "fc/runtime_config.h"
+#include "fc/serial_cli.h"
 
 #include "msp/msp_serial.h"
 
@@ -50,7 +51,6 @@
 #include "io/motors.h"
 #include "io/servos.h"
 #include "io/serial.h"
-#include "io/serial_cli.h"
 #include "io/statusindicator.h"
 #include "io/transponder_ir.h"
 #include "io/asyncfatfs/asyncfatfs.h"

src/main/fc/fc_tasks.c

@@ -39,6 +39,7 @@
 #include "fc/fc_main.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
+#include "fc/serial_cli.h"
 
 #include "flight/pid.h"
 #include "flight/altitudehold.h"
@@ -49,7 +50,6 @@
 #include "io/ledstrip.h"
 #include "io/osd.h"
 #include "io/serial.h"
-#include "io/serial_cli.h"
 #include "io/transponder_ir.h"
 #include "io/vtx_smartaudio.h"
 

src/main/fc/serial_cli.c

@@ -69,6 +69,7 @@ uint8_t cliMode = 0;
 #include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
+#include "fc/serial_cli.h"
 
 #include "flight/failsafe.h"
 #include "flight/imu.h"
@@ -85,7 +86,6 @@ uint8_t cliMode = 0;
 #include "io/motors.h"
 #include "io/osd.h"
 #include "io/serial.h"
-#include "io/serial_cli.h"
 #include "io/servos.h"
 #include "io/vtx.h"
 
@@ -3924,8 +3924,7 @@ void cliEnter(serialPort_t *serialPort)
     cliMode = 1;
     cliPort = serialPort;
     setPrintfSerialPort(cliPort);
-    cliWriter = bufWriterInit(cliWriteBuffer, sizeof(cliWriteBuffer),
+    cliWriter = bufWriterInit(cliWriteBuffer, sizeof(cliWriteBuffer), (bufWrite_t)serialWriteBufShim, serialPort);
-                              (bufWrite_t)serialWriteBufShim, serialPort);
 
 #ifndef CLI_MINIMAL_VERBOSITY
     cliPrint("\r\nEntering CLI Mode, type 'exit' to return, or 'help'\r\n");

src/main/fc/serial_cli.h

@@ -22,3 +22,5 @@ extern uint8_t cliMode;
 struct serialConfig_s;
 void cliInit(struct serialConfig_s *serialConfig);
 void cliProcess(void);
+struct serialPort_s;
+void cliEnter(struct serialPort_s *serialPort);

src/main/io/serial.c

@@ -42,6 +42,7 @@
 #endif
 
 #include "io/serial.h"
+#include "fc/serial_cli.h" // for cliEnter()
 
 #include "msp/msp_serial.h"
 
@@ -457,8 +458,6 @@ void waitForSerialPortToFinishTransmitting(serialPort_t *serialPort)
     };
 }
 
-void cliEnter(serialPort_t *serialPort);
-
 void serialEvaluateNonMspData(serialPort_t *serialPort, uint8_t receivedChar)
 {
 #ifndef USE_CLI