From c982294d5faa9d1440826999005dd567287c5e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Fri, 30 Apr 2021 09:41:15 +0300 Subject: [PATCH] [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> --- .github/CODEOWNERS | 11 +---------- .github/ISSUE_TEMPLATE/welcome.md | 14 -------------- .github/pull_request_template.md | 8 +++++++- applications/dolphin/scenes/scene.c | 4 ++++ 4 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/welcome.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 958bd79b1..c03776662 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -59,10 +59,6 @@ firmware/targets/f4/ble-glue/** @skotopes applications/bt/** @skotopes firmware/targets/f4/api-hal/api-hal-bt.c @skotopes -# Sub-GHz - -# applications/cc1101-workaround/** @glitchcore - # Dolphin applications/dolphin/** @skotopes @@ -82,10 +78,6 @@ lib/onewire/** @DrZlo13 applications/irda/** @DrZlo13 -# LF RFID - -# applications/lf-rfid/** @glitchcore - # Menu applications/menu/** @skotopes @@ -113,9 +105,8 @@ firmware/targets/f4/api-hal/api-hal-power.c @skotopes applications/music-player/** @DrZlo13 applications/floopper-bloopper/** @skotopes -# applications/gpio-tester/** @glitchcore applications/gui-test/** @DrZlo13 lib/app-template/** @DrZlo13 lib/qrcode/** @DrZlo13 -lib/callback-connector/** @DrZlo13 \ No newline at end of file +lib/callback-connector/** @DrZlo13 diff --git a/.github/ISSUE_TEMPLATE/welcome.md b/.github/ISSUE_TEMPLATE/welcome.md deleted file mode 100644 index 5187260d4..000000000 --- a/.github/ISSUE_TEMPLATE/welcome.md +++ /dev/null @@ -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 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1e6eee23b..697c34e51 100644 --- a/.github/pull_request_template.md +++ b/.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) diff --git a/applications/dolphin/scenes/scene.c b/applications/dolphin/scenes/scene.c index d633d30c4..5bacca3db 100644 --- a/applications/dolphin/scenes/scene.c +++ b/applications/dolphin/scenes/scene.c @@ -133,6 +133,10 @@ int32_t scene_app(void* p) { } osTimerStop(scene_app_gui->timer); + + // CMSIS + FreeRTOS = Enterprise + osDelay(15); + scene_free(); api_hal_power_insomnia_exit(); return 0;