From 77eb733a9a5fc7edac58089c10d5b0695c42c2e4 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Thu, 2 Mar 2023 02:52:25 +0000 Subject: [PATCH 1/3] Format --- applications/main/xtreme_app/xtreme_app.c | 4 +- applications/services/gui/gui.c | 28 +++++------ .../notification_settings_app.c | 46 ++----------------- lib/STM32CubeWB.scons | 10 +++- scripts/sconsdist.py | 12 +++-- scripts/version.py | 25 ++++------ 6 files changed, 45 insertions(+), 80 deletions(-) diff --git a/applications/main/xtreme_app/xtreme_app.c b/applications/main/xtreme_app/xtreme_app.c index 6804dd0c3..dc59d0542 100644 --- a/applications/main/xtreme_app/xtreme_app.c +++ b/applications/main/xtreme_app/xtreme_app.c @@ -176,8 +176,8 @@ XtremeApp* xtreme_app_alloc() { storage_file_free(folder); furi_record_close(RECORD_STORAGE); - app->version_tag = furi_string_alloc_printf( - "%s %s", version_get_version(NULL), version_get_builddate(NULL)); + app->version_tag = + furi_string_alloc_printf("%s %s", version_get_version(NULL), version_get_builddate(NULL)); return app; } diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c index 8e3c432c5..eee32b6eb 100644 --- a/applications/services/gui/gui.c +++ b/applications/services/gui/gui.c @@ -328,20 +328,20 @@ static void gui_input(Gui* gui, InputEvent* input_event) { if(XTREME_SETTINGS()->left_handed) { switch(input_event->key) { - case InputKeyUp: - input_event->key = InputKeyDown; - break; - case InputKeyDown: - input_event->key = InputKeyUp; - break; - case InputKeyLeft: - input_event->key = InputKeyRight; - break; - case InputKeyRight: - input_event->key = InputKeyLeft; - break; - default: - break; + case InputKeyUp: + input_event->key = InputKeyDown; + break; + case InputKeyDown: + input_event->key = InputKeyUp; + break; + case InputKeyLeft: + input_event->key = InputKeyRight; + break; + case InputKeyRight: + input_event->key = InputKeyLeft; + break; + default: + break; } } diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c index fdd257c18..23ed4ac67 100644 --- a/applications/settings/notification_settings/notification_settings_app.c +++ b/applications/settings/notification_settings/notification_settings_app.c @@ -22,50 +22,12 @@ static const NotificationSequence sequence_note_c = { #define BACKLIGHT_COUNT 21 const char* const backlight_text[BACKLIGHT_COUNT] = { - "0%", - "5%", - "10%", - "15%", - "20%", - "25%", - "30%", - "35%", - "40%", - "45%", - "50%", - "55%", - "60%", - "65%", - "70%", - "75%", - "80%", - "85%", - "90%", - "95%", - "100%", + "0%", "5%", "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", + "55%", "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", }; const float backlight_value[BACKLIGHT_COUNT] = { - 0.00f, - 0.05f, - 0.10f, - 0.15f, - 0.20f, - 0.25f, - 0.30f, - 0.35f, - 0.40f, - 0.45f, - 0.50f, - 0.55f, - 0.60f, - 0.65f, - 0.70f, - 0.75f, - 0.80f, - 0.85f, - 0.90f, - 0.95f, - 1.00f, + 0.00f, 0.05f, 0.10f, 0.15f, 0.20f, 0.25f, 0.30f, 0.35f, 0.40f, 0.45f, 0.50f, + 0.55f, 0.60f, 0.65f, 0.70f, 0.75f, 0.80f, 0.85f, 0.90f, 0.95f, 1.00f, }; #define VOLUME_COUNT 5 diff --git a/lib/STM32CubeWB.scons b/lib/STM32CubeWB.scons index cbdde9814..a1b484ad1 100644 --- a/lib/STM32CubeWB.scons +++ b/lib/STM32CubeWB.scons @@ -14,9 +14,15 @@ env.Append( "USE_FULL_LL_DRIVER", ], SDK_HEADERS=[ - *env.GlobRecursive("*_ll_*.h", "#/lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/", exclude="*usb.h"), + *env.GlobRecursive( + "*_ll_*.h", + "#/lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/", + exclude="*usb.h", + ), File("STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/FreeRTOS.h"), - File("STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/stream_buffer.h"), + File( + "STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/stream_buffer.h" + ), ], ) diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py index 0fa120d87..ce261954c 100644 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py @@ -166,11 +166,13 @@ class Main(App): ) ) bundle_args.extend(self.other_args) - log_custom_fz_name = ( - environ.get("CUSTOM_FLIPPER_NAME", None) - or "" - ) - if (log_custom_fz_name != "") and (len(log_custom_fz_name) <= 8) and (log_custom_fz_name.isalnum()) and (log_custom_fz_name.isascii()): + log_custom_fz_name = environ.get("CUSTOM_FLIPPER_NAME", None) or "" + if ( + (log_custom_fz_name != "") + and (len(log_custom_fz_name) <= 8) + and (log_custom_fz_name.isalnum()) + and (log_custom_fz_name.isascii()) + ): self.logger.info( f"Flipper Custom Name is set:\n\tName: {log_custom_fz_name} : length - {len(log_custom_fz_name)} chars" ) diff --git a/scripts/version.py b/scripts/version.py index 6ae83099d..5cdd16138 100644 --- a/scripts/version.py +++ b/scripts/version.py @@ -34,25 +34,20 @@ class GitVersion: branch_num = self._exec_git("rev-list --count HEAD") or "n/a" - version = ( - os.environ.get("DIST_SUFFIX", None) - or VERSION - or "unknown" - ) + version = os.environ.get("DIST_SUFFIX", None) or VERSION or "unknown" - custom_fz_name = ( - os.environ.get("CUSTOM_FLIPPER_NAME", None) - or "" - ) + custom_fz_name = os.environ.get("CUSTOM_FLIPPER_NAME", None) or "" - force_no_dirty = ( - os.environ.get("FORCE_NO_DIRTY", None) - or "" - ) - if (force_no_dirty != ""): + force_no_dirty = os.environ.get("FORCE_NO_DIRTY", None) or "" + if force_no_dirty != "": dirty = False - if (custom_fz_name != "") and (len(custom_fz_name) <= 8) and (custom_fz_name.isalnum()) and (custom_fz_name.isascii()): + if ( + (custom_fz_name != "") + and (len(custom_fz_name) <= 8) + and (custom_fz_name.isalnum()) + and (custom_fz_name.isascii()) + ): return { "GIT_COMMIT": commit, "GIT_BRANCH": branch, From 9020d85e32b0ecd601630cb1d4eb96fc3b57e2d0 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Thu, 2 Mar 2023 04:49:38 +0000 Subject: [PATCH 2/3] Move docs to wiki --- ReadMe.md | 2 +- documentation/ReadMe.md | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 documentation/ReadMe.md diff --git a/ReadMe.md b/ReadMe.md index 3edda756d..1b20326c5 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -4,7 +4,7 @@

-[Intro](https://github.com/ClaraCrazy/Flipper-Xtreme#What-makes-it-special) | [Animations](https://github.com/ClaraCrazy/Flipper-Xtreme#Animations--Asset-Packs) | [Docs](https://github.com/ClaraCrazy/Flipper-Xtreme/wiki) | [Changelog](https://github.com/ClaraCrazy/Flipper-Xtreme#list-of-changes) | [Known bugs](https://github.com/ClaraCrazy/Flipper-Xtreme/issues?q=is%3Aissue+is%3Aopen+label%3Arelease-pending) | [Install](https://github.com/ClaraCrazy/Flipper-Xtreme#Install) | [Build](https://github.com/ClaraCrazy/Flipper-Xtreme#build-it-yourself) | [Discord](https://discord.gg/flipper-xtreme) +[Intro](https://github.com/ClaraCrazy/Flipper-Xtreme#What-makes-it-special) | [Animations](https://github.com/ClaraCrazy/Flipper-Xtreme#Animations--Asset-Packs) | [Wiki](https://github.com/ClaraCrazy/Flipper-Xtreme/wiki) | [Changelog](https://github.com/ClaraCrazy/Flipper-Xtreme#list-of-changes) | [Known bugs](https://github.com/ClaraCrazy/Flipper-Xtreme/issues?q=is%3Aissue+is%3Aopen+label%3Arelease-pending) | [Install](https://github.com/ClaraCrazy/Flipper-Xtreme#Install) | [Build](https://github.com/ClaraCrazy/Flipper-Xtreme#build-it-yourself) | [Discord](https://discord.gg/flipper-xtreme) ----- This firmware is a complete overhaul of the [Official Firmware](https://github.com/flipperdevices/flipperzero-firmware), it also features lots of awesome code-bits from [Unleashed](https://github.com/DarkFlippers/unleashed-firmware). diff --git a/documentation/ReadMe.md b/documentation/ReadMe.md deleted file mode 100644 index 14b7228cb..000000000 --- a/documentation/ReadMe.md +++ /dev/null @@ -1,7 +0,0 @@ -# Flipper Zero / Xtreme Firmware documentation - -For some general information on Flipper Zero, check out [our wiki](https://github.com/ClaraCrazy/Flipper-Xtreme/wiki)! -It includes some useful [Generic Guides](https://github.com/ClaraCrazy/Flipper-Xtreme/wiki/Generic-Guides) for Flipper's main functions. -It also features an in-depth look at one of our most exclusive features: [Asset Packs](https://github.com/ClaraCrazy/Flipper-Xtreme/wiki/Asset-Packs). - -If you instead are looking for some very detailed description of Flipper's ecosystem, OS, tools and file formats, please have a look at [Unleashed's documentation](https://github.com/DarkFlippers/unleashed-firmware/tree/dev/documentation)! From ba06ec79e2fdb3f29263fdb1fc15c40bc982381c Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Thu, 2 Mar 2023 18:05:54 +0000 Subject: [PATCH 3/3] Fix asset pack wiki link --- ReadMe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReadMe.md b/ReadMe.md index 1b20326c5..a50529279 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -56,7 +56,7 @@ We wrote a powerful yet easy-to-use application specifically for our Firmware, t We created our own, new & improved Animation / Asset system, that we can finally reveal. It lets you to create and cycle through your own `Asset Packs` with only a few button presses, allowing you to easily load custom Animations and Icons like never before. -You can easily create your own pack, or find some user made ones in the discord channel. Check here for a tutorial on creating your own. Essentially, we got our own Anims & Icons folders, inside each Asset Pack. +You can easily create your own pack, or find some user made ones in the discord channel. Check here for a tutorial on creating your own. Essentially, we got our own Anims & Icons folders, inside each Asset Pack.