Skip to content

Commit 3a84724

Browse files
committed
Merge remote-tracking branch 'OFW/gornek/fix_iso15_emulation' into dev
2 parents d61931e + 42d3876 commit 3a84724

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/signal_reader/signal_reader.c

+3
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ void signal_reader_start(SignalReader* instance, SignalReaderCallback callback,
228228
/* We need the EXTI to be configured as interrupt generating line, but no ISR registered */
229229
furi_hal_gpio_init(
230230
instance->pin, GpioModeInterruptRiseFall, instance->pull, GpioSpeedVeryHigh);
231+
furi_hal_gpio_enable_int_callback(instance->pin);
231232

232233
/* Set DMAMUX request generation signal ID on specified DMAMUX channel */
233234
LL_DMAMUX_SetRequestSignalID(
@@ -309,6 +310,8 @@ void signal_reader_stop(SignalReader* instance) {
309310

310311
furi_hal_interrupt_set_isr(SIGNAL_READER_DMA_GPIO_IRQ, NULL, NULL);
311312

313+
furi_hal_gpio_disable_int_callback(instance->pin);
314+
312315
// Deinit DMA Rx pin
313316
LL_DMA_DeInit(SIGNAL_READER_DMA_GPIO_DEF);
314317
// Deinit DMA Sync timer

targets/f7/furi_hal/furi_hal_gpio.c

+2-5
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,8 @@ void furi_hal_gpio_enable_int_callback(const GpioPin* gpio) {
215215

216216
FURI_CRITICAL_ENTER();
217217

218-
uint8_t pin_num = furi_hal_gpio_get_pin_num(gpio);
219-
if(gpio_interrupt[pin_num].callback) {
220-
const uint32_t exti_line = GET_EXTI_LINE(gpio->pin);
221-
LL_EXTI_EnableIT_0_31(exti_line);
222-
}
218+
const uint32_t exti_line = GET_EXTI_LINE(gpio->pin);
219+
LL_EXTI_EnableIT_0_31(exti_line);
223220

224221
FURI_CRITICAL_EXIT();
225222
}

0 commit comments

Comments
 (0)