From 97884dc67748fa1077256e1ba56c7ac3f45530ff Mon Sep 17 00:00:00 2001 From: andreika-git Date: Mon, 25 Nov 2019 07:22:27 +0200 Subject: [PATCH] Kinetis: fix ENABLE_PERF_TRACE and trigger_input_comp (#1031) * Kinetis: fix ENABLE_PERF_TRACE * Kinetis: fix trigger_input_comp --- firmware/config/boards/kinetis/board.mk | 2 +- firmware/config/boards/kinetis/chconf.h | 3 +++ firmware/hw_layer/ports/kinetis/hw_ports.mk | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/firmware/config/boards/kinetis/board.mk b/firmware/config/boards/kinetis/board.mk index 2f84d106a7..3819b9f90e 100644 --- a/firmware/config/boards/kinetis/board.mk +++ b/firmware/config/boards/kinetis/board.mk @@ -20,4 +20,4 @@ PLATFORMINC += $(PLATFORMINC_CONTRIB) # Using external ChibiOS-Contrib code for Comparator HAL HALSRC += $(CHIBIOS_CONTRIB)/os/hal/src/hal_comp.c -HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/trigger_input_comp.cpp + diff --git a/firmware/config/boards/kinetis/chconf.h b/firmware/config/boards/kinetis/chconf.h index 4e2c8fe29c..31585d8013 100644 --- a/firmware/config/boards/kinetis/chconf.h +++ b/firmware/config/boards/kinetis/chconf.h @@ -823,6 +823,9 @@ void chDbgPanic3(const char *msg, const char * file, int line); } \ } while (false) +#define ENABLE_PERF_TRACE FALSE +#define TRACE_BUFFER_LENGTH 1 + #endif /* CHCONF_H */ /** @} */ diff --git a/firmware/hw_layer/ports/kinetis/hw_ports.mk b/firmware/hw_layer/ports/kinetis/hw_ports.mk index 29245349f7..7438697eef 100644 --- a/firmware/hw_layer/ports/kinetis/hw_ports.mk +++ b/firmware/hw_layer/ports/kinetis/hw_ports.mk @@ -8,4 +8,5 @@ HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/kinetis/flash.c \ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/kinetis/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/kinetis/kinetis_pins.cpp \ - $(PROJECT_DIR)/hw_layer/ports/kinetis/kinetis_common.cpp + $(PROJECT_DIR)/hw_layer/ports/kinetis/kinetis_common.cpp \ + $(PROJECT_DIR)/hw_layer/trigger_input_comp.cpp