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

development into unit tests, makefile cleanup

This commit is contained in:
rusEfi 2019-11-19 20:05:12 -05:00
parent cdf0ef3109
commit 1991437f77
5 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/Makefile
View File

@ -147,24 +147,23 @@ ifeq ($(USE_FATFS),yes)
include $(PROJECT_DIR)/ext/fatfs.mk include $(PROJECT_DIR)/ext/fatfs.mk
endif endif
include $(PROJECT_DIR)/hw_layer/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
include $(PROJECT_DIR)/development/development.mk
include $(PROJECT_DIR)/util/util.mk
include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk
include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/config/engines/engines.mk
include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/console/console.mk
include $(PROJECT_DIR)/controllers/algo/algo.mk include $(PROJECT_DIR)/controllers/algo/algo.mk
include $(PROJECT_DIR)/controllers/controllers.mk
include $(PROJECT_DIR)/controllers/core/core.mk include $(PROJECT_DIR)/controllers/core/core.mk
include $(PROJECT_DIR)/controllers/math/math.mk include $(PROJECT_DIR)/controllers/math/math.mk
include $(PROJECT_DIR)/controllers/sensors/sensors.mk 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)/development/development.mk
include $(PROJECT_DIR)/hw_layer/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
include $(PROJECT_DIR)/init/init.mk include $(PROJECT_DIR)/init/init.mk
include $(PROJECT_DIR)/util/util.mk
ifeq ($(BOOTLOADERINC),) ifeq ($(BOOTLOADERINC),)
# include default bootloader code # include default bootloader code
@ -301,18 +300,12 @@ INCDIR = $(CHIBIOS)/os/license \
$(HW_LAYER_DRIVERS_INC) \ $(HW_LAYER_DRIVERS_INC) \
$(UTIL_INC) \ $(UTIL_INC) \
init \ init \
development \ $(DEVELOPMENT_DIR) \
development/hw_layer \ development/hw_layer \
development/test \ development/test \
$(CONTROLLERS_INC) \ $(CONTROLLERS_INC) \
controllers/sensors \ controllers/sensors \
controllers/sensors/converters \ controllers/sensors/converters
controllers/system \
controllers/algo \
controllers/core \
controllers/math \
controllers/trigger/decoders \
controllers/trigger
# #
# Project, sources and paths # Project, sources and paths

6
firmware/controllers/controllers.mk
View File

@ -28,6 +28,12 @@ CONTROLLERS_SRC_CPP = \
CONTROLLERS_INC=\ CONTROLLERS_INC=\
$(CONTROLLERS_DIR) \ $(CONTROLLERS_DIR) \
$(CONTROLLERS_DIR)/scheduling \ $(CONTROLLERS_DIR)/scheduling \
$(CONTROLLERS_DIR)/system \
$(CONTROLLERS_DIR)/algo \
$(CONTROLLERS_DIR)/trigger/decoders \
$(CONTROLLERS_DIR)/trigger \
$(CONTROLLERS_DIR)/core \
$(CONTROLLERS_DIR)/math \
$(CONTROLLERS_DIR)/generated \ $(CONTROLLERS_DIR)/generated \
$(CONTROLLERS_DIR)/actuators \ $(CONTROLLERS_DIR)/actuators \

21
firmware/development/development.mk
View File

@ -1,13 +1,14 @@
DEVELOPMENT_DIR=$(PROJECT_DIR)/development
DEV_SRC = development/test/test.c \ DEV_SRC = $(DEVELOPMENT_DIR)/test/test.c \
development/test/testbmk.c $(DEVELOPMENT_DIR)/test/testbmk.c
DEV_SRC_CPP = development/trigger_emulator.cpp \ DEV_SRC_CPP = $(DEVELOPMENT_DIR)/trigger_emulator.cpp \
development/hw_layer/poten.cpp \ $(DEVELOPMENT_DIR)/hw_layer/poten.cpp \
development/sensor_chart.cpp \ $(DEVELOPMENT_DIR)/sensor_chart.cpp \
development/rfi_perftest.cpp \ $(DEVELOPMENT_DIR)/rfi_perftest.cpp \
development/engine_emulator.cpp \ $(DEVELOPMENT_DIR)/engine_emulator.cpp \
$(PROJECT_DIR)/development/engine_sniffer.cpp \ $(DEVELOPMENT_DIR)/engine_sniffer.cpp \
development/wave_analyzer.cpp $(DEVELOPMENT_DIR)/wave_analyzer.cpp
DEV_SIMULATOR_SRC_CPP = $(PROJECT_DIR)/development/engine_sniffer.cpp DEV_SIMULATOR_SRC_CPP = $(DEVELOPMENT_DIR)/engine_sniffer.cpp

