Просмотр исходного кода

[FL-1208] Fix crash in dolphin scene app caused by condition race in Tmr thread on delete (#438)

* Dolphin scene add moar enterprise sleeps

* Gihub: update PR template and cleanup codeowners

Co-authored-by: its your bedtime <23366927+itsyourbedtime@users.noreply.github.com>
あく 4 лет назад
Родитель
Сommit
c982294d5f

+ 1 - 10
.github/CODEOWNERS

@@ -59,10 +59,6 @@ firmware/targets/f4/ble-glue/** @skotopes
 applications/bt/** @skotopes
 applications/bt/** @skotopes
 firmware/targets/f4/api-hal/api-hal-bt.c @skotopes
 firmware/targets/f4/api-hal/api-hal-bt.c @skotopes
 
 
-# Sub-GHz
-
-# applications/cc1101-workaround/** @glitchcore
-
 # Dolphin
 # Dolphin
 
 
 applications/dolphin/** @skotopes
 applications/dolphin/** @skotopes
@@ -82,10 +78,6 @@ lib/onewire/** @DrZlo13
 
 
 applications/irda/** @DrZlo13
 applications/irda/** @DrZlo13
 
 
-# LF RFID
-
-# applications/lf-rfid/** @glitchcore
-
 # Menu
 # Menu
 
 
 applications/menu/** @skotopes
 applications/menu/** @skotopes
@@ -113,9 +105,8 @@ firmware/targets/f4/api-hal/api-hal-power.c @skotopes
 
 
 applications/music-player/** @DrZlo13
 applications/music-player/** @DrZlo13
 applications/floopper-bloopper/** @skotopes
 applications/floopper-bloopper/** @skotopes
-# applications/gpio-tester/** @glitchcore
 applications/gui-test/** @DrZlo13
 applications/gui-test/** @DrZlo13
 
 
 lib/app-template/** @DrZlo13
 lib/app-template/** @DrZlo13
 lib/qrcode/** @DrZlo13
 lib/qrcode/** @DrZlo13
-lib/callback-connector/** @DrZlo13
+lib/callback-connector/** @DrZlo13

+ 0 - 14
.github/ISSUE_TEMPLATE/welcome.md

@@ -1,14 +0,0 @@
----
-name: Welcome
-about: Welcome message from the new contributor
-title: ''
-labels: welcome
-assignees: glitchcore, zhovner
-
----
-
-# Tell community about yourself, what technology relevant to Flipper development you have experience with
-
- # What tasks you can take (you can link existing issues), try to estimate how long it will take in hours 
-
-# What help do you need

+ 7 - 1
.github/pull_request_template.md

@@ -1,4 +1,10 @@
-Describe what feature implement or what bug fixes this PR (or add link to Confluence/Jira task). The description should describe what actions need to check this code.
+# What's new
+
+- [ Describe changes here ]
+
+# Verification 
+
+- [ Describe how to verify changes ]
 
 
 # Checklist (do not modify)
 # Checklist (do not modify)
 
 

+ 4 - 0
applications/dolphin/scenes/scene.c

@@ -133,6 +133,10 @@ int32_t scene_app(void* p) {
     }
     }
 
 
     osTimerStop(scene_app_gui->timer);
     osTimerStop(scene_app_gui->timer);
+
+    // CMSIS + FreeRTOS = Enterprise
+    osDelay(15);
+
     scene_free();
     scene_free();
     api_hal_power_insomnia_exit();
     api_hal_power_insomnia_exit();
     return 0;
     return 0;