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

auto-sync

This commit is contained in:
rusEfi 2014-09-26 14:02:56 -05:00
parent 4d29478598
commit 4811563847
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/trigger/trigger_central.cpp
View File

@ -174,7 +174,7 @@ extern engine_configuration2_s * engineConfiguration2;
extern board_configuration_s *boardConfiguration; extern board_configuration_s *boardConfiguration;
#endif #endif
static void triggerShapeInfo() { static void triggerShapeInfo(Engine *engine) {
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
trigger_shape_s *s = &engineConfiguration2->triggerShape; trigger_shape_s *s = &engineConfiguration2->triggerShape;
for (int i = 0; i < s->getSize(); i++) { for (int i = 0; i < s->getSize(); i++) {
@ -183,7 +183,7 @@ static void triggerShapeInfo() {
#endif #endif
} }
static void triggerInfo() { static void triggerInfo(Engine *engine) {
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration->engineType), scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType, engineConfiguration->triggerConfig.triggerType); engineConfiguration->engineType, engineConfiguration->triggerConfig.triggerType);
@ -231,8 +231,8 @@ void initTriggerCentral(Engine *engine) {
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
initLogging(&logger, "ShaftPosition"); initLogging(&logger, "ShaftPosition");
addConsoleAction("triggerinfo", triggerInfo); addConsoleActionP("triggerinfo", (VoidPtr)triggerInfo, engine);
addConsoleAction("triggershapeinfo", triggerShapeInfo); addConsoleActionP("triggershapeinfo", (VoidPtr)triggerShapeInfo, engine);
#endif #endif
#if EFI_HISTOGRAMS #if EFI_HISTOGRAMS

1
firmware/rusefi.cpp
View File

@ -133,6 +133,7 @@ void runRusEfi(void) {
// that's dirty, this assignment should be nicer or in a better spot // that's dirty, this assignment should be nicer or in a better spot
engine.engineConfiguration = engineConfiguration; engine.engineConfiguration = engineConfiguration;
engine.engineConfiguration2 = engineConfiguration2;

2
firmware/util/listener_array.c → firmware/util/listener_array.cpp
View File

@ -1,5 +1,5 @@
/* /*
* listener_array.c * @file listener_array.cpp
* *
* @date Jan 1, 2013 * @date Jan 1, 2013
* @author Andrey Belomutskiy, (c) 2012-2014 * @author Andrey Belomutskiy, (c) 2012-2014

2
firmware/util/util.mk
View File

@ -1,11 +1,11 @@
UTILSRC = $(PROJECT_DIR)/util/data_buffer.c \ UTILSRC = $(PROJECT_DIR)/util/data_buffer.c \
$(PROJECT_DIR)/util/listener_array.c \
$(PROJECT_DIR)/util/crc.c \ $(PROJECT_DIR)/util/crc.c \
$(PROJECT_DIR)/util/histogram.c \ $(PROJECT_DIR)/util/histogram.c \
$(PROJECT_DIR)/util/cli_registry.c $(PROJECT_DIR)/util/cli_registry.c
UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \ UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \
$(PROJECT_DIR)/util/listener_array.cpp \
$(PROJECT_DIR)/util/efilib.cpp \ $(PROJECT_DIR)/util/efilib.cpp \
$(PROJECT_DIR)/util/efilib2.cpp \ $(PROJECT_DIR)/util/efilib2.cpp \
$(PROJECT_DIR)/util/LocalVersionHolder.cpp $(PROJECT_DIR)/util/LocalVersionHolder.cpp