FreeRTOS API fixes (#73)

Willy-JL · hedger · web-flow · commit a0f118dcf3bc · 2023-11-15T21:58:21.000+04:00
Co-authored-by: hedger &lt;hedger@users.noreply.github.com&gt;
Co-authored-by: hedger &lt;hedger@nanode.su&gt;
diff --git a/mass_storage/.catalog/CHANGELOG.md b/mass_storage/.catalog/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v.1.3
+
+Minimal changes for recent API updates
+
 ## v.1.2
 
  * Fix deadlock on disk eject
@@ -10,4 +14,4 @@
 
 ## v.1.0
 
-Initial release.
+Initial release.
diff --git a/mass_storage/application.fam b/mass_storage/application.fam
@@ -9,7 +9,7 @@ App(
     ],
     stack_size=2 * 1024,
     fap_description="Implements a mass storage device over USB for disk images",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_icon="assets/mass_storage_10px.png",
     fap_icon_assets="assets",
     fap_category="USB",
diff --git a/mass_storage/mass_storage_app.c b/mass_storage/mass_storage_app.c
@@ -22,15 +22,13 @@ static void mass_storage_app_tick_event_callback(void* context) {
 }
 
 void mass_storage_app_show_loading_popup(MassStorageApp* app, bool show) {
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
-
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(app->view_dispatcher, MassStorageAppViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 
diff --git a/nfc_magic/.catalog/changelog.md b/nfc_magic/.catalog/changelog.md
@@ -1,4 +1,8 @@
+## 1.2
+ - Minimal changes for recent API updates
+
 ## 1.1
  - Rework application with new NFC API
+
 ## 1.0
  - Initial release
diff --git a/nfc_magic/application.fam b/nfc_magic/application.fam
@@ -10,7 +10,7 @@ App(
     ],
     stack_size=4 * 1024,
     fap_description="Application for writing to NFC tags with modifiable sector 0",
-    fap_version="1.1",
+    fap_version="1.2",
     fap_icon="assets/125_10px.png",
     fap_category="NFC",
     fap_private_libs=[
diff --git a/nfc_magic/nfc_magic_app.c b/nfc_magic/nfc_magic_app.c
@@ -23,15 +23,13 @@ void nfc_magic_app_tick_event_callback(void* context) {
 
 void nfc_magic_app_show_loading_popup(void* context, bool show) {
     NfcMagicApp* instance = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
-
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(instance->view_dispatcher, NfcMagicAppViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 
diff --git a/picopass/.catalog/changelog.md b/picopass/.catalog/changelog.md
@@ -1,3 +1,5 @@
+## 1.8
+ - Minimal changes for recent API updates
 ## 1.7
  - Rework application with new NFC API
 ## 1.6
diff --git a/picopass/application.fam b/picopass/application.fam
@@ -10,7 +10,7 @@ App(
     ],
     stack_size=4 * 1024,
     fap_description="App to communicate with NFC tags using the PicoPass(iClass) format",
-    fap_version="1.7",
+    fap_version="1.8",
     fap_icon="125_10px.png",
     fap_category="NFC",
     fap_libs=["mbedtls"],
diff --git a/picopass/picopass.c b/picopass/picopass.c
@@ -196,15 +196,13 @@ void picopass_blink_stop(Picopass* picopass) {
 
 void picopass_show_loading_popup(void* context, bool show) {
     Picopass* picopass = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
-
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 
diff --git a/weather_station/.catalog/changelog.md b/weather_station/.catalog/changelog.md
@@ -1,6 +1,6 @@
 ## 1.2
  - Add protocol Acurite-986
- - Functions for working with delays have been changed
+ - Minimal changes for recent API updates
 ## 1.1
  - Add protocol Auriol_AHFL
 ## 1.0

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,13 @@ static void mass_storage_app_tick_event_callback(void* context) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`void mass_storage_app_show_loading_popup(MassStorageApp* app, bool show) {`
`25`		`- TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);`
`26`		`-`
`27`	`25`	`if(show) {`
`28`	`26`	`// Raise timer priority so that animations can play`
`29`		`- vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);`
	`27`	`+ furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);`
`30`	`28`	`view_dispatcher_switch_to_view(app->view_dispatcher, MassStorageAppViewLoading);`
`31`	`29`	`} else {`
`32`	`30`	`// Restore default timer priority`
`33`		`- vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);`
	`31`	`+ furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);`
`34`	`32`	`}`
`35`	`33`	`}`
`36`	`34`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## 1.8`
	`2`	`+ - Minimal changes for recent API updates`
`1`	`3`	`## 1.7`
`2`	`4`	`- Rework application with new NFC API`
`3`	`5`	`## 1.6`