diff --git a/non_catalog_apps/meal_pager/application.fam b/non_catalog_apps/meal_pager/application.fam index 55be2098fb4..c47ef5e4990 100644 --- a/non_catalog_apps/meal_pager/application.fam +++ b/non_catalog_apps/meal_pager/application.fam @@ -7,7 +7,7 @@ App( fap_icon="icons/meal_pager_10px.png", fap_icon_assets="icons", fap_category="Sub-GHz", - fap_version="1.2", + fap_version="1.3", fap_author="leedave", fap_weburl="https://github.com/leedave/flipper-zero-meal-pager", fap_description="This app triggers restaurant pagers in a brute force manner, useful to test if devices are still functional.", diff --git a/non_catalog_apps/meal_pager/docs/changelog.md b/non_catalog_apps/meal_pager/docs/changelog.md index 6d783b4d490..c026d53f9a4 100644 --- a/non_catalog_apps/meal_pager/docs/changelog.md +++ b/non_catalog_apps/meal_pager/docs/changelog.md @@ -1,3 +1,9 @@ +## v1.3 +- Fixed some memory leaks +- Changed Subghz Protocol Registry to Fipper API conform variant +- Version number in Start Screen +- Code formatting + ## v1.2 - Fixed Memory bug in Last Station UI - Added auto-correction when entries in First/Last station/pager are out of range diff --git a/non_catalog_apps/meal_pager/helpers/subghz/subghz_txrx.c b/non_catalog_apps/meal_pager/helpers/subghz/subghz_txrx.c index 018d02b6d4a..c0a2be045f3 100644 --- a/non_catalog_apps/meal_pager/helpers/subghz/subghz_txrx.c +++ b/non_catalog_apps/meal_pager/helpers/subghz/subghz_txrx.c @@ -1,6 +1,6 @@ #include "subghz_txrx_i.h" -#include +#include #include #include diff --git a/non_catalog_apps/meal_pager/meal_pager.c b/non_catalog_apps/meal_pager/meal_pager.c index 888e795d550..c2f36064fc7 100644 --- a/non_catalog_apps/meal_pager/meal_pager.c +++ b/non_catalog_apps/meal_pager/meal_pager.c @@ -69,9 +69,6 @@ Meal_Pager* meal_pager_app_alloc() { app->subghz = subghz_alloc(); - // Custom made int keyboard - app->int_input = int_input_alloc(); - // Load configs meal_pager_read_settings(app); @@ -123,20 +120,19 @@ void meal_pager_app_free(Meal_Pager* app) { int_input_free(app->int_input); view_dispatcher_free(app->view_dispatcher); - variable_item_list_free(app->variable_item_list); meal_pager_transmit_free(app->meal_pager_transmit); meal_pager_startscreen_free(app->meal_pager_startscreen); - furi_record_close(RECORD_GUI); - furi_record_close(RECORD_NOTIFICATION); - app->gui = NULL; - app->notification = NULL; // Close File Browser furi_record_close(RECORD_DIALOGS); + furi_record_close(RECORD_NOTIFICATION); furi_string_free(app->file_path); + app->gui = NULL; + app->notification = NULL; + subghz_free(app->subghz); //Remove whatever is left diff --git a/non_catalog_apps/meal_pager/meal_pager_i.h b/non_catalog_apps/meal_pager/meal_pager_i.h index 2c8de587d55..01e92e2dc7e 100644 --- a/non_catalog_apps/meal_pager/meal_pager_i.h +++ b/non_catalog_apps/meal_pager/meal_pager_i.h @@ -25,6 +25,7 @@ #define SUBGHZ_APP_EXTENSION ".sub" #define SUBGHZ_APP_FOLDER ANY_PATH("subghz") +#define MEAL_PAGER_VERSION "1.3" typedef struct Meal_PagerTransmit Meal_PagerTransmit; typedef struct SubGhz SubGhz; diff --git a/non_catalog_apps/meal_pager/views/meal_pager_startscreen.c b/non_catalog_apps/meal_pager/views/meal_pager_startscreen.c index 88868e871e9..11743757917 100644 --- a/non_catalog_apps/meal_pager/views/meal_pager_startscreen.c +++ b/non_catalog_apps/meal_pager/views/meal_pager_startscreen.c @@ -28,12 +28,15 @@ void meal_pager_startscreen_set_callback( void meal_pager_startscreen_draw(Canvas* canvas, Meal_PagerStartscreenModel* model) { UNUSED(model); + char buffer[64]; canvas_clear(canvas); canvas_set_color(canvas, ColorBlack); canvas_set_font(canvas, FontPrimary); canvas_draw_str_aligned(canvas, 64, 10, AlignCenter, AlignTop, "Restaurant Pager"); canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 22, AlignCenter, AlignTop, "Trigger Tool"); + snprintf(buffer, sizeof(buffer), "Version: %s", MEAL_PAGER_VERSION); + canvas_draw_str_aligned(canvas, 64, 42, AlignCenter, AlignTop, buffer); elements_button_center(canvas, "Start"); }