Skip to content

usb console as module #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mck1117 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

usb console as module #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion firmware/console/console.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \


Expand Down
5 changes: 4 additions & 1 deletion firmware/console/eficonsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 1 addition & 0 deletions firmware/controllers/modules/modules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 5 deletions firmware/console/usb_console.cpp → ...llers/modules/usb_console/usb_console.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "pch.h"

#if EFI_USB_SERIAL

#include "usbconsole.h"
#include "thread_controller.h"
#include "tunerstudio.h"
Expand Down Expand Up @@ -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 changes: 4 additions & 0 deletions firmware/controllers/modules/usb_console/usb_console.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MODULES_CPPSRC += $(PROJECT_DIR)/controllers/modules/usb_console/usb_console.cpp
MODULES_LIST += UsbConsoleModule,

DDEFS += -DMODULE_USB_CONSOLE
7 changes: 0 additions & 7 deletions firmware/rusefi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down