mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
rusEfi
parent
2d280314fa
commit
aa3ed8a24e
|
|
@ -69,7 +69,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -123,7 +122,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -347,7 +345,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -396,7 +393,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -519,7 +515,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -637,7 +632,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -691,7 +685,6 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ include $(PROJECT_DIR)/controllers/sensors/sensors.mk
|
|||
include $(PROJECT_DIR)/controllers/system/system.mk
|
||||
include $(PROJECT_DIR)/controllers/trigger/trigger.mk
|
||||
include $(PROJECT_DIR)/console/console.mk
|
||||
include $(PROJECT_DIR)/console_util/console_util.mk
|
||||
include $(PROJECT_DIR)/util/console_util.mk
|
||||
|
||||
|
||||
# Define linker script file here
|
||||
|
|
@ -198,7 +198,6 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
|
|||
ext \
|
||||
ext_algo \
|
||||
util \
|
||||
console_util \
|
||||
console \
|
||||
console/binary \
|
||||
hw_layer \
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
|
||||
CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/rfiutil.c
|
||||
|
|
@ -372,7 +372,9 @@ void initHardware(Logging *l) {
|
|||
initVehicleSpeed(sharedLogger);
|
||||
#endif
|
||||
|
||||
#if HAL_USE_EXT || defined(__DOXYGEN__)
|
||||
initJoystick(sharedLogger);
|
||||
#endif
|
||||
|
||||
calcFastAdcIndexes();
|
||||
engine->addConfigurationListener(adcConfigListener);
|
||||
|
|
|
|||
|
|
@ -329,7 +329,6 @@
|
|||
<state>$PROJ_DIR$\..\config\engines</state>
|
||||
<state>$PROJ_DIR$\..\config\stm32f4ems</state>
|
||||
<state>$PROJ_DIR$\..\console\binary</state>
|
||||
<state>$PROJ_DIR$\..\console_util</state>
|
||||
<state>$PROJ_DIR$\..\development</state>
|
||||
<state>$PROJ_DIR$\..\development\test</state>
|
||||
<state>$PROJ_DIR$\..\development\hw_layer</state>
|
||||
|
|
@ -2173,15 +2172,6 @@
|
|||
<name>$PROJ_DIR$\..\console\status_loop.h</name>
|
||||
</file>
|
||||
</group>
|
||||
<group>
|
||||
<name>console_util</name>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\console_util\rfiutil.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\console_util\rfiutil.h</name>
|
||||
</file>
|
||||
</group>
|
||||
<group>
|
||||
<name>controllers</name>
|
||||
<group>
|
||||
|
|
@ -2265,7 +2255,7 @@
|
|||
<name>$PROJ_DIR$\..\controllers\algo\main_trigger_callback.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.c</name>
|
||||
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.cpp</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.h</name>
|
||||
|
|
@ -3333,6 +3323,12 @@
|
|||
</group>
|
||||
<group>
|
||||
<name>util</name>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\util\rfiutil.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\util\rfiutil.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\util\cli_registry.cpp</name>
|
||||
</file>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
|
||||
CONSOLEUTILSRC = $(PROJECT_DIR)/rfiutil.c
|
||||
|
|
@ -80,7 +80,7 @@ include $(PROJECT_DIR)/controllers/trigger/trigger.mk
|
|||
include $(PROJECT_DIR)/controllers/system/system.mk
|
||||
include $(PROJECT_DIR)/console/console.mk
|
||||
include $(PROJECT_DIR)/console/binary/tunerstudio.mk
|
||||
include $(PROJECT_DIR)/console_util/console_util.mk
|
||||
include $(PROJECT_DIR)/util/console_util.mk
|
||||
include $(PROJECT_DIR)/development/development.mk
|
||||
|
||||
include $(CHIBIOS)/boards/simulator/board.mk
|
||||
|
|
@ -167,7 +167,6 @@ $(PORTINC) $(KERNINC) $(TESTINC) \
|
|||
$(PROJECT_DIR)/util \
|
||||
$(PROJECT_DIR)/console \
|
||||
$(PROJECT_DIR)/console/binary \
|
||||
$(PROJECT_DIR)/console_util \
|
||||
$(PROJECT_DIR)/config/engines \
|
||||
$(PROJECT_DIR)/ext_algo \
|
||||
$(PROJECT_DIR)/controllers \
|
||||
|
|
|
|||
Loading…
Reference in New Issue