From e474b851bf027b1c11cf607fc1389d40e83decd9 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 29 May 2023 21:29:13 +0300
Subject: [PATCH] fix for new bus changes

---
 applications/main/lfrfid/helpers/rfid_writer.c   | 9 +++------
 firmware/targets/f7/furi_hal/furi_hal_infrared.c | 5 +++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/applications/main/lfrfid/helpers/rfid_writer.c b/applications/main/lfrfid/helpers/rfid_writer.c
index 7cc6326c4..8125a1b9d 100644
--- a/applications/main/lfrfid/helpers/rfid_writer.c
+++ b/applications/main/lfrfid/helpers/rfid_writer.c
@@ -2,9 +2,7 @@
 #include <furi_hal.h>
 
 void writer_start() {
-    furi_hal_rfid_tim_read(125000, 0.5);
-    furi_hal_rfid_pins_read();
-    furi_hal_rfid_tim_read_start();
+    furi_hal_rfid_tim_read_start(125000, 0.5);
 
     // do not ground the antenna
     furi_hal_rfid_pin_pull_release();
@@ -12,14 +10,13 @@ void writer_start() {
 
 void writer_stop() {
     furi_hal_rfid_tim_read_stop();
-    furi_hal_rfid_tim_reset();
     furi_hal_rfid_pins_reset();
 }
 
 void write_gap(uint32_t gap_time) {
-    furi_hal_rfid_tim_read_stop();
+    furi_hal_rfid_tim_read_pause();
     furi_delay_us(gap_time * 8);
-    furi_hal_rfid_tim_read_start();
+    furi_hal_rfid_tim_read_continue();
 }
 
 void write_bit(T55xxTiming* t55xxtiming, bool value) {
diff --git a/firmware/targets/f7/furi_hal/furi_hal_infrared.c b/firmware/targets/f7/furi_hal/furi_hal_infrared.c
index b2d906923..e6fb69307 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_infrared.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_infrared.c
@@ -386,9 +386,9 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
 static void furi_hal_infrared_configure_tim_cmgr2_dma_tx(void) {
     LL_DMA_InitTypeDef dma_config = {0};
     if(infrared_external_output) {
-    dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1);
+        dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1);
     } else {
-    dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR2);
+        dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR2);
     }
     dma_config.MemoryOrM2MDstAddress = (uint32_t)NULL;
     dma_config.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
@@ -587,6 +587,7 @@ static void furi_hal_infrared_async_tx_free_resources(void) {
         furi_hal_gpio_init(&gpio_ext_pa7, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
     } else {
         furi_hal_gpio_init(&gpio_infrared_tx, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
+    }
     furi_hal_interrupt_set_isr(INFRARED_DMA_CH1_IRQ, NULL, NULL);
     furi_hal_interrupt_set_isr(INFRARED_DMA_CH2_IRQ, NULL, NULL);