Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme

* 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme: (102 commits) Add sanity checks for pin code validity Auto unlock rpc for u2f Scripts: WiFi board updater (#2625) [FL-3351] github: re-enabled f18 build (#2743) added ISO15693 (NfcV) reading, saving, emulating and revealing from privacy mode (unlock) (#2316) [FL-3346] fbt: added Flipper selection when multiple are connected over USB (#2723) Format Begone, uselessness! Connection go much brrr upd anims Update docs Rename and remove old apps bump ver Fix? I have no way to check if sensor still works Fix SCD30 Unitemp Remove broken modulation that was causing buffer Overrun Fix ProtoView issue Flipper-XFW#503 Typo Add missing anims, fix butthurt values ...
C0n4r7157 · Jun 8, 2023 · 8de3c92 · 8de3c92
2 parents c1cbd85 + f2cc1fc
commit 8de3c92
Show file tree

Hide file tree

Showing 334 changed files with 5,449 additions and 4,845 deletions.
diff --git a/.github/workflow_data/hotfix.py b/.github/workflow_data/hotfix.py
@@ -82,6 +82,6 @@
         print(f"{req.url = }\n{req.status_code = }\n{req.content = }")
         sys.exit(1)
 
-    changelog = body.split("## 🚀 Changelog", 1)[1].rsplit("## ❤️ Support", 1)[0]
+    changelog = body.split("## 🚀 Changelog", 1)[1]
     with open(os.environ["ARTIFACT_TGZ"].removesuffix(".tgz") + ".md", "w") as f:
         f.write(changelog.strip() + "\n\n")
diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md
@@ -7,6 +7,17 @@
 
 **Check the [install guide](https://github.com/ClaraCrazy/Flipper-Xtreme#install) if you're not sure, or [join our Discord](https://discord.gg/flipper-xtreme) if you have questions or encounter issues!**
 
+## ❤️ Support
+If you like what you're seeing, **please consider donating to us**. We won't ever put this behind a paywall, but we'd still appreciate a few bucks!
+
+- **[Patreon](https://patreon.com/CynthiaLabs)**: ❤️ Account needed, subscription with perks across my entire org.
+- **[Wire-transfer](https://bunq.me/ClaraK)**: No account needed, one-time
+- **[Paypal](https://paypal.me/RdX2020)**: Account needed, one-time
+- **[ko-fi](https://ko-fi.com/cynthialabs)**: No account needed, one-time
+- **Monero**: `41kyWeeoVdK4quzQ4M9ikVGs6tCQCLfdx8jLExTNsAu2SF1QAyDqRdjfGM6EL8L9NpXwt89HJeAoGf1aoArk7nDr4AMMV4T`
+
+**Thanks for all your support <3**
+
 ## 🚀 Changelog
 {CHANGELOG}
 
@@ -17,13 +28,3 @@
 
   **If you have any of the above issues, please re-download and re-install!**
 <HOTFIXES> -->
-
-## ❤️ Support
-If you like what you're seeing, **please consider donating to us**. We won't ever put this behind a paywall, but we'd still appreciate a few bucks!
-
-- **[Direct Wire-transfer](https://bunq.me/ClaraK)**: No account needed, just specify amount and hit send
-- **[Patreon](https://patreon.com/CynthiaLabs)**
-- **[Paypal](https://paypal.me/RdX2020)**
-- **Monero**: `41kyWeeoVdK4quzQ4M9ikVGs6tCQCLfdx8jLExTNsAu2SF1QAyDqRdjfGM6EL8L9NpXwt89HJeAoGf1aoArk7nDr4AMMV4T`
-
-**Thanks for all your support <3**
diff --git a/ReadMe.md b/ReadMe.md
@@ -222,12 +222,13 @@ $ ./fbt resources icons dolphin_ext
 ## ❤️ Support
 If you like what you're seeing, **please consider donating to us**. We won't ever put this behind a paywall, but we'd still appreciate a few bucks!
 
-- **[Direct Wire-transfer](https://bunq.me/ClaraK)**: No account needed, just specify amount and hit send
-- **[Patreon](https://patreon.com/CynthiaLabs)**
-- **[Paypal](https://paypal.me/RdX2020)**
+- **[Patreon](https://patreon.com/CynthiaLabs)**: ❤️ Account needed, subscription with perks across my entire org.
+- **[Wire-transfer](https://bunq.me/ClaraK)**: No account needed, one-time
+- **[Paypal](https://paypal.me/RdX2020)**: Account needed, one-time
+- **[ko-fi](https://ko-fi.com/cynthialabs)**: No account needed, one-time
 - **Monero**: `41kyWeeoVdK4quzQ4M9ikVGs6tCQCLfdx8jLExTNsAu2SF1QAyDqRdjfGM6EL8L9NpXwt89HJeAoGf1aoArk7nDr4AMMV4T`
 
 **Thanks for all your support <3**
 
 ----
-<p align="center"> "What we do for ourselves dies with us. What we do for others and the world remains and is immortal.” ― Albert Pine </p>
+<p align="center"> "What we do for ourselves dies with us. What we do for others and the world remains and is immortal.” ― Albert Pine </p>
diff --git a/SConstruct b/SConstruct
@@ -171,7 +171,7 @@ distenv.Depends(firmware_env["FW_RESOURCES"], external_apps_artifacts.resources_
 
 fap_deploy = distenv.PhonyTarget(
     "fap_deploy",
-    "${PYTHON3} ${ROOT_DIR}/scripts/storage.py send ${SOURCE} /ext/apps",
+    "${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py -p ${FLIP_PORT} send ${SOURCE} /ext/apps",
     source=Dir("#/assets/resources/apps"),
 )
 
@@ -323,7 +323,9 @@ distenv.PhonyTarget(
 )
 
 # Start Flipper CLI via PySerial's miniterm
-distenv.PhonyTarget("cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py")
+distenv.PhonyTarget(
+    "cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py  -p ${FLIP_PORT}"
+)
 
 
 # Find blackmagic probe

diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="UART_Echo",
+    appid="uart_echo",
     name="[GPIO] UART Echo",
     apptype=FlipperAppType.DEBUG,
     entry_point="uart_echo_app",

diff --git a/applications/external/airmouse/application.fam b/applications/external/airmouse/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="Air_Mouse",
+    appid="air_mouse",
     name="[BMI160] Air Mouse",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="air_mouse_app",

diff --git a/applications/external/avr_isp_programmer/avr_isp_app_i.h b/applications/external/avr_isp_programmer/avr_isp_app_i.h
@@ -41,4 +41,4 @@ typedef struct {
     AvrIspError error;
 } AvrIspApp;
 
-bool avr_isp_load_from_file(AvrIspApp* app);
+bool avr_isp_load_from_file(AvrIspApp* app);
diff --git a/applications/external/bpmtapper/application.fam b/applications/external/bpmtapper/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="BPM_Tapper",
+    appid="bpm_tapper",
     name="BPM Tapper",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="bpm_tapper_app",

diff --git a/applications/external/bpmtapper/bpm.c b/applications/external/bpmtapper/bpm.c
@@ -4,7 +4,7 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <stdlib.h>
-#include "BPM_Tapper_icons.h"
+#include "bpm_tapper_icons.h"
 
 typedef enum {
     EventTypeTick,

diff --git a/applications/external/brainfuck/application.fam b/applications/external/brainfuck/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="Brainfuck",
+    appid="brainfuck",
     name="Brainfuck",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="brainfuck_app",

diff --git a/applications/external/brainfuck/brainfuck_i.h b/applications/external/brainfuck/brainfuck_i.h
@@ -29,7 +29,7 @@ typedef unsigned char byte;
 
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
-#include <Brainfuck_icons.h>
+#include <brainfuck_icons.h>
 
 #include <storage/storage.h>
 #include <stream/stream.h>

diff --git a/applications/external/caesarcipher/application.fam b/applications/external/caesarcipher/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="Caesar_Cipher",
+    appid="caesar_cipher",
     name="Caesar Cipher",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="caesar_cipher_app",

diff --git a/applications/external/calculator/application.fam b/applications/external/calculator/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="Calculator",
+    appid="calculator",
     name="Calculator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="calculator_app",

diff --git a/applications/external/esp32cam_camera/application.fam b/applications/external/esp32cam_camera/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="MAYHEM_Camera",
+    appid="mayhem_camera",
     name="[MAYHEM] Camera",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="camera_app",

diff --git a/applications/external/esp32cam_marauder_companion/application.fam b/applications/external/esp32cam_marauder_companion/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="MAYHEM_Marauder",
+    appid="mayhem_marauder",
     name="[MAYHEM] Marauder",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",

diff --git a/applications/external/esp32cam_morseflasher/application.fam b/applications/external/esp32cam_morseflasher/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="MAYHEM_MorseFlash",
+    appid="mayhem_morseflash",
     name="[MAYHEM] Morse Flasher",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="uart_terminal_app",

diff --git a/applications/external/esp32cam_morseflasher/uart_text_input.c b/applications/external/esp32cam_morseflasher/uart_text_input.c
@@ -1,6 +1,6 @@
 #include "uart_text_input.h"
 #include <gui/elements.h>
-#include "MAYHEM_MorseFlash_icons.h"
+#include "mayhem_morseflash_icons.h"
 #include <furi.h>
 
 struct UART_TextInput {

diff --git a/applications/external/esp32cam_motion_detection/application.fam b/applications/external/esp32cam_motion_detection/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="MAYHEM_Motion",
+    appid="mayhem_motion",
     name="[MAYHEM] Motion detection",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="uart_echo_app",

diff --git a/applications/external/esp32cam_nannycam/application.fam b/applications/external/esp32cam_nannycam/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="MAYHEM_NannyCam",
+    appid="mayhem_nannycam",
     name="[MAYHEM] Nanny Cam",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="uart_echo_app",

diff --git a/applications/external/esp32cam_qrcode/application.fam b/applications/external/esp32cam_qrcode/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="MAYHEM_QRcode",
+    appid="mayhem_qrcode",
     name="[MAYHEM] QR Code",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="uart_echo_app",

diff --git a/applications/external/flipfrid/LICENSE.md b/applications/external/flipfrid/LICENSE.md
diff --git a/applications/external/flipfrid/application.fam b/applications/external/flipfrid/application.fam