andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The Big Refactoring of 2019: console vs TS vs CONSOLE_MODE_SWITCH_PIN vs text protocol #725 

more dead code
This commit is contained in:
rusefi 2019-04-01 12:11:57 -04:00
parent feec03fa24
commit 7e3ff76fff
2 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio.cpp
View File

@ -460,7 +460,7 @@ static bool isKnownCommand(char command) {
|| command == TS_GET_FIRMWARE_VERSION;
}
// this function runs indefinitely
void runBinaryProtocolLoop(ts_channel_s *tsChannel, bool isConsoleRedirect) {
int wasReady = false;

37
firmware/console/console_io.cpp
View File

@ -140,38 +140,8 @@ bool isCommandLineConsoleOverTTL(void) {
static SerialConfig serialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 };
#endif
bool consoleInBinaryMode = false;
void runConsoleLoop(ts_channel_s *console) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
runBinaryProtocolLoop(console, true);
#endif /* EFI_TUNER_STUDIO */
while (true) {
efiAssertVoid(CUSTOM_ERR_6571, getCurrentRemainingStack() > 256, "lowstck#9e");
bool end = getConsoleLine((BaseSequentialStream*) console->channel, console->crcReadBuffer, sizeof(console->crcReadBuffer) - 3);
if (end) {
// firmware simulator is the only case when this happens
continue;
}
char *trimmed = efiTrim(console->crcReadBuffer);
(console_line_callback)(trimmed);
// switch to binary protocol
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
runBinaryProtocolLoop(console, true);
#endif /* EFI_TUNER_STUDIO */
}
}
#if EFI_PROD_CODE || EFI_EGT || defined(__DOXYGEN__)
BaseChannel * getConsoleChannel(void) {
#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__)
return (BaseChannel *) EFI_CONSOLE_UART_DEVICE;
@ -209,8 +179,11 @@ static THD_FUNCTION(consoleThreadThreadEntryPoint, arg) {
binaryConsole.channel = (BaseChannel *) getConsoleChannel();
if (binaryConsole.channel != NULL)
runConsoleLoop(&binaryConsole);
if (binaryConsole.channel != NULL) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
runBinaryProtocolLoop(&binaryConsole, true);
#endif /* EFI_TUNER_STUDIO */
}
}
#endif /* EFI_CONSOLE_NO_THREAD */