Merge remote-tracking branch 'borisbstyle/development' into sirinfpv-dev

src/main/io/serial_msp.c

@@ -96,9 +96,7 @@
 
 #include "serial_msp.h"
 
-#ifdef USE_SERIAL_4WAY_BLHELI_INTERFACE
 #include "io/serial_4way.h"
-#endif
 
 static serialPort_t *mspSerialPort;
 
@@ -1767,7 +1765,7 @@ static bool processInCommand(void)
         // switch all motor lines HI
         // reply the count of ESC found
         headSerialReply(1);
-        serialize8(Initialize4WayInterface());
+        serialize8(esc4wayInit());
         // because we do not come back after calling Process4WayInterface
         // proceed with a success reply first
         tailSerialReply();
@@ -1778,7 +1776,7 @@ static bool processInCommand(void)
         // rem: App: Wait at least appx. 500 ms for BLHeli to jump into
         // bootloader mode before try to connect any ESC
         // Start to activate here
-        Process4WayInterface(currentPort, writer);
+        esc4wayProcess(currentPort->port);
         // former used MSP uart is still active
         // proceed as usual with MSP commands
         break;