auto-sync
This commit is contained in:
parent
f3e12db4e8
commit
0c8c7ec120
|
@ -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
|
||||||
|
|
|
@ -3194,7 +3194,7 @@
|
||||||
<name>$PROJ_DIR$\..\util\histogram.h</name>
|
<name>$PROJ_DIR$\..\util\histogram.h</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\util\listener_array.c</name>
|
<name>$PROJ_DIR$\..\util\listener_array.cpp</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\util\listener_array.h</name>
|
<name>$PROJ_DIR$\..\util\listener_array.h</name>
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue