FuriHal: replace HAL with LL in RFID Part 1. Drop F6. (#1049)

* FuriHal: new speaker HAL * FuriHal: drop PWM * FuriHal: move COMP1 to LL * FuriHal: move COMP1 to LL backport to F6 * FuriHal: remove missing gpio_rfid_carrier from F6 * FurHal: use LL for system controls in flash HAL * Drop F6 source tree * Drop F6 from GitHub workflow * Tie USE_FULL_ASSERT with APP_UNIT_TESTS * Speaker: return to old volume calculation * FreeRTOS: move TCB header to glue Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
flipperdevices · Mar 23, 2022 · c4a0847 · c4a0847
1 parent 3857cd7
commit c4a0847
Show file tree

Hide file tree

Showing 219 changed files with 402 additions and 31,552 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -6,7 +6,7 @@
 
 - [ Describe how to verify changes ]
 
-# Checklist (do not modify)
+# Checklist (For Reviewer)
 
 - [ ] PR has description of feature/bug or link to Confluence/Jira task
 - [ ] Description contains actions to verify feature/bugfix

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  TARGETS: f6 f7
+  TARGETS: f7
   DEFAULT_TARGET: f7
 
 jobs:

diff --git a/.github/workflows/lint_c.yml b/.github/workflows/lint_c.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  TARGETS: f6 f7
+  TARGETS: f7
 
 jobs:
   lint_c_cpp:

diff --git a/applications/ibutton/helpers/key_reader.cpp b/applications/ibutton/helpers/key_reader.cpp
@@ -3,8 +3,6 @@
 #include <callback-connector.h>
 #include <maxim_crc.h>
 
-extern COMP_HandleTypeDef hcomp1;
-
 KeyReader::Error KeyReader::read(iButtonKey* key) {
     uint8_t tmp_key_data[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     iButtonKeyType key_type;
@@ -116,9 +114,9 @@ void KeyReader::start_comaparator(void) {
 
     comparator_callback_pointer =
         cbc::obtain_connector(this, &KeyReader::comparator_trigger_callback);
-    api_interrupt_add(comparator_callback_pointer, InterruptTypeComparatorTrigger, this);
+    furi_hal_rfid_comp_set_callback(comparator_callback_pointer, this);
     last_dwt_value = DWT->CYCCNT;
-    HAL_COMP_Start(&hcomp1);
+    furi_hal_rfid_comp_start();
 }
 
 void KeyReader::stop_comaparator(void) {
@@ -127,23 +125,19 @@ void KeyReader::stop_comaparator(void) {
     // rfid_pins_reset will disable ibutton pin
     furi_hal_ibutton_start();
 
-    HAL_COMP_Stop(&hcomp1);
-    api_interrupt_remove(comparator_callback_pointer, InterruptTypeComparatorTrigger);
+    furi_hal_rfid_comp_stop();
+    furi_hal_rfid_comp_set_callback(NULL, NULL);
 }
 
-void KeyReader::comparator_trigger_callback(void* hcomp, void* comp_ctx) {
+void KeyReader::comparator_trigger_callback(bool level, void* comp_ctx) {
     KeyReader* _this = static_cast<KeyReader*>(comp_ctx);
 
-    if(hcomp == &hcomp1) {
-        uint32_t current_dwt_value = DWT->CYCCNT;
+    uint32_t current_dwt_value = DWT->CYCCNT;
 
-        _this->cyfral_decoder.process_front(
-            hal_gpio_get_rfid_in_level(), current_dwt_value - last_dwt_value);
-        _this->metakom_decoder.process_front(
-            hal_gpio_get_rfid_in_level(), current_dwt_value - last_dwt_value);
+    _this->cyfral_decoder.process_front(level, current_dwt_value - last_dwt_value);
+    _this->metakom_decoder.process_front(level, current_dwt_value - last_dwt_value);
 
-        last_dwt_value = current_dwt_value;
-    }
+    last_dwt_value = current_dwt_value;
 }
 
 void KeyReader::switch_to(ReadMode mode) {

diff --git a/applications/ibutton/helpers/key_reader.h b/applications/ibutton/helpers/key_reader.h
@@ -28,8 +28,8 @@ class KeyReader {
     bool verify_key(iButtonKeyType key_type, const uint8_t* const data, uint8_t data_size);
 
     // cyfral and metakom readers data
-    void comparator_trigger_callback(void* hcomp, void* comp_ctx);
-    void (*comparator_callback_pointer)(void* hcomp, void* comp_ctx);
+    void comparator_trigger_callback(bool level, void* comp_ctx);
+    void (*comparator_callback_pointer)(bool level, void* comp_ctx);
 
     void start_comaparator(void);
     void stop_comaparator(void);
@@ -51,4 +51,4 @@ class KeyReader {
 
     void switch_to(ReadMode mode);
     void switch_mode_if_needed();
-};
+};
diff --git a/applications/ibutton/helpers/key_worker.cpp b/applications/ibutton/helpers/key_worker.cpp
@@ -2,8 +2,6 @@
 #include <callback-connector.h>
 #include <maxim_crc.h>
 
-extern COMP_HandleTypeDef hcomp1;
-
 KeyReader::Error KeyWorker::read(iButtonKey* key) {
     KeyReader::Error result = key_reader.read(key);
 
@@ -51,4 +49,4 @@ KeyWorker::KeyWorker(const GpioPin* one_wire_gpio)
 }
 
 KeyWorker::~KeyWorker() {
-}
+}
diff --git a/applications/lfrfid/helpers/rfid_reader.cpp b/applications/lfrfid/helpers/rfid_reader.cpp
@@ -4,8 +4,6 @@
 #include <stm32wbxx_ll_cortex.h>
 #include <tim.h>
 
-extern COMP_HandleTypeDef hcomp1;
-
 /**
  * @brief private violation assistant for RfidReader
  */
@@ -63,14 +61,10 @@ void RfidReader::switch_mode() {
     switch_timer_reset();
 }
 
-static void comparator_trigger_callback(void* hcomp, void* comp_ctx) {
-    COMP_HandleTypeDef* _hcomp = static_cast<COMP_HandleTypeDef*>(hcomp);
+static void comparator_trigger_callback(bool level, void* comp_ctx) {
     RfidReader* _this = static_cast<RfidReader*>(comp_ctx);
 
-    if(hcomp == &hcomp1) {
-        RfidReaderAccessor::decode(
-            *_this, (HAL_COMP_GetOutputLevel(_hcomp) == COMP_OUTPUT_LEVEL_HIGH));
-    }
+    RfidReaderAccessor::decode(*_this, !level);
 }
 
 RfidReader::RfidReader() {
@@ -163,25 +157,13 @@ bool RfidReader::any_read() {
 }
 
 void RfidReader::start_comparator(void) {
-    api_interrupt_add(comparator_trigger_callback, InterruptTypeComparatorTrigger, this);
+    furi_hal_rfid_comp_set_callback(comparator_trigger_callback, this);
     last_dwt_value = DWT->CYCCNT;
 
-    hcomp1.Init.InputMinus = COMP_INPUT_MINUS_1_2VREFINT;
-    hcomp1.Init.InputPlus = COMP_INPUT_PLUS_IO1;
-    hcomp1.Init.OutputPol = COMP_OUTPUTPOL_NONINVERTED;
-    hcomp1.Init.Hysteresis = COMP_HYSTERESIS_HIGH;
-    hcomp1.Init.BlankingSrce = COMP_BLANKINGSRC_NONE;
-    hcomp1.Init.Mode = COMP_POWERMODE_MEDIUMSPEED;
-    hcomp1.Init.WindowMode = COMP_WINDOWMODE_DISABLE;
-    hcomp1.Init.TriggerMode = COMP_TRIGGERMODE_IT_RISING_FALLING;
-    if(HAL_COMP_Init(&hcomp1) != HAL_OK) {
-        Error_Handler();
-    }
-
-    HAL_COMP_Start(&hcomp1);
+    furi_hal_rfid_comp_start();
 }
 
 void RfidReader::stop_comparator(void) {
-    HAL_COMP_Stop(&hcomp1);
-    api_interrupt_remove(comparator_trigger_callback, InterruptTypeComparatorTrigger);
-}
+    furi_hal_rfid_comp_stop();
+    furi_hal_rfid_comp_set_callback(NULL, NULL);
+}
diff --git a/applications/lfrfid/helpers/rfid_writer.cpp b/applications/lfrfid/helpers/rfid_writer.cpp
@@ -4,8 +4,6 @@
 #include "protocols/protocol_hid_h10301.h"
 #include "protocols/protocol_indala_40134.h"
 
-extern COMP_HandleTypeDef hcomp1;
-
 /**
  * @brief all timings are specified in field clocks (field clock = 125 kHz, 8 us)
  * 

diff --git a/applications/lfrfid_debug/scene/lfrfid_debug_app_scene_tune.cpp b/applications/lfrfid_debug/scene/lfrfid_debug_app_scene_tune.cpp
@@ -1,35 +1,16 @@
 #include "lfrfid_debug_app_scene_tune.h"
 #include <furi_hal.h>
 
-extern COMP_HandleTypeDef hcomp1;
-
-static void comparator_trigger_callback(void* hcomp, void* comp_ctx) {
-    COMP_HandleTypeDef* _hcomp = static_cast<COMP_HandleTypeDef*>(hcomp);
-
-    if(hcomp == &hcomp1) {
-        hal_gpio_write(&gpio_ext_pa7, HAL_COMP_GetOutputLevel(_hcomp) == COMP_OUTPUT_LEVEL_HIGH);
-    }
+static void comparator_trigger_callback(bool level, void* comp_ctx) {
+    hal_gpio_write(&gpio_ext_pa7, !level);
 }
 
 void LfRfidDebugAppSceneTune::on_enter(LfRfidDebugApp* app, bool need_restore) {
     app->view_controller.switch_to<LfRfidViewTuneVM>();
     hal_gpio_init_simple(&gpio_ext_pa7, GpioModeOutputPushPull);
 
-    api_interrupt_add(comparator_trigger_callback, InterruptTypeComparatorTrigger, this);
-
-    hcomp1.Init.InputMinus = COMP_INPUT_MINUS_1_2VREFINT;
-    hcomp1.Init.InputPlus = COMP_INPUT_PLUS_IO1;
-    hcomp1.Init.OutputPol = COMP_OUTPUTPOL_NONINVERTED;
-    hcomp1.Init.Hysteresis = COMP_HYSTERESIS_HIGH;
-    hcomp1.Init.BlankingSrce = COMP_BLANKINGSRC_NONE;
-    hcomp1.Init.Mode = COMP_POWERMODE_MEDIUMSPEED;
-    hcomp1.Init.WindowMode = COMP_WINDOWMODE_DISABLE;
-    hcomp1.Init.TriggerMode = COMP_TRIGGERMODE_IT_RISING_FALLING;
-    if(HAL_COMP_Init(&hcomp1) != HAL_OK) {
-        Error_Handler();
-    }
-
-    HAL_COMP_Start(&hcomp1);
+    furi_hal_rfid_comp_set_callback(comparator_trigger_callback, this);
+    furi_hal_rfid_comp_start();
 
     furi_hal_rfid_pins_read();
     furi_hal_rfid_tim_read(125000, 0.5);
@@ -50,11 +31,11 @@ bool LfRfidDebugAppSceneTune::on_event(LfRfidDebugApp* app, LfRfidDebugApp::Even
 }
 
 void LfRfidDebugAppSceneTune::on_exit(LfRfidDebugApp* app) {
-    HAL_COMP_Stop(&hcomp1);
-    api_interrupt_remove(comparator_trigger_callback, InterruptTypeComparatorTrigger);
+    furi_hal_rfid_comp_stop();
+    furi_hal_rfid_comp_set_callback(NULL, NULL);
 
     hal_gpio_init_simple(&gpio_ext_pa7, GpioModeAnalog);
     furi_hal_rfid_tim_read_stop();
     furi_hal_rfid_tim_reset();
     furi_hal_rfid_pins_reset();
-}
+}
diff --git a/applications/music_player/music_player.c b/applications/music_player/music_player.c
@@ -102,7 +102,7 @@ typedef struct {
     uint8_t volume_id_max;
 } State;
 
-const float volumes[] = {0, 0.02, 0.05, 0.1, 0.5};
+const float volumes[] = {0, .25, .5, .75, 1};
 
 bool is_white_note(const MelodyEventRecord* note_record, uint8_t id) {
     if(note_record == NULL) return false;
@@ -332,10 +332,10 @@ void process_note(
     // play note
     float note_delay = bar_length_ms / (float)note_record->length;
     if(note_record->note != N) {
-        hal_pwm_set(volume, note_record->note, &SPEAKER_TIM, SPEAKER_CH);
+        furi_hal_speaker_start(note_record->note, volume);
     }
     delay(note_delay);
-    hal_pwm_stop(&SPEAKER_TIM, SPEAKER_CH);
+    furi_hal_speaker_stop();
 }
 
 void music_player_thread(void* p) {
@@ -447,7 +447,7 @@ int32_t music_player_app(void* p) {
     }
 
     osThreadTerminate(player);
-    hal_pwm_stop(&SPEAKER_TIM, SPEAKER_CH);
+    furi_hal_speaker_stop();
     view_port_enabled_set(view_port, false);
     gui_remove_view_port(gui, view_port);
     furi_record_close("gui");

diff --git a/applications/notification/notification.h b/applications/notification/notification.h
@@ -9,7 +9,7 @@ extern "C" {
 typedef struct NotificationApp NotificationApp;
 typedef struct {
     float frequency;
-    float pwm;
+    float volume;
 } NotificationMessageDataSound;
 
 typedef struct {

diff --git a/applications/notification/notification_app.c b/applications/notification/notification_app.c
@@ -139,12 +139,12 @@ void notification_vibro_off() {
     furi_hal_vibro_on(false);
 }
 
-void notification_sound_on(float pwm, float freq) {
-    hal_pwm_set(pwm, freq, &SPEAKER_TIM, SPEAKER_CH);
+void notification_sound_on(float freq, float volume) {
+    furi_hal_speaker_start(freq, volume);
 }
 
 void notification_sound_off() {
-    hal_pwm_stop(&SPEAKER_TIM, SPEAKER_CH);
+    furi_hal_speaker_stop();
 }
 
 // display timer
@@ -236,8 +236,8 @@ void notification_process_notification_message(
             break;
         case NotificationMessageTypeSoundOn:
             notification_sound_on(
-                notification_message->data.sound.pwm * speaker_volume_setting,
-                notification_message->data.sound.frequency);
+                notification_message->data.sound.frequency,
+                notification_message->data.sound.volume * speaker_volume_setting);
             reset_mask |= reset_sound_mask;
             break;
         case NotificationMessageTypeSoundOff: