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

Migrate to Chibios 18 stable #631 

removing unused ChibiOS references
This commit is contained in:
rusefi 2019-02-03 21:19:26 -05:00
parent 7c9d05a098
commit 14289f3686
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unit_tests/Makefile
View File

@ -4,16 +4,6 @@
# #
PROJECT_DIR = ../firmware PROJECT_DIR = ../firmware
CHIBIOS=$(PROJECT_DIR)/ChibiOS4
STREAMSFILE = $(CHIBIOS)/os/hal/include/hal_streams.h
ifeq ("$(wildcard $(STREAMSFILE))","")
$(info Invoking "git submodule update --init")
$(shell git submodule update --init)
$(info Invoked "git submodule update --init")
# make is not happy about newly checked out module for some reason but next invocation would work
$(error Please run 'make' again)
endif
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
@ -162,13 +152,9 @@ INCDIR = . \
$(PROJECT_DIR)/controllers/trigger \ $(PROJECT_DIR)/controllers/trigger \
$(PROJECT_DIR)/controllers/trigger/decoders \ $(PROJECT_DIR)/controllers/trigger/decoders \
$(PROJECT_DIR)/ext_algo \ $(PROJECT_DIR)/ext_algo \
$(CHIBIOS)/os/rt/include \
$(CHIBIOS)/os/rt/various \
$(CHIBIOS)/os/hal/lib/streams \
$(CHIBIOS)/os/hal/include \
$(PROJECT_DIR)/hw_layer \ $(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/algo \
$(PROJECT_DIR)/hw_layer/sensors/ \ $(PROJECT_DIR)/hw_layer/sensors/ \
test_data_structures \ test_data_structures \
googletest/googlemock/include \ googletest/googlemock/include \
googletest/googletest \ googletest/googletest \

6
unit_tests/main.cpp
View File

@ -22,11 +22,6 @@
#include "engine_test_helper.h" #include "engine_test_helper.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
typedef int32_t msg_t;
#include "hal_streams.h"
#include "memstreams.h"
int timeNowUs = 0; int timeNowUs = 0;
efitimeus_t getTimeNowUs(void) { efitimeus_t getTimeNowUs(void) {
@ -44,6 +39,7 @@ extern int revolutionCounterSinceBootForUnitTest;
int getRevolutionCounter(void) { int getRevolutionCounter(void) {
return revolutionCounterSinceBootForUnitTest; return revolutionCounterSinceBootForUnitTest;
} }
extern bool printTriggerDebug; extern bool printTriggerDebug;
GTEST_API_ int main(int argc, char **argv) { GTEST_API_ int main(int argc, char **argv) {