mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

update UniRF Remix app

Browse Source
This commit is contained in:
Eng1n33r
2022-06-12 05:42:37 +03:00
parent b9761b424a
commit 4b22b122af
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -39,3 +39,4 @@ dist
# kde # kde
.directory .directory
null.d

20
applications/unirfremix/unirfremix_app.c
View File

@@ -167,8 +167,7 @@ void unirfremix_cfg_set_check(UniRFRemix* app) {
int label_len = 12; int label_len = 12;
//check that map file exists //check that map file exists
if(!flipper_format_file_open_existing(fff_data_file, string_get_cstr(file_name))) if(!flipper_format_file_open_existing(fff_data_file, string_get_cstr(file_name))) {
{
FURI_LOG_I(TAG, "Could not open MAP file %s", string_get_cstr(file_name)); FURI_LOG_I(TAG, "Could not open MAP file %s", string_get_cstr(file_name));
app->file_result = 1; app->file_result = 1;
} }
@@ -277,6 +276,9 @@ void unirfremix_cfg_set_check(UniRFRemix* app) {
//File definitions are done. //File definitions are done.
//File checks will follow after label assignment in order to close the universal_rf_map file without the need to reopen it again. //File checks will follow after label assignment in order to close the universal_rf_map file without the need to reopen it again.
//File definitions are done.
//File checks will follow after label assignment in order to close the universal_rf_map file without the need to reopen it again.
//Label Assignment/Check Start //Label Assignment/Check Start
//assign variables to values within map file //assign variables to values within map file
@@ -564,6 +566,9 @@ static void unirfremix_send_signal(
} }
static void unirfremix_process_signal(UniRFRemix* app, string_t signal) { static void unirfremix_process_signal(UniRFRemix* app, string_t signal) {
osMutexRelease(app->model_mutex);
view_port_update(app->view_port);
FURI_LOG_I(TAG, "signal = %s", string_get_cstr(signal)); FURI_LOG_I(TAG, "signal = %s", string_get_cstr(signal));
if(strlen(string_get_cstr(signal)) > 12) { if(strlen(string_get_cstr(signal)) > 12) {
@@ -602,7 +607,7 @@ static void unirfremix_process_signal(UniRFRemix* app, string_t signal) {
static void render_callback(Canvas* canvas, void* ctx) { static void render_callback(Canvas* canvas, void* ctx) {
UniRFRemix* app = ctx; UniRFRemix* app = ctx;
furi_check(osMutexAcquire(app->model_mutex, 25) == osOK); furi_check(osMutexAcquire(app->model_mutex, osWaitForever) == osOK);
//setup different canvas settings //setup different canvas settings
if(app->file_result == 1) { if(app->file_result == 1) {
@@ -694,7 +699,7 @@ UniRFRemix* unirfremix_alloc() {
app->model_mutex = osMutexNew(NULL); app->model_mutex = osMutexNew(NULL);
app->input_queue = osMessageQueueNew(1, sizeof(InputEvent), NULL); app->input_queue = osMessageQueueNew(32, sizeof(InputEvent), NULL);
app->view_port = view_port_alloc(); app->view_port = view_port_alloc();
view_port_draw_callback_set(app->view_port, render_callback, app); view_port_draw_callback_set(app->view_port, render_callback, app);
@@ -759,6 +764,10 @@ int32_t unirfremix_app(void* p) {
app->repeat = 1; app->repeat = 1;
app->button = 0; app->button = 0;
//refresh screen to update variables before processing main screen or error screens
osMutexRelease(app->model_mutex);
view_port_update(app->view_port);
//input detect loop start //input detect loop start
InputEvent input; InputEvent input;
while(1) { while(1) {
@@ -892,6 +901,9 @@ int32_t unirfremix_app(void* p) {
view_port_update(app->view_port); view_port_update(app->view_port);
} }
} else { } else {
//refresh screen to update variables before processing main screen or error screens
view_port_update(app->view_port);
InputEvent input; InputEvent input;
while(1) { while(1) {
furi_check(osMessageQueueGet(app->input_queue, &input, NULL, osWaitForever) == osOK); furi_check(osMessageQueueGet(app->input_queue, &input, NULL, osWaitForever) == osOK);