From e22669da96ffed7dd35911ce2a2a24d37225d917 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 13 Feb 2025 03:56:04 +0300 Subject: [PATCH] fixes and corrections --- CHANGELOG.md | 2 +- applications/services/input/input.c | 13 +------- applications/services/input/input_settings.c | 32 ++----------------- .../input_settings_app/input_settings_app.c | 10 +----- .../scenes/power_settings_scene_start.c | 2 +- extra.sh | 9 ------ rgb.sh | 5 --- 7 files changed, 6 insertions(+), 67 deletions(-) delete mode 100755 extra.sh delete mode 100755 rgb.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b4d73eb9..81bdd909e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## Main changes -- Current API: 79.3 +- Current API: 79.4 * OFW: LFRFID - **EM4305 support** * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) ## Other changes diff --git a/applications/services/input/input.c b/applications/services/input/input.c index 2b697d6ce..41759a1dd 100644 --- a/applications/services/input/input.c +++ b/applications/services/input/input.c @@ -82,17 +82,6 @@ const char* input_get_type_name(InputType type) { } } -// allocate memory for input_settings structure -static InputSettings* input_settings_alloc(void) { - InputSettings* settings = malloc(sizeof(InputSettings)); - return settings; -} - -//free memory from input_settings structure -void input_settings_free(InputSettings* settings) { - free(settings); -} - int32_t input_srv(void* p) { UNUSED(p); @@ -102,7 +91,7 @@ int32_t input_srv(void* p) { furi_record_create(RECORD_INPUT_EVENTS, event_pubsub); //define object input_settings, take memory load (or init) settings and create record for access to settings structure from outside - InputSettings* settings = input_settings_alloc(); + InputSettings* settings = malloc(sizeof(InputSettings)); furi_record_create(RECORD_INPUT_SETTINGS, settings); input_settings_load(settings); diff --git a/applications/services/input/input_settings.c b/applications/services/input/input_settings.c index 2868e5974..cd3de6d50 100644 --- a/applications/services/input/input_settings.c +++ b/applications/services/input/input_settings.c @@ -6,15 +6,10 @@ #define TAG "InputSettings" -#define INPUT_SETTINGS_VER_0 (0) // OLD version number -#define INPUT_SETTINGS_VER (1) // NEW actual version nnumber +#define INPUT_SETTINGS_VER (1) // version nnumber #define INPUT_SETTINGS_PATH INT_PATH(INPUT_SETTINGS_FILE_NAME) -#define INPUT_SETTINGS_MAGIC (0x19) - -typedef struct { - //inital set - empty -} InputSettingsV0; +#define INPUT_SETTINGS_MAGIC (0x29) void input_settings_load(InputSettings* settings) { furi_assert(settings); @@ -36,23 +31,6 @@ void input_settings_load(InputSettings* settings) { INPUT_SETTINGS_MAGIC, INPUT_SETTINGS_VER); // if config previous version - load it and inicialize new settings - } else if( - version == - INPUT_SETTINGS_VER_0) { // if config previous version - load it and manual set new settings to inital value - InputSettingsV0* settings_v0 = malloc(sizeof(InputSettingsV0)); - - success = saved_struct_load( - INPUT_SETTINGS_PATH, - settings_v0, - sizeof(InputSettingsV0), - INPUT_SETTINGS_MAGIC, - INPUT_SETTINGS_VER_0); - - if(success) { - settings->vibro_touch_level = 0; - } - - free(settings_v0); } // in case of another config version we exit from useless cycle to next step } while(false); @@ -75,12 +53,6 @@ void input_settings_save(const InputSettings* settings) { INPUT_SETTINGS_MAGIC, INPUT_SETTINGS_VER); - // debug log - // FURI_LOG_D(TAG,"SAVE"); - // char buffer[12] = {}; - // snprintf(buffer, sizeof(buffer), "%d",settings->vibro_touch_level); - // FURI_LOG_D(TAG,buffer); - if(!success) { FURI_LOG_E(TAG, "Failed to save file"); } diff --git a/applications/settings/input_settings_app/input_settings_app.c b/applications/settings/input_settings_app/input_settings_app.c index 2902625ae..4f3e101da 100644 --- a/applications/settings/input_settings_app/input_settings_app.c +++ b/applications/settings/input_settings_app/input_settings_app.c @@ -42,8 +42,6 @@ static uint32_t input_settings_app_exit(void* context) { InputSettingsApp* input_settings_app_alloc(void) { InputSettingsApp* app = malloc(sizeof(InputSettingsApp)); - //app->inputservice = furi_record_open(RECORD_INPUT_EVENTS); - app->gui = furi_record_open(RECORD_GUI); app->settings = malloc(sizeof(InputSettings)); @@ -58,7 +56,7 @@ InputSettingsApp* input_settings_app_alloc(void) { item = variable_item_list_add( app->variable_item_list, - "VibroTouchLevel", + "Buttons Vibro", VIBRO_TOUCH_LEVEL_COUNT, input_settings_vibro_touch_level_changed, app); @@ -101,12 +99,6 @@ int32_t input_settings_app(void* p) { view_dispatcher_run(app->view_dispatcher); - // // debug code - // FURI_LOG_D(TAG,"Vibro Touch level before save"); - // char buffer[12] = {}; - // snprintf(buffer, sizeof(buffer), "%d",app->settings->vibro_touch_level); - // FURI_LOG_D(TAG,buffer); - //save current settings; input_settings_save(app->settings); diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c index 2b8bd773f..42c53ed02 100644 --- a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c +++ b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c @@ -73,7 +73,7 @@ void power_settings_scene_start_on_enter(void* context) { item = variable_item_list_add( variable_item_list, - "Safe Charging", + "Limit Charge", CHARGE_SUPRESS_PERCENT_COUNT, power_settings_scene_start_charge_supress_percent_changed, app); diff --git a/extra.sh b/extra.sh deleted file mode 100755 index 923c2bc47..000000000 --- a/extra.sh +++ /dev/null @@ -1,9 +0,0 @@ -wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz -tar zxf all-the-apps-extra.tgz -mkdir -p applications/main/clock_app/resources/apps -cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/ -rm -rf extra_pack_build -rm -f build/f7-firmware-C/toolbox/version.* -./fbt COMPACT=1 DEBUG=0 updater_package -mkdir artifacts-extra-apps -mv dist/f7-C/* artifacts-extra-apps/ diff --git a/rgb.sh b/rgb.sh deleted file mode 100755 index 31f9144a4..000000000 --- a/rgb.sh +++ /dev/null @@ -1,5 +0,0 @@ -git apply .ci_files/rgb.patch -rm -f build/f7-firmware-C/toolbox/version.* -./fbt COMPACT=1 DEBUG=0 updater_package -mkdir artifacts-rgb-patch -mv dist/f7-C/* artifacts-rgb-patch/