From 58ce937321cb259714fbdf38335df174d4c221ad Mon Sep 17 00:00:00 2001 From: SG Date: Sun, 12 Dec 2021 21:03:39 +1000 Subject: [FL-1891] Release 0.42 bugfixes (#891) * Fixed the "ibutton can only emulate after reading" bug * Fixed previous fix. FIXES FOR THE FIX GOD! BUGS FOR THE BUG THRONE! * Fixed "Repeat code" position on code input screen * Changed CAME protocol icon * Brewfile: add imagemagick missing assets compiler dependency * Correct fix for "Repeat code" position on code input screen Co-authored-by: Aleksandr Kutuzov --- firmware/targets/f6/furi-hal/furi-hal-rfid.c | 8 ++++++++ firmware/targets/f7/furi-hal/furi-hal-rfid.c | 8 ++++++++ firmware/targets/furi-hal-include/furi-hal-rfid.h | 8 ++++++++ 3 files changed, 24 insertions(+) (limited to 'firmware') diff --git a/firmware/targets/f6/furi-hal/furi-hal-rfid.c b/firmware/targets/f6/furi-hal/furi-hal-rfid.c index d7092f88..c14d48fd 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-rfid.c +++ b/firmware/targets/f6/furi-hal/furi-hal-rfid.c @@ -61,6 +61,14 @@ void furi_hal_rfid_pins_read() { hal_gpio_init(&gpio_rfid_data_in, GpioModeAnalog, GpioPullNo, GpioSpeedLow); } +void furi_hal_rfid_pin_pull_release() { + hal_gpio_write(&gpio_rfid_pull, true); +} + +void furi_hal_rfid_pin_pull_pulldown() { + hal_gpio_write(&gpio_rfid_pull, false); +} + void furi_hal_rfid_tim_read(float freq, float duty_cycle) { // TODO LL init uint32_t period = (uint32_t)((SystemCoreClock) / freq) - 1; diff --git a/firmware/targets/f7/furi-hal/furi-hal-rfid.c b/firmware/targets/f7/furi-hal/furi-hal-rfid.c index 02a82bd1..b4b5af50 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-rfid.c +++ b/firmware/targets/f7/furi-hal/furi-hal-rfid.c @@ -66,6 +66,14 @@ void furi_hal_rfid_pins_read() { hal_gpio_init(&gpio_rfid_data_in, GpioModeAnalog, GpioPullNo, GpioSpeedLow); } +void furi_hal_rfid_pin_pull_release() { + hal_gpio_write(&gpio_rfid_pull, true); +} + +void furi_hal_rfid_pin_pull_pulldown() { + hal_gpio_write(&gpio_rfid_pull, false); +} + void furi_hal_rfid_tim_read(float freq, float duty_cycle) { // TODO LL init uint32_t period = (uint32_t)((SystemCoreClock) / freq) - 1; diff --git a/firmware/targets/furi-hal-include/furi-hal-rfid.h b/firmware/targets/furi-hal-include/furi-hal-rfid.h index 5e11c6d6..68ac18c1 100644 --- a/firmware/targets/furi-hal-include/furi-hal-rfid.h +++ b/firmware/targets/furi-hal-include/furi-hal-rfid.h @@ -29,6 +29,14 @@ void furi_hal_rfid_pins_emulate(); */ void furi_hal_rfid_pins_read(); +/** Release rfid pull pin + */ +void furi_hal_rfid_pin_pull_release(); + +/** Pulldown rfid pull pin + */ +void furi_hal_rfid_pin_pull_pulldown(); + /** Config rfid timer to read state * * @param freq timer frequency -- cgit v1.2.3