From e9947693ff4e9b3b5771f5356fbde44fd57f5b0d Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 5 Aug 2024 11:31:31 -0700 Subject: [PATCH] usb console as module --- firmware/console/console.mk | 1 - firmware/console/eficonsole.h | 5 ++++- firmware/controllers/modules/modules.mk | 1 + .../modules/usb_console}/usb_console.cpp | 6 +----- firmware/controllers/modules/usb_console/usb_console.mk | 4 ++++ firmware/rusefi.cpp | 7 ------- 6 files changed, 10 insertions(+), 14 deletions(-) rename firmware/{console => controllers/modules/usb_console}/usb_console.cpp (94%) create mode 100644 firmware/controllers/modules/usb_console/usb_console.mk diff --git a/firmware/console/console.mk b/firmware/console/console.mk index a700a4fc0f..80ffc5e960 100644 --- a/firmware/console/console.mk +++ b/firmware/console/console.mk @@ -8,7 +8,6 @@ CONSOLE_SRC_CPP = $(CONSOLE_COMMON_SRC_CPP) \ $(PROJECT_DIR)/console/eficonsole.cpp \ $(PROJECT_DIR)/console/connector_uart_dma.cpp \ $(PROJECT_DIR)/console/binary_log/binary_logging.cpp \ - $(PROJECT_DIR)/console/binary_log/usb_console.cpp \ $(PROJECT_DIR)/console/wifi_console.cpp \ diff --git a/firmware/console/eficonsole.h b/firmware/console/eficonsole.h index b37e8ef754..c2692e49db 100644 --- a/firmware/console/eficonsole.h +++ b/firmware/console/eficonsole.h @@ -11,9 +11,12 @@ #include "engine_module.h" void initializeConsole(); -void startUsbConsole(); void startWifiConsole(); +struct UsbConsoleModule final : public EngineModule { + void initNoConfiguration() override; +}; + struct EthernetConsoleModule final : public EngineModule { void initNoConfiguration() override; }; diff --git a/firmware/controllers/modules/modules.mk b/firmware/controllers/modules/modules.mk index d643605015..1cde6e764d 100644 --- a/firmware/controllers/modules/modules.mk +++ b/firmware/controllers/modules/modules.mk @@ -2,3 +2,4 @@ include $(PROJECT_DIR)/controllers/modules/fan/fan.mk include $(PROJECT_DIR)/controllers/modules/fuel_pump/fuel_pump.mk include $(PROJECT_DIR)/controllers/modules/gear_detector/gear_detector.mk include $(PROJECT_DIR)/controllers/modules/trip_odometer/trip_odometer.mk +include $(PROJECT_DIR)/controllers/modules/usb_console/usb_console.mk diff --git a/firmware/console/usb_console.cpp b/firmware/controllers/modules/usb_console/usb_console.cpp similarity index 94% rename from firmware/console/usb_console.cpp rename to firmware/controllers/modules/usb_console/usb_console.cpp index b8048f9405..41b790ca0a 100644 --- a/firmware/console/usb_console.cpp +++ b/firmware/controllers/modules/usb_console/usb_console.cpp @@ -1,7 +1,5 @@ #include "pch.h" -#if EFI_USB_SERIAL - #include "usbconsole.h" #include "thread_controller.h" #include "tunerstudio.h" @@ -50,8 +48,6 @@ struct UsbThread : public TunerstudioThread { static CCM_OPTIONAL UsbThread usbConsole; -void startUsbConsole() { +void UsbConsoleModule::initNoConfiguration() { usbConsole.start(); } - -#endif // EFI_USB_SERIAL diff --git a/firmware/controllers/modules/usb_console/usb_console.mk b/firmware/controllers/modules/usb_console/usb_console.mk new file mode 100644 index 0000000000..60066e4ac6 --- /dev/null +++ b/firmware/controllers/modules/usb_console/usb_console.mk @@ -0,0 +1,4 @@ +MODULES_CPPSRC += $(PROJECT_DIR)/controllers/modules/usb_console/usb_console.cpp +MODULES_LIST += UsbConsoleModule, + +DDEFS += -DMODULE_USB_CONSOLE diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index b57dcd7d37..9c11680fcf 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -209,17 +209,10 @@ void runRusEfi() { m.initNoConfiguration(); }); -#if EFI_USB_SERIAL - startUsbConsole(); -#endif - #if HAL_USE_USB_MSD initUsbMsd(); #endif - /** - * Next we should initialize serial port console, it's important to know what's going on - */ initializeConsole(); // Read configuration from flash memory