FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb console as module

This commit is contained in:
Matthew Kennedy 2024-08-05 11:31:31 -07:00
parent 336fe0ca56
commit e9947693ff
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/console/console.mk
View File

@ -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 \

5
firmware/console/eficonsole.h
View File

@ -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;
};

1
firmware/controllers/modules/modules.mk
View File

@ -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

6
firmware/console/usb_console.cpp → firmware/controllers/modules/usb_console/usb_console.cpp
View File

@ -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

4
firmware/controllers/modules/usb_console/usb_console.mk Normal file
View File

@ -0,0 +1,4 @@
MODULES_CPPSRC += $(PROJECT_DIR)/controllers/modules/usb_console/usb_console.cpp
MODULES_LIST += UsbConsoleModule,
DDEFS += -DMODULE_USB_CONSOLE

7
firmware/rusefi.cpp
View File

@ -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