Merge branch 'release-candidate' into release

flipperdevices · Sep 10, 2021 · 44d7b5b · 44d7b5b
2 parents 97e0a30 + 5443bed
commit 44d7b5b
Show file tree

Hide file tree

Showing 57 changed files with 1,545 additions and 773 deletions.
diff --git 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
@@ -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() {

diff --git a/applications/applications.c b/applications/applications.c
@@ -32,6 +32,7 @@ extern int32_t scened_app(void* p);
 extern int32_t storage_test_app(void* p);
 extern int32_t subghz_app(void* p);
 extern int32_t vibro_test_app(void* p);
+extern int32_t bt_debug_app(void* p);
 
 // Plugins
 extern int32_t music_player_app(void* p);
@@ -48,6 +49,7 @@ extern void subghz_cli_init();
 // Settings
 extern int32_t notification_settings_app(void* p);
 extern int32_t storage_settings_app(void* p);
+extern int32_t bt_settings_app(void* p);
 
 const FlipperApplication FLIPPER_SERVICES[] = {
 /* Services */
@@ -236,6 +238,10 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = {
 #ifdef APP_LF_RFID
     {.app = lfrfid_debug_app, .name = "LF-RFID Debug", .stack_size = 1024, .icon = &A_125khz_14},
 #endif
+
+#ifdef SRV_BT
+    {.app = bt_debug_app, .name = "Bluetooth Debug", .stack_size = 1024, .icon = NULL},
+#endif
 };
 
 const size_t FLIPPER_DEBUG_APPS_COUNT = sizeof(FLIPPER_DEBUG_APPS) / sizeof(FlipperApplication);
@@ -254,6 +260,10 @@ const FlipperApplication FLIPPER_SETTINGS_APPS[] = {
 #ifdef SRV_STORAGE
     {.app = storage_settings_app, .name = "Storage", .stack_size = 2048, .icon = NULL},
 #endif
+
+#ifdef SRV_BT
+    {.app = bt_settings_app, .name = "Bluetooth", .stack_size = 1024, .icon = NULL},
+#endif
 };
 
 const size_t FLIPPER_SETTINGS_APPS_COUNT =

diff --git a/applications/bt/bt.c b/applications/bt/bt.c