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

trigger_input_icu, EFI_ENABLE_MOCK_ADC, HALINC_CONTRIB (#724) 

* trigger_input_icu.cpp

* EFI_ENABLE_MOCK_ADC

* $(HALINC_CONTRIB)
This commit is contained in:
andreika-git 2019-04-01 00:15:32 +03:00 committed by rusefi
parent 372eb51f37
commit 8a13bab7d9
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/Makefile
View File

@ -258,6 +258,7 @@ INCDIR = $(CHIBIOS)/os/license \
$(TESTINC) \
$(STARTUPINC) \
$(HALINC) \
$(HALINC_CONTRIB) \
$(PLATFORMINC) \
$(BOARDINC) \
$(BOOTLOADERINC) \

4
firmware/controllers/settings.cpp
View File

@ -1141,7 +1141,7 @@ typedef struct {
} command_f_s;
const command_f_s commandsF[] = {
#if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || defined(__DOXYGEN__)
#if (EFI_ENGINE_CONTROL && EFI_ENABLE_MOCK_ADC) || defined(__DOXYGEN__)
{"mock_iat_voltage", setMockIatVoltage},
{"mock_pedal_position", setMockPedalPosition},
{"mock_maf_voltage", setMockMafVoltage},
@ -1150,7 +1150,7 @@ const command_f_s commandsF[] = {
{"mock_map_voltage", setMockMapVoltage},
{"mock_vbatt_voltage", setMockVBattVoltage},
{"mock_clt_voltage", setMockCltVoltage},
#endif
#endif /* EFI_ENGINE_CONTROL && EFI_ENABLE_MOCK_ADC */
{"fsio_curve_1_value", setFsioCurve1Value},
{"fsio_curve_2_value", setFsioCurve2Value},
{"ignition_offset", setIgnitionOffset},

2
firmware/hw_layer/hw_layer.mk
View File

@ -21,7 +21,7 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
$(PROJECT_DIR)/hw_layer/adc_inputs.cpp \
$(PROJECT_DIR)/hw_layer/board_test.cpp \
$(PROJECT_DIR)/hw_layer/pwm_generator.cpp \
$(PROJECT_DIR)/hw_layer/trigger_input.cpp \
$(PROJECT_DIR)/hw_layer/trigger_input_icu.cpp \
$(PROJECT_DIR)/hw_layer/hip9011.cpp \
$(PROJECT_DIR)/hw_layer/hip9011_logic.cpp \
$(PROJECT_DIR)/hw_layer/vehicle_speed.cpp \

8
firmware/hw_layer/trigger_input.cpp → firmware/hw_layer/trigger_input_icu.cpp
View File

@ -1,6 +1,6 @@
/**
* @file trigger_input.cpp
* @brief Position sensor hardware layer
* @file trigger_input_icu.cpp
* @brief Position sensor hardware layer (ICU driver)
*
* todo: code reuse with digital_input_hw.cpp was never finished
* todo: at the moment due to half-done code reuse we already depend on EFI_ICU_INPUTS but still have custom code
@ -14,7 +14,7 @@
#include "global.h"
#if (EFI_SHAFT_POSITION_INPUT && EFI_PROD_CODE) || defined(__DOXYGEN__)
#if (EFI_SHAFT_POSITION_INPUT && HAL_USE_ICU) || defined(__DOXYGEN__)
#include "trigger_input.h"
#include "digital_input_hw.h"
@ -193,4 +193,4 @@ void applyNewTriggerInputPins(void) {
rememberPrimaryChannel();
}
#endif /* EFI_SHAFT_POSITION_INPUT && EFI_PROD_CODE */
#endif /* EFI_SHAFT_POSITION_INPUT && HAL_USE_ICU */