Skip to content

Commit

Permalink
FreeRTOS API fixes (#73)
Browse files Browse the repository at this point in the history
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: hedger <hedger@nanode.su>
  • Loading branch information
3 people authored Nov 15, 2023
1 parent ef07df3 commit a0f118d
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 17 deletions.
6 changes: 5 additions & 1 deletion mass_storage/.catalog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v.1.3

Minimal changes for recent API updates

## v.1.2

* Fix deadlock on disk eject
Expand All @@ -10,4 +14,4 @@

## v.1.0

Initial release.
Initial release.
2 changes: 1 addition & 1 deletion mass_storage/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions mass_storage/mass_storage_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 4 additions & 0 deletions nfc_magic/.catalog/changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## 1.2
- Minimal changes for recent API updates

## 1.1
- Rework application with new NFC API

## 1.0
- Initial release
2 changes: 1 addition & 1 deletion nfc_magic/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down
6 changes: 2 additions & 4 deletions nfc_magic/nfc_magic_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 2 additions & 0 deletions picopass/.catalog/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 1.8
- Minimal changes for recent API updates
## 1.7
- Rework application with new NFC API
## 1.6
Expand Down
2 changes: 1 addition & 1 deletion picopass/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
6 changes: 2 additions & 4 deletions picopass/picopass.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion weather_station/.catalog/changelog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit a0f118d

Please sign in to comment.