[FL-2393][FL-2381] iButton, OneWire: move to plain C (#1068)
* iButton: getting started on the worker concept * Hal delay: added global instructions_per_us variable * iButton: one wire slave * iButton: ibutton key setter * iButton: one wire host, use ibutton_hal * iButton\RFID: common pulse decoder concept * iButton: cyfral decoder * iButton: worker thread concept * iButton: metakom decoder * iButton: write key through worker * iButton: worker mode holder * iButton: worker improvements * iButton: Cyfral encoder * iButton: Metakom encoder * lib: pulse protocol helpers * iButton: Metakom decoder * iButton: Cyfral decoder * iButton worker: separate modes * iButton: libs documentation * HAL: iButton gpio modes * iButton worker: rename modes file * iButton worker, hal: move to LL * iButton CLI: worker for reading and emulation commands * iButton HAL: correct init and emulation sequence * iButton cli: moved to plain C * iButton: move to worker, small step to plain C * Libs, one wire: move to plain C * Libs: added forgotten files to compilation * iButton writer: get rid of manual disable/enable irq
This commit is contained in:
		| @@ -4,20 +4,19 @@ | ||||
| #include <cmsis_os2.h> | ||||
|  | ||||
| #define TAG "FuriHalDelay" | ||||
|  | ||||
| static uint32_t clk_per_microsecond; | ||||
| uint32_t instructions_per_us; | ||||
|  | ||||
| void furi_hal_delay_init(void) { | ||||
|     CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk; | ||||
|     DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; | ||||
|     DWT->CYCCNT = 0U; | ||||
|     clk_per_microsecond = SystemCoreClock / 1000000.0f; | ||||
|     instructions_per_us = SystemCoreClock / 1000000.0f; | ||||
|     FURI_LOG_I(TAG, "Init OK"); | ||||
| } | ||||
|  | ||||
| void delay_us(float microseconds) { | ||||
|     uint32_t start = DWT->CYCCNT; | ||||
|     uint32_t time_ticks = microseconds * clk_per_microsecond; | ||||
|     uint32_t time_ticks = microseconds * instructions_per_us; | ||||
|     while((DWT->CYCCNT - start) < time_ticks) { | ||||
|     }; | ||||
| } | ||||
|   | ||||
| @@ -3,6 +3,7 @@ | ||||
| #include <furi_hal_resources.h> | ||||
|  | ||||
| #include <stm32wbxx_ll_tim.h> | ||||
| #include <stm32wbxx_ll_exti.h> | ||||
|  | ||||
| #include <furi.h> | ||||
|  | ||||
| @@ -91,16 +92,39 @@ void furi_hal_ibutton_emulate_stop() { | ||||
|     } | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_start() { | ||||
| void furi_hal_ibutton_start_drive() { | ||||
|     furi_hal_ibutton_pin_high(); | ||||
|     hal_gpio_init(&ibutton_gpio, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_start_drive_in_isr() { | ||||
|     hal_gpio_init(&ibutton_gpio, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow); | ||||
|     LL_EXTI_ClearFlag_0_31(ibutton_gpio.pin); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_start_interrupt() { | ||||
|     furi_hal_ibutton_pin_high(); | ||||
|     hal_gpio_init(&ibutton_gpio, GpioModeInterruptRiseFall, GpioPullNo, GpioSpeedLow); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_start_interrupt_in_isr() { | ||||
|     hal_gpio_init(&ibutton_gpio, GpioModeInterruptRiseFall, GpioPullNo, GpioSpeedLow); | ||||
|     LL_EXTI_ClearFlag_0_31(ibutton_gpio.pin); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_stop() { | ||||
|     furi_hal_ibutton_pin_high(); | ||||
|     hal_gpio_init(&ibutton_gpio, GpioModeAnalog, GpioPullNo, GpioSpeedLow); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_add_interrupt(GpioExtiCallback cb, void* context) { | ||||
|     hal_gpio_add_int_callback(&ibutton_gpio, cb, context); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_remove_interrupt() { | ||||
|     hal_gpio_remove_int_callback(&ibutton_gpio); | ||||
| } | ||||
|  | ||||
| void furi_hal_ibutton_pin_low() { | ||||
|     hal_gpio_write(&ibutton_gpio, false); | ||||
| } | ||||
|   | ||||
| @@ -23,6 +23,13 @@ typedef struct { | ||||
|  | ||||
| FuriHalRfid* furi_hal_rfid = NULL; | ||||
|  | ||||
| #define LFRFID_LL_READ_TIM TIM1 | ||||
| #define LFRFID_LL_READ_CONFIG_CHANNEL LL_TIM_CHANNEL_CH1 | ||||
| #define LFRFID_LL_READ_CHANNEL LL_TIM_CHANNEL_CH1N | ||||
|  | ||||
| #define LFRFID_LL_EMULATE_TIM TIM2 | ||||
| #define LFRFID_LL_EMULATE_CHANNEL LL_TIM_CHANNEL_CH3 | ||||
|  | ||||
| void furi_hal_rfid_init() { | ||||
|     furi_assert(furi_hal_rfid == NULL); | ||||
|     furi_hal_rfid = malloc(sizeof(FuriHalRfid)); | ||||
| @@ -72,7 +79,7 @@ void furi_hal_rfid_pins_reset() { | ||||
|  | ||||
| void furi_hal_rfid_pins_emulate() { | ||||
|     // ibutton low | ||||
|     furi_hal_ibutton_start(); | ||||
|     furi_hal_ibutton_start_drive(); | ||||
|     furi_hal_ibutton_pin_low(); | ||||
|  | ||||
|     // pull pin to timer out | ||||
| @@ -89,7 +96,7 @@ void furi_hal_rfid_pins_emulate() { | ||||
|  | ||||
| void furi_hal_rfid_pins_read() { | ||||
|     // ibutton low | ||||
|     furi_hal_ibutton_start(); | ||||
|     furi_hal_ibutton_start_drive(); | ||||
|     furi_hal_ibutton_pin_low(); | ||||
|  | ||||
|     // dont pull rfid antenna | ||||
|   | ||||
		Reference in New Issue
	
	Block a user