diff options
author | gornekich <n.gorbadey@gmail.com> | 2021-09-02 02:22:40 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-02 02:22:40 +0300 |
commit | 420c03bb58aae0fa526e555d7a92e14f43b7fa6e (patch) | |
tree | 725be6b10ec2ee4fd6945e59b8ab527abeaff372 /applications/accessor | |
parent | e17336498db48de0898313aca9099985b91bd89e (diff) |
[FL-1720] BLE GUI refactoring (#678)
* dialog_ex: add clean method, fix documentation
* application: add bt debug and settings application
* bt: add debug application
* bt: add settings application
* bt: rework bt service
* bt debug: fix carrier debug app
* assets: add debug animation to main menu
* bt debug: fix bt packet test
* bt service: rework bt service
* bt: cleanup
* Assets: fix spelling
* Ble: wait for core 2 startup complete before initializing radio stack.
* Accessor: remove dead code, switch port PA6 to PA4, because interrupt line 6 is used by down button.
* FuriHal: assert interrupt line on add_int_callback.
* Bt: update icon on core2 startup complete.
Co-authored-by: あく <alleteam@gmail.com>
Diffstat (limited to 'applications/accessor')
-rw-r--r-- | applications/accessor/accessor-app.cpp | 10 | ||||
-rw-r--r-- | applications/accessor/helpers/wiegand.cpp | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/applications/accessor/accessor-app.cpp b/applications/accessor/accessor-app.cpp index b462ec79..7313474b 100644 --- a/applications/accessor/accessor-app.cpp +++ b/applications/accessor/accessor-app.cpp @@ -109,16 +109,6 @@ void AccessorApp::notify_green_blink() { void AccessorApp::notify_success() { notification_message(notification, &sequence_success); - - hal_pwm_set(0.5, 1760 / 2, &htim2, TIM_CHANNEL_2); - delay(100); - hal_pwm_stop(&htim2, TIM_CHANNEL_2); - - delay(100); - - hal_pwm_set(0.5, 1760, &htim2, TIM_CHANNEL_2); - delay(100); - hal_pwm_stop(&htim2, TIM_CHANNEL_2); } /*************************** TEXT STORE *****************************/ diff --git a/applications/accessor/helpers/wiegand.cpp b/applications/accessor/helpers/wiegand.cpp index 9e92a15d..777fa561 100644 --- a/applications/accessor/helpers/wiegand.cpp +++ b/applications/accessor/helpers/wiegand.cpp @@ -11,6 +11,8 @@ volatile int WIEGAND::_bitCount = 0; int WIEGAND::_wiegandType = 0; constexpr uint32_t clocks_in_ms = 64 * 1000; +const GpioPin* pinD0 = &gpio_ext_pa4; +const GpioPin* pinD1 = &gpio_ext_pa7; WIEGAND::WIEGAND() { } @@ -53,9 +55,6 @@ void WIEGAND::begin() { _wiegandType = 0; _bitCount = 0; - const GpioPin* pinD0 = &gpio_ext_pa6; - const GpioPin* pinD1 = &gpio_ext_pa7; - hal_gpio_init_simple(pinD0, GpioModeInterruptFall); // Set D0 pin as input hal_gpio_init_simple(pinD1, GpioModeInterruptFall); // Set D1 pin as input @@ -64,11 +63,11 @@ void WIEGAND::begin() { } void WIEGAND::end() { - hal_gpio_remove_int_callback(&gpio_ext_pa6); - hal_gpio_remove_int_callback(&gpio_ext_pa7); + hal_gpio_remove_int_callback(pinD0); + hal_gpio_remove_int_callback(pinD1); - hal_gpio_init_simple(&gpio_ext_pa6, GpioModeAnalog); - hal_gpio_init_simple(&gpio_ext_pa7, GpioModeAnalog); + hal_gpio_init_simple(pinD0, GpioModeAnalog); + hal_gpio_init_simple(pinD1, GpioModeAnalog); } void WIEGAND::ReadD0() { |