rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better ICU error handling

This commit is contained in:
rusefi 2019-04-07 18:25:46 -04:00
parent f56b9adcd8
commit d94b6d74e7
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/sensors/map.cpp
View File

@ -266,7 +266,7 @@ void initMapDecoder(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if HAL_USE_ICU || defined(__DOXYGEN__) #if HAL_USE_ICU || defined(__DOXYGEN__)
if (engineConfiguration->hasFrequencyReportingMapSensor) { if (engineConfiguration->hasFrequencyReportingMapSensor) {
digital_input_s* digitalMapInput = addWaveAnalyzerDriver("map freq", CONFIGB(frequencyReportingMapInputPin)); digital_input_s* digitalMapInput = addWaveAnalyzerDriver("map freq", CONFIGB(frequencyReportingMapInputPin));
startInputDriver(digitalMapInput, true); startInputDriver("MAP", digitalMapInput, true);
digitalMapInput->widthListeners.registerCallback((VoidInt) digitalMapWidthCallback, NULL); digitalMapInput->widthListeners.registerCallback((VoidInt) digitalMapWidthCallback, NULL);
} }

4
firmware/development/wave_analyzer.cpp
View File

@ -108,7 +108,7 @@ static void waIcuPeriodCallback(WaveReader *reader) {
static void setWaveModeSilent(int index, int mode) { static void setWaveModeSilent(int index, int mode) {
WaveReader *reader = &readers[index]; WaveReader *reader = &readers[index];
startInputDriver(reader->hw, mode); startInputDriver("wave", reader->hw, mode);
} }
//static int getEventCounter(int index) { //static int getEventCounter(int index) {
@ -135,7 +135,7 @@ static void initWave(const char *name, int index) {
} }
print("wave%d input on %s\r\n", index, hwPortname(brainPin)); print("wave%d input on %s\r\n", index, hwPortname(brainPin));
startInputDriver(reader->hw, mode); startInputDriver("wave", reader->hw, mode);
} }
#endif #endif

4
firmware/hw_layer/digital_input_hw.cpp
View File

@ -253,7 +253,7 @@ void removeWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin) {
} }
} }
void startInputDriver(/*nullable*/digital_input_s *hw, bool isActiveHigh) { void startInputDriver(const char *msg, /*nullable*/digital_input_s *hw, bool isActiveHigh) {
if (hw == NULL) { if (hw == NULL) {
// we can get NULL driver if user somehow has invalid pin in his configuration // we can get NULL driver if user somehow has invalid pin in his configuration
warning(CUSTOM_ERR_INVALID_INPUT_ICU_PIN, "s_not input pin"); warning(CUSTOM_ERR_INVALID_INPUT_ICU_PIN, "s_not input pin");
@ -275,7 +275,7 @@ void startInputDriver(/*nullable*/digital_input_s *hw, bool isActiveHigh) {
icuStop(driver); icuStop(driver);
} }
wave_icucfg.channel = getInputCaptureChannel(hw->brainPin); wave_icucfg.channel = getInputCaptureChannel(hw->brainPin);
efiIcuStart(driver, &wave_icucfg); efiIcuStart(msg, driver, &wave_icucfg);
efiAssertVoid(CUSTOM_ERR_6672, driver != NULL, "di: driver is NULL"); efiAssertVoid(CUSTOM_ERR_6672, driver != NULL, "di: driver is NULL");
efiAssertVoid(CUSTOM_ERR_6673, driver->state == ICU_READY, "di: driver not ready"); efiAssertVoid(CUSTOM_ERR_6673, driver->state == ICU_READY, "di: driver not ready");
icuStartCapture(driver); // this would change state from READY to WAITING icuStartCapture(driver); // this would change state from READY to WAITING

2
firmware/hw_layer/digital_input_hw.h
View File

@ -26,7 +26,7 @@ typedef struct {
void turnOnCapturePin(const char *msg, brain_pin_e brainPin); void turnOnCapturePin(const char *msg, brain_pin_e brainPin);
digital_input_s *addWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin); digital_input_s *addWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin);
void startInputDriver(/*nullable*/digital_input_s *hw, bool isActiveHigh); void startInputDriver(const char *msg, /*nullable*/digital_input_s *hw, bool isActiveHigh);
void removeWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin); void removeWaveAnalyzerDriver(const char *msg, brain_pin_e brainPin);
//Nullable //Nullable

11
firmware/hw_layer/io_pins.cpp
View File

@ -78,10 +78,13 @@ iomode_t getInputMode(pin_input_mode_e mode) {
} }
#if HAL_USE_ICU || defined(__DOXYGEN__) #if HAL_USE_ICU || defined(__DOXYGEN__)
void efiIcuStart(ICUDriver *icup, const ICUConfig *config) { void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *config) {
efiAssertVoid(CUSTOM_ERR_6679, (icup->state == ICU_STOP) || (icup->state == ICU_READY), if (icup->state != ICU_STOP && icup->state != ICU_READY) {
"input already used?"); static char icuError[30];
sprintf(icuError, "ICU already used %s", msg);
firmwareError(CUSTOM_ERR_6679, icuError);
return;
}
icuStart(icup, config); icuStart(icup, config);
} }
#endif /* HAL_USE_ICU */ #endif /* HAL_USE_ICU */

2
firmware/hw_layer/io_pins.h
View File

@ -58,7 +58,7 @@ bool efiReadPin(brain_pin_e pin);
iomode_t getInputMode(pin_input_mode_e mode); iomode_t getInputMode(pin_input_mode_e mode);
#if HAL_USE_ICU || defined(__DOXYGEN__) #if HAL_USE_ICU || defined(__DOXYGEN__)
void efiIcuStart(ICUDriver *icup, const ICUConfig *config); void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *config);
#endif /* HAL_USE_ICU */ #endif /* HAL_USE_ICU */
#endif /* EFI_GPIO_HARDWARE */ #endif /* EFI_GPIO_HARDWARE */

2
firmware/hw_layer/trigger_input_icu.cpp
View File

@ -125,7 +125,7 @@ static ICUDriver *turnOnTriggerInputPin(const char *msg, brain_pin_e hwPin, ICUC
// bool needPeriodCallback = !CONFIG(useOnlyRisingEdgeForTrigger) || !TRIGGER_SHAPE(useRiseEdge); // bool needPeriodCallback = !CONFIG(useOnlyRisingEdgeForTrigger) || !TRIGGER_SHAPE(useRiseEdge);
// shaft_icucfg.period_cb = needPeriodCallback ? shaft_icu_period_callback : NULL; // shaft_icucfg.period_cb = needPeriodCallback ? shaft_icu_period_callback : NULL;
efiIcuStart(driver, icucfg); efiIcuStart(msg, driver, icucfg);
if (driver->state == ICU_READY) { if (driver->state == ICU_READY) {
efiAssert(CUSTOM_ERR_ASSERT, driver != NULL, "ti: driver is NULL", NULL); efiAssert(CUSTOM_ERR_ASSERT, driver != NULL, "ti: driver is NULL", NULL);
efiAssert(CUSTOM_ERR_ASSERT, driver->state == ICU_READY, "ti: driver not ready", NULL); efiAssert(CUSTOM_ERR_ASSERT, driver->state == ICU_READY, "ti: driver not ready", NULL);

2
firmware/hw_layer/vehicle_speed.cpp
View File

@ -74,7 +74,7 @@ void startVSSPins(void) {
if (!hasVehicleSpeedSensor()) if (!hasVehicleSpeedSensor())
return; return;
digital_input_s* vehicleSpeedInput = addWaveAnalyzerDriver("VSS", CONFIGB(vehicleSpeedSensorInputPin)); digital_input_s* vehicleSpeedInput = addWaveAnalyzerDriver("VSS", CONFIGB(vehicleSpeedSensorInputPin));
startInputDriver(vehicleSpeedInput, true); startInputDriver("VSS", vehicleSpeedInput, true);
vehicleSpeedInput->widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL); vehicleSpeedInput->widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL);
} }