separate hal

speaker_hal.c

@@ -0,0 +1,90 @@
+#include "speaker_hal.h"
+
+#define FURI_HAL_SPEAKER_TIMER TIM16
+#define FURI_HAL_SPEAKER_CHANNEL LL_TIM_CHANNEL_CH1
+#define FURI_HAL_SPEAKER_PRESCALER 500
+
+void tracker_speaker_play(float frequency, float pwm) {
+    uint32_t autoreload = (SystemCoreClock / FURI_HAL_SPEAKER_PRESCALER / frequency) - 1;
+    if(autoreload < 2) {
+        autoreload = 2;
+    } else if(autoreload > UINT16_MAX) {
+        autoreload = UINT16_MAX;
+    }
+
+    if(pwm < 0) pwm = 0;
+    if(pwm > 1) pwm = 1;
+
+    uint32_t compare_value = pwm * autoreload;
+
+    if(compare_value == 0) {
+        compare_value = 1;
+    }
+
+    LL_TIM_SetAutoReload(FURI_HAL_SPEAKER_TIMER, autoreload);
+    LL_TIM_OC_SetCompareCH1(FURI_HAL_SPEAKER_TIMER, compare_value);
+    LL_TIM_GenerateEvent_UPDATE(FURI_HAL_SPEAKER_TIMER);
+
+    LL_TIM_EnableAllOutputs(FURI_HAL_SPEAKER_TIMER);
+}
+
+void tracker_speaker_stop() {
+    LL_TIM_DisableAllOutputs(FURI_HAL_SPEAKER_TIMER);
+}
+
+void tracker_speaker_init() {
+    furi_hal_speaker_start(200.0f, 0.01f);
+    tracker_speaker_stop();
+}
+
+void tracker_speaker_deinit() {
+    furi_hal_speaker_stop();
+}
+
+static FuriHalInterruptISR tracker_isr;
+static void* tracker_isr_context;
+
+void tracker_interrupt_cb(void* context) {
+    UNUSED(context);
+
+    if(LL_TIM_IsActiveFlag_UPDATE(TIM2)) {
+        LL_TIM_ClearFlag_UPDATE(TIM2);
+
+        if(tracker_isr) {
+            tracker_isr(tracker_isr_context);
+        }
+    }
+}
+
+void tracker_interrupt_init(float freq, FuriHalInterruptISR isr, void* context) {
+    tracker_isr = isr;
+    tracker_isr_context = context;
+
+    furi_hal_interrupt_set_isr(FuriHalInterruptIdTIM2, tracker_interrupt_cb, NULL);
+
+    LL_TIM_InitTypeDef TIM_InitStruct = {0};
+    // Prescaler to get 1kHz clock
+    TIM_InitStruct.Prescaler = SystemCoreClock / 1000000 - 1;
+    TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
+    // Auto reload to get freq Hz interrupt
+    TIM_InitStruct.Autoreload = (1000000 / freq) - 1;
+    TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
+    LL_TIM_Init(TIM2, &TIM_InitStruct);
+    LL_TIM_EnableIT_UPDATE(TIM2);
+    LL_TIM_EnableAllOutputs(TIM2);
+    LL_TIM_EnableCounter(TIM2);
+}
+
+void tracker_interrupt_deinit() {
+    FURI_CRITICAL_ENTER();
+    LL_TIM_DeInit(TIM2);
+    FURI_CRITICAL_EXIT();
+}
+
+void tracker_debug_init() {
+    furi_hal_gpio_init(&gpio_ext_pc3, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
+}
+
+void tracker_debug_set(bool value) {
+    furi_hal_gpio_write(&gpio_ext_pc3, value);
+}

speaker_hal.h

@@ -0,0 +1,17 @@
+#include <furi_hal.h>
+
+void tracker_speaker_init();
+
+void tracker_speaker_deinit();
+
+void tracker_speaker_play(float frequency, float pwm);
+
+void tracker_speaker_stop();
+
+void tracker_interrupt_init(float freq, FuriHalInterruptISR isr, void* context);
+
+void tracker_interrupt_deinit();
+
+void tracker_debug_init();
+
+void tracker_debug_set(bool value);

zero_tracker.c

@@ -1,5 +1,5 @@
 #include <furi.h>
-#include <furi_hal.h>
+#include "speaker_hal.h"
 #include "zero_tracker.h"
 
 /**
@@ -38,90 +38,9 @@ typedef struct {
     NoteRow* rows;
 } NotePattern;
 
-#define FURI_HAL_SPEAKER_TIMER TIM16
-#define FURI_HAL_SPEAKER_CHANNEL LL_TIM_CHANNEL_CH1
-#define FURI_HAL_SPEAKER_PRESCALER 500
-
-void tracker_speaker_play(float frequency, float pwm) {
-    uint32_t autoreload = (SystemCoreClock / FURI_HAL_SPEAKER_PRESCALER / frequency) - 1;
-    if(autoreload < 2) {
-        autoreload = 2;
-    } else if(autoreload > UINT16_MAX) {
-        autoreload = UINT16_MAX;
-    }
-
-    if(pwm < 0) pwm = 0;
-    if(pwm > 1) pwm = 1;
-
-    uint32_t compare_value = pwm * autoreload;
-
-    if(compare_value == 0) {
-        compare_value = 1;
-    }
-
-    LL_TIM_SetAutoReload(FURI_HAL_SPEAKER_TIMER, autoreload);
-    LL_TIM_OC_SetCompareCH1(FURI_HAL_SPEAKER_TIMER, compare_value);
-    LL_TIM_GenerateEvent_UPDATE(FURI_HAL_SPEAKER_TIMER);
-
-    LL_TIM_EnableAllOutputs(FURI_HAL_SPEAKER_TIMER);
-}
-
-void tracker_speaker_stop() {
-    LL_TIM_DisableAllOutputs(FURI_HAL_SPEAKER_TIMER);
-}
-
-void tracker_speaker_init() {
-    furi_hal_speaker_start(200.0f, 0.01f);
-    tracker_speaker_stop();
-}
-
-void tracker_speaker_deinit() {
-    furi_hal_speaker_stop();
-}
-
-void tracker_interrupt_init(float freq, FuriHalInterruptISR isr, void* context) {
-    furi_hal_interrupt_set_isr(FuriHalInterruptIdTIM2, isr, context);
-
-    LL_TIM_InitTypeDef TIM_InitStruct = {0};
-    // Prescaler to get 1kHz clock
-    TIM_InitStruct.Prescaler = SystemCoreClock / 1000000 - 1;
-    TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
-    // Auto reload to get freq Hz interrupt
-    TIM_InitStruct.Autoreload = (1000000 / freq) - 1;
-    TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
-    LL_TIM_Init(TIM2, &TIM_InitStruct);
-    LL_TIM_EnableIT_UPDATE(TIM2);
-    LL_TIM_EnableAllOutputs(TIM2);
-    LL_TIM_EnableCounter(TIM2);
-}
-
-void tracker_interrupt_deinit() {
-    FURI_CRITICAL_ENTER();
-    LL_TIM_DeInit(TIM2);
-    FURI_CRITICAL_EXIT();
-}
-
-void tracker_debug_init() {
-    furi_hal_gpio_init(&gpio_ext_pc3, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
-}
-
-void tracker_debug_set(bool value) {
-    furi_hal_gpio_write(&gpio_ext_pc3, value);
-}
-
 void tracker_interrupt_body() {
-}
-
-void tracker_interrupt_cb(void* context) {
-    UNUSED(context);
-
-    if(LL_TIM_IsActiveFlag_UPDATE(TIM2)) {
-        LL_TIM_ClearFlag_UPDATE(TIM2);
-
-        tracker_debug_set(true);
-        tracker_interrupt_body();
-        tracker_debug_set(false);
-    }
+    tracker_debug_set(true);
+    tracker_debug_set(false);
 }
 
 int32_t zero_tracker_app(void* p) {
@@ -129,7 +48,7 @@ int32_t zero_tracker_app(void* p) {
 
     tracker_debug_init();
     tracker_speaker_init();
-    tracker_interrupt_init(120.0f, tracker_interrupt_cb, NULL);
+    tracker_interrupt_init(120.0f, tracker_interrupt_body, NULL);
 
     while(1) {
         furi_delay_ms(1000);