mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-07-01 22:08:55 -07:00
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict
This commit is contained in:
Willy-JL
@@ -4,7 +4,7 @@
|
||||
<img src="https://user-images.githubusercontent.com/55334727/215170306-051eeb8f-8f72-437f-8c2d-0e4be009bdad.png">
|
||||
</p>
|
||||
|
||||
[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).
|
||||
@@ -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.
|
||||
|
||||
<img src="https://user-images.githubusercontent.com/55334727/214010675-9eddb8f5-1dd6-4cf4-a0ee-e37af8b6c933.PNG" align="left" width="200px"/>
|
||||
You can easily create your own pack, or find some user made ones in the discord channel. Check <a href="https://github.com/ClaraCrazy/Flipper-Xtreme/wiki/1.-File-Formats">here</a> for a tutorial on creating your own. Essentially, we got our own <code>Anims</code> & <code>Icons</code> folders, inside each <code>Asset Pack</code>.
|
||||
You can easily create your own pack, or find some user made ones in the discord channel. Check <a href="https://github.com/ClaraCrazy/Flipper-Xtreme/wiki/Asset-Packs">here</a> for a tutorial on creating your own. Essentially, we got our own <code>Anims</code> & <code>Icons</code> folders, inside each <code>Asset Pack</code>.
|
||||
|
||||
<br clear="left"/>
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)!
|
||||
@@ -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"
|
||||
),
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
+10
-15
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user