From 184eb718e1c87a04d46213f05b6327d6e03d3cc8 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 29 Aug 2023 00:26:59 +0200 Subject: [PATCH] Cleanup some clutter --nobuild --- applications/debug/uart_echo/application.fam | 3 +-- applications/debug/uart_echo/uart_10px.png | Bin 1883 -> 0 bytes applications/services/gui/modules/byte_input.c | 4 ++-- .../updater/util/update_task_worker_backup.c | 2 -- scripts/sconsdist.py | 2 +- scripts/version.py | 4 ---- site_scons/commandline.scons | 5 ----- site_scons/environ.scons | 1 - 8 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 applications/debug/uart_echo/uart_10px.png diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam index 3e262a09d..8863a1a94 100644 --- a/applications/debug/uart_echo/application.fam +++ b/applications/debug/uart_echo/application.fam @@ -1,12 +1,11 @@ App( appid="uart_echo", - name="[GPIO] UART Echo", + name="UART Echo", apptype=FlipperAppType.DEBUG, entry_point="uart_echo_app", cdefines=["APP_UART_ECHO"], requires=["gui"], stack_size=2 * 1024, order=70, - fap_icon="uart_10px.png", fap_category="Debug", ) diff --git a/applications/debug/uart_echo/uart_10px.png b/applications/debug/uart_echo/uart_10px.png deleted file mode 100644 index 8420f569279aa5ca170da19d080fd27f61b4339c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1883 zcmcIlO^72!6z&~VbYxWUvIs(N?;25X-v&lFK*fSv$c1OHesj5zzNxFKv zJCn?y7xCgj5JVAKyom@RBB%$!MGu}mdJw#O5l?~_eVxA@b#@#U3?yBt{_1<*d+)2N zH(J|UYpYMJDvGk!Y}DKEEXS)4uE6g~Yws6$Jd`$G%oXL~$II^p<^5Y173G0%;?7>N z7rqcMIn*haU7=5gDWDbQ+WI7=Y+n>=SM=hfs{Q))ZB31NRlDhgI81AzA2*IOv3tDT zVaNN-=i2&n>a|G#1Vd3!but_zc`&JJQ{Di^<+P!xQ%JF2)i%n2>R#AVYcdn6t7F74 zCThjkP1m+P?^%^#f(=|TOpFK#up2m*I{#=8E#pzpu0KDI1^=pAzbMkcFvjDtKDKn3 z^$gSZeFGDN5CjO6A0-8ypd`P%V5p0nWpP@>GEqxL+LfcCs)5p33d3|so8*gS+NbG@e$=bfWe7;TZuQO3mPp-76$i(s5B*QTRvFwK-R zLkz?aU^xggm!Z&a9i0an zhCwsQ3z{&|tXDMxWcW%fMZ#qz^S;DR2+ePhg0PHwvD=;VFxyI|ItfO;OcY z=?1~I`E-0rna`KdjCR}?KzfEtX0TjF#h7MdqX#YdPZt_@6Q9$=v!&aNVrpY(gJ2Gd zh)oggMlOnQ{^`kgKYR1w(jV=$#&;iGIr!?vQ?dEQ>mTlH{W$vgv8!)?a%u2`GV#_g{QmvU em*#svf3EDVT)F?1TY9Cu{+gTH^-r(A{Muh4WJ_-V diff --git a/applications/services/gui/modules/byte_input.c b/applications/services/gui/modules/byte_input.c index b2a659608..8117329cc 100644 --- a/applications/services/gui/modules/byte_input.c +++ b/applications/services/gui/modules/byte_input.c @@ -524,7 +524,7 @@ static void byte_input_handle_down(ByteInputModel* model) { * * @param model The model */ -static void byte_input_handle_left(ByteInputModel* model) { // XXX +static void byte_input_handle_left(ByteInputModel* model) { if(byte_input_keyboard_selected(model)) { if(model->selected_column > 0) { model->selected_column -= 1; @@ -544,7 +544,7 @@ static void byte_input_handle_left(ByteInputModel* model) { // XXX * * @param model The model */ -static void byte_input_handle_right(ByteInputModel* model) { // XXX +static void byte_input_handle_right(ByteInputModel* model) { if(byte_input_keyboard_selected(model)) { if(model->selected_column < byte_input_get_row_size(model->selected_row) - 1) { model->selected_column += 1; diff --git a/applications/system/updater/util/update_task_worker_backup.c b/applications/system/updater/util/update_task_worker_backup.c index 5cfd072f4..50d54cf14 100644 --- a/applications/system/updater/util/update_task_worker_backup.c +++ b/applications/system/updater/util/update_task_worker_backup.c @@ -69,8 +69,6 @@ static bool update_task_resource_unpack_cb(const char* name, bool is_directory, static void update_task_cleanup_resources(UpdateTask* update_task, const uint32_t n_tar_entries) { ResourceManifestReader* manifest_reader = resource_manifest_reader_alloc(update_task->storage); do { - // storage_simply_remove_recursive(update_task->storage, EXT_PATH("apps")); - FURI_LOG_D(TAG, "Cleaning up old manifest"); if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("Manifest"))) { FURI_LOG_W(TAG, "No existing manifest"); diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py index b1830ab09..2cf43dce0 100755 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py @@ -4,7 +4,7 @@ import json import shutil import tarfile import zipfile -from os import makedirs, walk, environ +from os import makedirs, walk from os.path import basename, exists, join, relpath from ansi.color import fg diff --git a/scripts/version.py b/scripts/version.py index f33c5e6e9..68670061b 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -41,10 +41,6 @@ class GitVersion: or "unknown" ) - force_no_dirty = os.environ.get("FORCE_NO_DIRTY", None) or "" - if force_no_dirty != "": - dirty = False - if "SOURCE_DATE_EPOCH" in os.environ: commit_date = datetime.utcfromtimestamp( int(os.environ["SOURCE_DATE_EPOCH"]) diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons index 449edb54b..0b4f03da0 100644 --- a/site_scons/commandline.scons +++ b/site_scons/commandline.scons @@ -100,11 +100,6 @@ vars.AddVariables( "Version string for updater package", "${DIST_SUFFIX}", ), - ( - "FORCE_NO_DIRTY", - "Force disable dirty status of the build", - "", - ), ( "COPRO_CUBE_VERSION", "Cube version", diff --git a/site_scons/environ.scons b/site_scons/environ.scons index 6d7286d2f..b638b1018 100644 --- a/site_scons/environ.scons +++ b/site_scons/environ.scons @@ -20,7 +20,6 @@ variables_to_forward = [ # CI/CD variables "WORKFLOW_BRANCH_OR_TAG", "DIST_SUFFIX", - "FORCE_NO_DIRTY", # Python & other tools "HOME", "APPDATA",