From e33798c2141aca92f6874b792aa4e10720e5c2aa Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 12 Nov 2019 23:38:02 -0500 Subject: [PATCH] looks like this part of refactoring is good? --- firmware/development/wave_analyzer.cpp | 2 +- firmware/hw_layer/digital_input.cpp | 2 +- firmware/hw_layer/digital_input.h | 2 +- firmware/hw_layer/digital_input_exti.cpp | 10 ++++------ firmware/hw_layer/digital_input_exti.h | 2 +- firmware/hw_layer/digital_input_icu.cpp | 2 +- firmware/hw_layer/digital_input_icu.h | 2 +- firmware/hw_layer/vehicle_speed.cpp | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/firmware/development/wave_analyzer.cpp b/firmware/development/wave_analyzer.cpp index b088eca86a..bb74ebdccb 100644 --- a/firmware/development/wave_analyzer.cpp +++ b/firmware/development/wave_analyzer.cpp @@ -117,7 +117,7 @@ static void initWave(const char *name, int index) { if (reader->hw != NULL) { reader->hw->setWidthCallback((VoidInt)(void*) waAnaWidthCallback, (void*) reader); - reader->hw->setPeridoCallback((VoidInt)(void*) waIcuPeriodCallback, (void*) reader); + reader->hw->setPeriodCallback((VoidInt)(void*) waIcuPeriodCallback, (void*) reader); } print("wave%d input on %s\r\n", index, hwPortname(brainPin)); diff --git a/firmware/hw_layer/digital_input.cpp b/firmware/hw_layer/digital_input.cpp index bb855b89f0..dc0550b324 100644 --- a/firmware/hw_layer/digital_input.cpp +++ b/firmware/hw_layer/digital_input.cpp @@ -11,6 +11,6 @@ void digital_input_s::setWidthCallback(VoidInt handler, void *arg) { widthListeners.registerCallback(handler, arg); } -void digital_input_s::setPeridoCallback(VoidInt handler, void *arg) { +void digital_input_s::setPeriodCallback(VoidInt handler, void *arg) { periodListeners.registerCallback(handler, arg); } diff --git a/firmware/hw_layer/digital_input.h b/firmware/hw_layer/digital_input.h index 5bada2b1f4..a428ee4312 100644 --- a/firmware/hw_layer/digital_input.h +++ b/firmware/hw_layer/digital_input.h @@ -23,5 +23,5 @@ typedef struct { // Width/Period names are historically inherited from ICU implementation, todo: migrate to better names, high/low? rise/hall? void setWidthCallback(VoidInt handler, void *arg); - void setPeridoCallback(VoidInt handler, void *arg); + void setPeriodCallback(VoidInt handler, void *arg); } digital_input_s; diff --git a/firmware/hw_layer/digital_input_exti.cpp b/firmware/hw_layer/digital_input_exti.cpp index 72b84f4420..a6df84c4da 100644 --- a/firmware/hw_layer/digital_input_exti.cpp +++ b/firmware/hw_layer/digital_input_exti.cpp @@ -23,23 +23,23 @@ static ioportmask_t ext_used = 0; // EXT is not able to give you the front direction but you could read the pin in the callback. -int efiExtiEnablePin(const char *msg, brain_pin_e brainPin, uint32_t mode, palcallback_t cb, void *cb_data) { +void efiExtiEnablePin(const char *msg, brain_pin_e brainPin, uint32_t mode, palcallback_t cb, void *cb_data) { /* paranoid check, in case of GPIO_UNASSIGNED getHwPort will return NULL * and we will fail on next check */ if (brainPin == GPIO_UNASSIGNED) - return -1; + return; ioportid_t port = getHwPort(msg, brainPin); if (port == NULL) - return -1; + return; int index = getHwPin(msg, brainPin); /* is this index already used? */ if (ext_used & PAL_PORT_BIT(index)) { firmwareError(CUSTOM_ERR_PIN_ALREADY_USED_2, "%s: pin %d: exti index already used", msg, brainPin); - return -1; + return; } ioline_t line = PAL_LINE(port, index); @@ -48,8 +48,6 @@ int efiExtiEnablePin(const char *msg, brain_pin_e brainPin, uint32_t mode, palca /* mark used */ ext_used |= PAL_PORT_BIT(index); - - return 0; } void efiExtiDisablePin(brain_pin_e brainPin) diff --git a/firmware/hw_layer/digital_input_exti.h b/firmware/hw_layer/digital_input_exti.h index 8ad517d805..6ac0de9967 100644 --- a/firmware/hw_layer/digital_input_exti.h +++ b/firmware/hw_layer/digital_input_exti.h @@ -8,6 +8,6 @@ #include "digital_input.h" #if HAL_USE_PAL -int efiExtiEnablePin(const char *msg, brain_pin_e pin, uint32_t mode, palcallback_t cb, void *cb_data); +void efiExtiEnablePin(const char *msg, brain_pin_e pin, uint32_t mode, palcallback_t cb, void *cb_data); void efiExtiDisablePin(brain_pin_e brainPin); #endif /* HAL_USE_PAL */ diff --git a/firmware/hw_layer/digital_input_icu.cpp b/firmware/hw_layer/digital_input_icu.cpp index 36e536e5b5..81b8b33bdb 100644 --- a/firmware/hw_layer/digital_input_icu.cpp +++ b/firmware/hw_layer/digital_input_icu.cpp @@ -233,7 +233,7 @@ digital_input_s * addWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin) { /** * turns pin off and returns digital_input_s back into registeredIcus pool */ -void removeWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin) { +void stopDigitalCapture(const char *msg, brain_pin_e brainPin) { if (brainPin == GPIO_UNASSIGNED) { return; } diff --git a/firmware/hw_layer/digital_input_icu.h b/firmware/hw_layer/digital_input_icu.h index 74cd4b17ba..54d8c0436e 100644 --- a/firmware/hw_layer/digital_input_icu.h +++ b/firmware/hw_layer/digital_input_icu.h @@ -20,7 +20,7 @@ void turnOffCapturePin(brain_pin_e brainPin); digital_input_s *addWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin); void startInputDriver(const char *msg, /*nullable*/digital_input_s *hw, bool isActiveHigh); -void removeWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin); +void stopDigitalCapture(const char *msg, brain_pin_e brainPin); //Nullable ICUDriver * getInputCaptureDriver(const char *msg, brain_pin_e hwPin); diff --git a/firmware/hw_layer/vehicle_speed.cpp b/firmware/hw_layer/vehicle_speed.cpp index ec966694a6..79b02bc53a 100644 --- a/firmware/hw_layer/vehicle_speed.cpp +++ b/firmware/hw_layer/vehicle_speed.cpp @@ -67,7 +67,7 @@ bool hasVehicleSpeedSensor() { } void stopVSSPins(void) { - removeWaveAnalyzerDriver("VSS", activeConfiguration.bc.vehicleSpeedSensorInputPin); + stopDigitalCapture("VSS", activeConfiguration.bc.vehicleSpeedSensorInputPin); } void startVSSPins(void) {