23
simulator/Makefile
View File

@ -117,7 +117,8 @@ else
include ${CHIBIOS}/os/hal/ports/simulator/posix/platform.mk include ${CHIBIOS}/os/hal/ports/simulator/posix/platform.mk
endif endif
include $(PROJECT_DIR)/util/util.mk include $(PROJECT_DIR)/console/binary/tunerstudio.mk
include $(PROJECT_DIR)/console/console.mk
include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/config/engines/engines.mk
include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/controllers/controllers.mk
include $(PROJECT_DIR)/controllers/algo/algo.mk include $(PROJECT_DIR)/controllers/algo/algo.mk
@ -126,13 +127,11 @@ include $(PROJECT_DIR)/controllers/math/math.mk
include $(PROJECT_DIR)/controllers/sensors/sensors.mk include $(PROJECT_DIR)/controllers/sensors/sensors.mk
include $(PROJECT_DIR)/controllers/trigger/trigger.mk 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)/init/init.mk
include $(PROJECT_DIR)/console/binary/tunerstudio.mk
include $(PROJECT_DIR)/development/development.mk include $(PROJECT_DIR)/development/development.mk
include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
include $(PROJECT_DIR)/init/init.mk
include $(PROJECT_DIR)/util/util.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
@ -202,16 +201,10 @@ INCDIR = . \
$(PROJECT_DIR)/hw_layer \ $(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/algo \
$(HW_SENSORS_INC) \ $(HW_SENSORS_INC) \
$(CONTROLLERS_INC) \ $(CONTROLLERS_INC) \
$(PROJECT_DIR)/development \ $(DEVELOPMENT_DIR) \
$(PROJECT_DIR)/controllers/algo \ $(PROJECT_DIR)/controllers/sensors \
$(PROJECT_DIR)/controllers/core \ $(PROJECT_DIR)/controllers/sensors/converters \
$(PROJECT_DIR)/controllers/math \
$(PROJECT_DIR)/controllers/sensors \
$(PROJECT_DIR)/controllers/sensors/converters \
$(PROJECT_DIR)/controllers/system \
$(PROJECT_DIR)/controllers/trigger \
$(PROJECT_DIR)/controllers/trigger/decoders \
${CHIBIOS}/os/various \ ${CHIBIOS}/os/various \
$(CHIBIOS)/os/hal/lib/streams \ $(CHIBIOS)/os/hal/lib/streams \
simulator simulator

10
unit_tests/Makefile
View File

@ -89,7 +89,6 @@ PROJECT = rusefi_test
#DDEFS += -D$(PROJECT_BOARD) #DDEFS += -D$(PROJECT_BOARD)
# Imported source files and paths # Imported source files and paths
include $(PROJECT_DIR)/util/util.mk
include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/config/engines/engines.mk
include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/controllers/controllers.mk
include $(PROJECT_DIR)/controllers/algo/algo.mk include $(PROJECT_DIR)/controllers/algo/algo.mk
@ -98,9 +97,11 @@ include $(PROJECT_DIR)/controllers/math/math.mk
include $(PROJECT_DIR)/controllers/system/system.mk include $(PROJECT_DIR)/controllers/system/system.mk
include $(PROJECT_DIR)/controllers/sensors/sensors.mk include $(PROJECT_DIR)/controllers/sensors/sensors.mk
include $(PROJECT_DIR)/controllers/trigger/trigger.mk include $(PROJECT_DIR)/controllers/trigger/trigger.mk
include $(PROJECT_DIR)/development/development.mk
include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
include $(PROJECT_DIR)/util/util.mk
include test.mk include test.mk
include tests/tests.mk include tests/tests.mk
@ -171,12 +172,7 @@ INCDIR = . \
$(PROJECT_DIR)/console \ $(PROJECT_DIR)/console \
$(PROJECT_DIR)/controllers/sensors \ $(PROJECT_DIR)/controllers/sensors \
$(PROJECT_DIR)/controllers/sensors/converters \ $(PROJECT_DIR)/controllers/sensors/converters \
$(PROJECT_DIR)/controllers/algo \ $(DEVELOPMENT_DIR) \
$(PROJECT_DIR)/controllers/core \
$(PROJECT_DIR)/controllers/math \
$(PROJECT_DIR)/controllers/system \
$(PROJECT_DIR)/controllers/trigger \
$(PROJECT_DIR)/controllers/trigger/decoders \
$(PROJECT_DIR)/ext_algo \ $(PROJECT_DIR)/ext_algo \
$(PROJECT_DIR)/hw_layer \ $(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/algo \