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

progress: bringing simulator closer to real code 

only:hellen-honda-k
This commit is contained in:
Andrey 2023-03-05 01:50:51 -05:00
parent bd72aace92
commit 7464275b00
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/Makefile
View File

@ -301,7 +301,7 @@ INCDIR = \
$(PROJECT_DIR)/hw_layer/lcd \ $(PROJECT_DIR)/hw_layer/lcd \
$(PROJECT_DIR)/hw_layer/mass_storage \ $(PROJECT_DIR)/hw_layer/mass_storage \
$(HW_INC) \ $(HW_INC) \
development/hw_layer \ $(PROJECT_DIR)/development/hw_layer \
development/test \ development/test \
$(CHIBIOS_CONTRIB)/os/various $(CHIBIOS_CONTRIB)/os/various
# contrib/os/various must go at the end because it also contains pid.h which conflicts with our pid.h # contrib/os/various must go at the end because it also contains pid.h which conflicts with our pid.h

4
firmware/development/development.mk
View File

@ -9,6 +9,4 @@ DEV_SRC_CPP = $(DEVELOPMENT_DIR)/hw_layer/poten.cpp \
$(DEVELOPMENT_DIR)/engine_emulator.cpp \ $(DEVELOPMENT_DIR)/engine_emulator.cpp \
$(DEVELOPMENT_DIR)/engine_sniffer.cpp \ $(DEVELOPMENT_DIR)/engine_sniffer.cpp \
$(DEVELOPMENT_DIR)/logic_analyzer.cpp \ $(DEVELOPMENT_DIR)/logic_analyzer.cpp \
$(DEVELOPMENT_DIR)/development/perf_trace.cpp $(DEVELOPMENT_DIR)/development/perf_trace.cpp
DEV_SIMULATOR_SRC_CPP = $(DEVELOPMENT_DIR)/engine_sniffer.cpp

5
firmware/development/perf_trace.cpp
View File

@ -45,8 +45,8 @@ static void stopTrace() {
s_nextIdx = 0; s_nextIdx = 0;
} }
static void perfEventImpl(PE event, EPhase phase) static void perfEventImpl(PE event, EPhase phase) {
{ #if EFI_PROD_CODE
// Bail if we aren't allowed to trace // Bail if we aren't allowed to trace
if constexpr (!ENABLE_PERF_TRACE) { if constexpr (!ENABLE_PERF_TRACE) {
return; return;
@ -101,6 +101,7 @@ static void perfEventImpl(PE event, EPhase phase)
} }
entry.Timestamp = timestamp; entry.Timestamp = timestamp;
#endif // EFI_PROD_CODE
} }
void perfEventBegin(PE event) { void perfEventBegin(PE event) {

4
simulator/Makefile
View File

@ -169,11 +169,10 @@ CSRC = $(ALLCSRC) \
# setting. # setting.
CPPSRC = $(ALLCPPSRC) \ CPPSRC = $(ALLCPPSRC) \
$(CHIBIOS)/os/various/cpp_wrappers/ch.cpp \ $(CHIBIOS)/os/various/cpp_wrappers/ch.cpp \
$(PROJECT_DIR)/development/sensor_chart.cpp \
$(HW_LAYER_DRIVERS_CPP) \ $(HW_LAYER_DRIVERS_CPP) \
$(HW_LAYER_DRIVERS_CORE_CPP) \ $(HW_LAYER_DRIVERS_CORE_CPP) \
$(CONSOLE_SRC_CPP) \ $(CONSOLE_SRC_CPP) \
$(DEV_SIMULATOR_SRC_CPP) \ $(DEV_SRC_CPP) \
simulator/rusEfiFunctionalTest.cpp \ simulator/rusEfiFunctionalTest.cpp \
simulator/can/hal_can_lld.cpp \ simulator/can/hal_can_lld.cpp \
simulator/framework.cpp \ simulator/framework.cpp \
@ -192,6 +191,7 @@ INCDIR = . \
$(CHIBIOS)/os/various/cpp_wrappers \ $(CHIBIOS)/os/various/cpp_wrappers \
$(PROJECT_DIR)/hw_layer/drivers/can \ $(PROJECT_DIR)/hw_layer/drivers/can \
${CHIBIOS}/os/various \ ${CHIBIOS}/os/various \
$(PROJECT_DIR)/development/hw_layer \
$(CHIBIOS)/os/hal/lib/streams \ $(CHIBIOS)/os/hal/lib/streams \
$(RUSEFI_LIB_INC) \ $(RUSEFI_LIB_INC) \
simulator/can \ simulator/can \