progress: bringing simulator closer to real code

only:hellen-honda-k

firmware/Makefile

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

firmware/development/development.mk

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

firmware/development/perf_trace.cpp

@@ -45,8 +45,8 @@ static void stopTrace() {
 	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
 	if constexpr (!ENABLE_PERF_TRACE) {
 		return;
@@ -101,6 +101,7 @@ static void perfEventImpl(PE event, EPhase phase)
 	}
 
 	entry.Timestamp = timestamp;
+#endif // EFI_PROD_CODE
 }
 
 void perfEventBegin(PE event) {

simulator/Makefile

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