Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-23 05:24:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix for new bus changes

Browse Source
This commit is contained in:
MX
2023-05-29 21:29:13 +03:00
parent 467f3265e0
commit e474b851bf
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/main/lfrfid/helpers/rfid_writer.c
View File

@@ -2,9 +2,7 @@
#include <furi_hal.h> #include <furi_hal.h>
void writer_start() { void writer_start() {
furi_hal_rfid_tim_read(125000, 0.5); furi_hal_rfid_tim_read_start(125000, 0.5);
furi_hal_rfid_pins_read();
furi_hal_rfid_tim_read_start();
// do not ground the antenna // do not ground the antenna
furi_hal_rfid_pin_pull_release(); furi_hal_rfid_pin_pull_release();
@@ -12,14 +10,13 @@ void writer_start() {
void writer_stop() { void writer_stop() {
furi_hal_rfid_tim_read_stop(); furi_hal_rfid_tim_read_stop();
furi_hal_rfid_tim_reset();
furi_hal_rfid_pins_reset(); furi_hal_rfid_pins_reset();
} }
void write_gap(uint32_t gap_time) { 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_delay_us(gap_time * 8);
furi_hal_rfid_tim_read_start(); furi_hal_rfid_tim_read_continue();
} }
void write_bit(T55xxTiming* t55xxtiming, bool value) { void write_bit(T55xxTiming* t55xxtiming, bool value) {

5
firmware/targets/f7/furi_hal/furi_hal_infrared.c
View File

@@ -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) { static void furi_hal_infrared_configure_tim_cmgr2_dma_tx(void) {
LL_DMA_InitTypeDef dma_config = {0}; LL_DMA_InitTypeDef dma_config = {0};
if(infrared_external_output) { if(infrared_external_output) {
dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1); dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1);
} else { } 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.MemoryOrM2MDstAddress = (uint32_t)NULL;
dma_config.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH; 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); furi_hal_gpio_init(&gpio_ext_pa7, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
} else { } else {
furi_hal_gpio_init(&gpio_infrared_tx, GpioModeAnalog, GpioPullDown, GpioSpeedLow); 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_CH1_IRQ, NULL, NULL);
furi_hal_interrupt_set_isr(INFRARED_DMA_CH2_IRQ, NULL, NULL); furi_hal_interrupt_set_isr(INFRARED_DMA_CH2_IRQ, NULL, NULL);