vss_exti untested
This commit is contained in:
parent
45ce812a0f
commit
068f21c616
|
@ -6,7 +6,8 @@ export EXTRA_PARAMS="-DDUMMY \
|
||||||
-DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \
|
-DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \
|
||||||
-DSHORT_BOARD_NAME=frankenso_na6 \
|
-DSHORT_BOARD_NAME=frankenso_na6 \
|
||||||
-DHAL_TRIGGER_USE_PAL=TRUE \
|
-DHAL_TRIGGER_USE_PAL=TRUE \
|
||||||
-DEFI_VEHICLE_SPEED=FALSE \
|
-DHAL_VSS_USE_PAL=TRUE \
|
||||||
|
-DEFI_ICU_INPUTS=FALSE \
|
||||||
-DHAL_USE_ICU=FALSE \
|
-DHAL_USE_ICU=FALSE \
|
||||||
-DEFI_LOGIC_ANALYZER=FALSE \
|
-DEFI_LOGIC_ANALYZER=FALSE \
|
||||||
-DFIRMWARE_ID=\\\"frankensoNA6\\\""
|
-DFIRMWARE_ID=\\\"frankensoNA6\\\""
|
||||||
|
|
|
@ -110,6 +110,10 @@
|
||||||
#define HAL_TRIGGER_USE_PAL FALSE
|
#define HAL_TRIGGER_USE_PAL FALSE
|
||||||
#endif /* HAL_TRIGGER_USE_PAL */
|
#endif /* HAL_TRIGGER_USE_PAL */
|
||||||
|
|
||||||
|
#ifndef HAL_TRIGGER_USE_PAL
|
||||||
|
#define HAL_TRIGGER_USE_PAL FALSE
|
||||||
|
#endif /* HAL_TRIGGER_USE_PAL */
|
||||||
|
|
||||||
// TunerStudio support.
|
// TunerStudio support.
|
||||||
#define EFI_TUNER_STUDIO TRUE
|
#define EFI_TUNER_STUDIO TRUE
|
||||||
#define EFI_TUNER_STUDIO_VERBOSE TRUE // Debugging output
|
#define EFI_TUNER_STUDIO_VERBOSE TRUE // Debugging output
|
||||||
|
|
|
@ -73,6 +73,10 @@
|
||||||
#define HAL_TRIGGER_USE_PAL FALSE
|
#define HAL_TRIGGER_USE_PAL FALSE
|
||||||
#endif /* HAL_TRIGGER_USE_PAL */
|
#endif /* HAL_TRIGGER_USE_PAL */
|
||||||
|
|
||||||
|
#ifndef HAL_VSS_USE_PAL
|
||||||
|
#define HAL_VSS_USE_PAL FALSE
|
||||||
|
#endif /* HAL_VSS_USE_PAL */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TunerStudio support.
|
* TunerStudio support.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "digital_input_icu.h"
|
#include "digital_input_icu.h"
|
||||||
|
#include "digital_input_exti.h"
|
||||||
#include "pin_repository.h"
|
#include "pin_repository.h"
|
||||||
#include "can_vss.h"
|
#include "can_vss.h"
|
||||||
|
|
||||||
|
@ -70,17 +71,34 @@ bool hasVehicleSpeedSensor() {
|
||||||
return CONFIG(vehicleSpeedSensorInputPin) != GPIO_UNASSIGNED;
|
return CONFIG(vehicleSpeedSensorInputPin) != GPIO_UNASSIGNED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if HAL_VSS_USE_PAL
|
||||||
|
static void vsExtiCallback(void *) {
|
||||||
|
vsAnaWidthCallback();
|
||||||
|
}
|
||||||
|
#endif /* HAL_VSS_USE_PAL */
|
||||||
|
|
||||||
void stopVSSPins(void) {
|
void stopVSSPins(void) {
|
||||||
|
#if HAL_VSS_USE_PAL
|
||||||
|
efiExtiDisablePin(activeConfiguration.vehicleSpeedSensorInputPin);
|
||||||
|
#elif HAL_USE_ICU
|
||||||
stopDigitalCapture("VSS", activeConfiguration.vehicleSpeedSensorInputPin);
|
stopDigitalCapture("VSS", activeConfiguration.vehicleSpeedSensorInputPin);
|
||||||
|
#endif /* HAL_VSS_USE_PAL, HAL_USE_ICU */
|
||||||
}
|
}
|
||||||
|
|
||||||
void startVSSPins(void) {
|
void startVSSPins(void) {
|
||||||
if (!hasVehicleSpeedSensor())
|
if (!hasVehicleSpeedSensor())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
#if HAL_VSS_USE_PAL
|
||||||
|
ioline_t pal_line = PAL_LINE(getHwPort("vss", CONFIG(vehicleSpeedSensorInputPin)), getHwPin("vss", CONFIG(vehicleSpeedSensorInputPin)));
|
||||||
|
efiExtiEnablePin("VSS", CONFIG(vehicleSpeedSensorInputPin), PAL_EVENT_MODE_BOTH_EDGES, vsExtiCallback, (void *)pal_line);
|
||||||
|
#elif HAL_USE_ICU
|
||||||
digital_input_s* vehicleSpeedInput = startDigitalCapture("VSS", CONFIG(vehicleSpeedSensorInputPin));
|
digital_input_s* vehicleSpeedInput = startDigitalCapture("VSS", CONFIG(vehicleSpeedSensorInputPin));
|
||||||
|
|
||||||
vehicleSpeedInput->widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL);
|
vehicleSpeedInput->widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL);
|
||||||
|
#else
|
||||||
|
#error "HAL_USE_ICU or HAL_VSS_USE_PAL should be enabled to use EFI_VEHICLE_SPEED"
|
||||||
|
#endif /* HAL_VSS_USE_PAL, HAL_USE_ICU */
|
||||||
}
|
}
|
||||||
|
|
||||||
void initVehicleSpeed(Logging *l) {
|
void initVehicleSpeed(Logging *l) {
|
||||||
|
|
|
@ -110,6 +110,10 @@
|
||||||
#define HAL_TRIGGER_USE_PAL FALSE
|
#define HAL_TRIGGER_USE_PAL FALSE
|
||||||
#endif /* HAL_TRIGGER_USE_PAL */
|
#endif /* HAL_TRIGGER_USE_PAL */
|
||||||
|
|
||||||
|
#ifndef HAL_VSS_USE_PAL
|
||||||
|
#define HAL_VSS_USE_PAL FALSE
|
||||||
|
#endif /* HAL_VSS_USE_PAL */
|
||||||
|
|
||||||
#define EFI_UART_GPS FALSE
|
#define EFI_UART_GPS FALSE
|
||||||
#define EFI_HAS_RESET FALSE
|
#define EFI_HAS_RESET FALSE
|
||||||
#define EXTREME_TERM_LOGGING FALSE
|
#define EXTREME_TERM_LOGGING FALSE
|
||||||
|
|
Loading…
Reference in New Issue