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

auto-sync

This commit is contained in:
rusEfi 2016-02-11 16:03:16 -05:00
parent 2d280314fa
commit aa3ed8a24e
9 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/.cproject
View File

@ -69,7 +69,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
@ -123,7 +122,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
@ -347,7 +345,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
@ -396,7 +393,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
@ -519,7 +515,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
@ -637,7 +632,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
@ -691,7 +685,6 @@
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../console_util&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development&quot;"/> <listOptionValue builtIn="false" value="&quot;../development&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>

3
firmware/Makefile
View File

@ -112,7 +112,7 @@ include $(PROJECT_DIR)/controllers/sensors/sensors.mk
include $(PROJECT_DIR)/controllers/system/system.mk include $(PROJECT_DIR)/controllers/system/system.mk
include $(PROJECT_DIR)/controllers/trigger/trigger.mk include $(PROJECT_DIR)/controllers/trigger/trigger.mk
include $(PROJECT_DIR)/console/console.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 # Define linker script file here
@ -198,7 +198,6 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
ext \ ext \
ext_algo \ ext_algo \
util \ util \
console_util \
console \ console \
console/binary \ console/binary \
hw_layer \ hw_layer \

2
firmware/console_util/console_util.mk
View File

@ -1,2 +0,0 @@
CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/rfiutil.c

2
firmware/hw_layer/hardware.cpp
View File

@ -372,7 +372,9 @@ void initHardware(Logging *l) {
initVehicleSpeed(sharedLogger); initVehicleSpeed(sharedLogger);
#endif #endif
#if HAL_USE_EXT || defined(__DOXYGEN__)
initJoystick(sharedLogger); initJoystick(sharedLogger);
#endif
calcFastAdcIndexes(); calcFastAdcIndexes();
engine->addConfigurationListener(adcConfigListener); engine->addConfigurationListener(adcConfigListener);

18
firmware/iar/ch.ewp
View File

@ -329,7 +329,6 @@
<state>$PROJ_DIR$\..\config\engines</state> <state>$PROJ_DIR$\..\config\engines</state>
<state>$PROJ_DIR$\..\config\stm32f4ems</state> <state>$PROJ_DIR$\..\config\stm32f4ems</state>
<state>$PROJ_DIR$\..\console\binary</state> <state>$PROJ_DIR$\..\console\binary</state>
<state>$PROJ_DIR$\..\console_util</state>
<state>$PROJ_DIR$\..\development</state> <state>$PROJ_DIR$\..\development</state>
<state>$PROJ_DIR$\..\development\test</state> <state>$PROJ_DIR$\..\development\test</state>
<state>$PROJ_DIR$\..\development\hw_layer</state> <state>$PROJ_DIR$\..\development\hw_layer</state>
@ -2173,15 +2172,6 @@
<name>$PROJ_DIR$\..\console\status_loop.h</name> <name>$PROJ_DIR$\..\console\status_loop.h</name>
</file> </file>
</group> </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> <group>
<name>controllers</name> <name>controllers</name>
<group> <group>
@ -2265,7 +2255,7 @@
<name>$PROJ_DIR$\..\controllers\algo\main_trigger_callback.h</name> <name>$PROJ_DIR$\..\controllers\algo\main_trigger_callback.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.c</name> <name>$PROJ_DIR$\..\controllers\algo\malfunction_central.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.h</name> <name>$PROJ_DIR$\..\controllers\algo\malfunction_central.h</name>
@ -3333,6 +3323,12 @@
</group> </group>
<group> <group>
<name>util</name> <name>util</name>
<file>
<name>$PROJ_DIR$\..\util\rfiutil.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\util\rfiutil.h</name>
</file>
<file> <file>
<name>$PROJ_DIR$\..\util\cli_registry.cpp</name> <name>$PROJ_DIR$\..\util\cli_registry.cpp</name>
</file> </file>

2
firmware/util/console_util.mk Normal file
View File

@ -0,0 +1,2 @@
CONSOLEUTILSRC = $(PROJECT_DIR)/rfiutil.c

0
firmware/console_util/rfiutil.c → firmware/util/rfiutil.c
View File

0
firmware/console_util/rfiutil.h → firmware/util/rfiutil.h
View File

3
win32_functional_tests/Makefile
View File

@ -80,7 +80,7 @@ include $(PROJECT_DIR)/controllers/trigger/trigger.mk
include $(PROJECT_DIR)/controllers/system/system.mk include $(PROJECT_DIR)/controllers/system/system.mk
include $(PROJECT_DIR)/console/console.mk include $(PROJECT_DIR)/console/console.mk
include $(PROJECT_DIR)/console/binary/tunerstudio.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 $(PROJECT_DIR)/development/development.mk
include $(CHIBIOS)/boards/simulator/board.mk include $(CHIBIOS)/boards/simulator/board.mk
@ -167,7 +167,6 @@ $(PORTINC) $(KERNINC) $(TESTINC) \
$(PROJECT_DIR)/util \ $(PROJECT_DIR)/util \
$(PROJECT_DIR)/console \ $(PROJECT_DIR)/console \
$(PROJECT_DIR)/console/binary \ $(PROJECT_DIR)/console/binary \
$(PROJECT_DIR)/console_util \
$(PROJECT_DIR)/config/engines \ $(PROJECT_DIR)/config/engines \
$(PROJECT_DIR)/ext_algo \ $(PROJECT_DIR)/ext_algo \
$(PROJECT_DIR)/controllers \ $(PROJECT_DIR)/controllers \