Merge branch 'dev' into release

Auto_power_off and Auto_lock improvements

.ci_files/anims_ofw.txt

@@ -1,177 +0,0 @@
-Filetype: Flipper Animation Manifest
-Version: 1
-
-Name: L1_Waves_128x50
-Min butthurt: 0
-Max butthurt: 5
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Laptop_128x51
-Min butthurt: 0
-Max butthurt: 7
-Min level: 1
-Max level: 1
-Weight: 3
-
-Name: L1_Sleep_128x64
-Min butthurt: 0
-Max butthurt: 10
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Recording_128x51
-Min butthurt: 0
-Max butthurt: 8
-Min level: 1
-Max level: 1
-Weight: 3
-
-Name: L1_Furippa1_128x64
-Min butthurt: 0
-Max butthurt: 6
-Min level: 1
-Max level: 1
-Weight: 3
-
-Name: L1_Read_books_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 1
-Max level: 1
-Weight: 3
-
-Name: L1_Cry_128x64
-Min butthurt: 8
-Max butthurt: 13
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Boxing_128x64
-Min butthurt: 10
-Max butthurt: 13
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Mad_fist_128x64
-Min butthurt: 9
-Max butthurt: 13
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Mods_128x64
-Min butthurt: 0
-Max butthurt: 9
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L1_Painting_128x64
-Min butthurt: 0
-Max butthurt: 7
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Leaving_sad_128x64
-Min butthurt: 14
-Max butthurt: 14
-Min level: 1
-Max level: 3
-Weight: 3
-
-Name: L1_Kaiju_128x64
-Min butthurt: 0
-Max butthurt: 10
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L1_My_dude_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L2_Wake_up_128x64
-Min butthurt: 0
-Max butthurt: 12
-Min level: 2
-Max level: 3
-Weight: 4
-
-Name: L2_Furippa2_128x64
-Min butthurt: 0
-Max butthurt: 6
-Min level: 2
-Max level: 2
-Weight: 3
-
-Name: L2_Hacking_pc_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 2
-Max level: 2
-Weight: 3
-
-Name: L2_Soldering_128x64
-Min butthurt: 0
-Max butthurt: 10
-Min level: 2
-Max level: 2
-Weight: 3
-
-Name: L2_Dj_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 2
-Max level: 3
-Weight: 4
-
-Name: L3_Furippa3_128x64
-Min butthurt: 0
-Max butthurt: 6
-Min level: 3
-Max level: 3
-Weight: 3
-
-Name: L3_Hijack_radio_128x64
-Min butthurt: 0
-Max butthurt: 8
-Min level: 3
-Max level: 3
-Weight: 3
-
-Name: L3_Lab_research_128x54
-Min butthurt: 0
-Max butthurt: 10
-Min level: 3
-Max level: 3
-Weight: 3
-
-Name: L1_Senpai_128x64
-Min butthurt: 0
-Max butthurt: 5
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L1_Sad_song_128x64
-Min butthurt: 8
-Max butthurt: 13
-Min level: 1
-Max level: 3
-Weight: 4
-
-Name: L2_Coding_in_the_shell_128x64
-Min butthurt: 0
-Max butthurt: 12
-Min level: 2
-Max level: 3
-Weight: 4

.ci_files/devbuild_msg_discord.txt

@@ -0,0 +1,16 @@
+## New Unleashed FW Dev Build
+
+**Build** - (buildnum)
+**Commit** - [(commitsha)](https://github.com/DarkFlippers/unleashed-firmware/commit/(commitsha))
+### Sponsor our project -> [Patreon](https://patreon.com/mmxdev) or [Boosty](https://boosty.to/mmxdev)
+How to [install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)?
+
+### Install FW via Web Updater:
+[Default](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-(buildnum).tgz&channel=dev-cfw&version=(buildnum)) > ` `
+[Extra apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)e.tgz&channel=dev-cfw&version=(buildnum)e) > `e`
+[No apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)c.tgz&channel=dev-cfw&version=(buildnum)c) > `c`
+[RGB patch - only for hardware mod!](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)r.tgz&channel=dev-cfw&version=(buildnum)r) > `r`
+What ` `, `e`, `c`, `r` means? -> [versions info](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/CHANGELOG.md#what-n-r-e---c-means-what-i-need-to-download-if-i-dont-want-to-use-web-updater)
+### Direct tgz download links:
+[Default](https://unleashedflip.com/fw/dev/flipper-z-f7-update-(buildnum).tgz) > ` ` - [Extra apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)e.tgz) > `e` - [No apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)c.tgz) > `c` - [RGB patch - only for hardware mod!](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)r.tgz) > `r`
+

.ci_files/devbuild_msg_telegram.txt

@@ -0,0 +1,22 @@
+**New Unleashed FW Dev Build**
+
+**Build** - (buildnum)
+**Commit** - [(commitsha)](https://github.com/DarkFlippers/unleashed-firmware/commit/(commitsha))
+**Sponsor our project** -> [Patreon](https://patreon.com/mmxdev) or [Boosty](https://boosty.to/mmxdev)
+
+How to [install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)?
+
+**Install FW via Web Updater:**
+[Default](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-(buildnum).tgz&channel=dev-cfw&version=(buildnum)) > ` `
+[Extra apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)e.tgz&channel=dev-cfw&version=(buildnum)e) > `e`
+[No apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)c.tgz&channel=dev-cfw&version=(buildnum)c) > `c`
+[RGB patch - only for hardware mod!](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)r.tgz&channel=dev-cfw&version=(buildnum)r) > `r`
+
+What ` `, `e`, `c`, `r` means? -> [versions info](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/CHANGELOG.md#what-n-r-e---c-means-what-i-need-to-download-if-i-dont-want-to-use-web-updater)
+
+**Direct tgz download links:**
+[Default](https://unleashedflip.com/fw/dev/flipper-z-f7-update-(buildnum).tgz) > ` `
+[Extra apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)e.tgz) > `e` 
+[No apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)c.tgz) > `c` 
+[RGB patch - only for hardware mod!](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(buildnum)r.tgz) > `r`
+

.ci_files/imgs/fztools/Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu:hirsute
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        ca-certificates \
+        git \
+        wget \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh"]

.ci_files/imgs/fztools/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    bash
+else
+    echo "Running $1"
+    set -ex
+    bash -c "$1"
+fi
+

.ci_files/release_msg_discord.txt

@@ -0,0 +1,16 @@
+## New Unleashed firmware released!
+
+**Version:** (releasever)
+**Github:** [Release](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/(releasever))
+### Sponsor our project -> [Patreon](https://patreon.com/mmxdev) or [Boosty](https://boosty.to/mmxdev)
+How to [install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)?
+
+### Install FW via Web Updater:
+[Default](https://lab.flipper.net/?url=https://unleashedflip.com/fw/(releasever)/flipper-z-f7-update-(releasever).tgz&channel=release-cfw&version=(releasever)) > ` `
+[Extra apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)e.tgz&channel=release-cfw&version=(releasever)e) > `e`
+[No apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)c.tgz&channel=release-cfw&version=(releasever)c) > `c`
+[RGB patch - only for hardware mod!](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)r.tgz&channel=release-cfw&version=(releasever)r) > `r`
+What ` `, `e`, `c`, `r` means? -> [versions info](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/CHANGELOG.md#what-n-r-e---c-means-what-i-need-to-download-if-i-dont-want-to-use-web-updater)
+### Direct tgz download links:
+[Default](https://unleashedflip.com/fw/(releasever)/flipper-z-f7-update-(releasever).tgz) > ` ` - [Extra apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)e.tgz) > `e` - [No apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)c.tgz) > `c` - [RGB patch - only for hardware mod!](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)r.tgz) > `r`
+

.ci_files/release_msg_telegram.txt

@@ -0,0 +1,22 @@
+**New Unleashed firmware released**
+
+**Version:** (releasever)
+**Github:** [Release](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/(releasever))
+**Sponsor our project** -> [Patreon](https://patreon.com/mmxdev) or [Boosty](https://boosty.to/mmxdev)
+
+How to [install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)?
+
+**Install FW via Web Updater:**
+[Default](https://lab.flipper.net/?url=https://unleashedflip.com/fw/(releasever)/flipper-z-f7-update-(releasever).tgz&channel=release-cfw&version=(releasever)) > ` `
+[Extra apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)e.tgz&channel=release-cfw&version=(releasever)e) > `e`
+[No apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)c.tgz&channel=release-cfw&version=(releasever)c) > `c`
+[RGB patch - only for hardware mod!](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)r.tgz&channel=release-cfw&version=(releasever)r) > `r`
+
+What ` `, `e`, `c`, `r` means? -> [versions info](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/CHANGELOG.md#what-n-r-e---c-means-what-i-need-to-download-if-i-dont-want-to-use-web-updater)
+
+**Direct tgz download links:**
+[Default](https://unleashedflip.com/fw/(releasever)/flipper-z-f7-update-(releasever).tgz) > ` ` 
+[Extra apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)e.tgz) > `e` 
+[No apps](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)c.tgz) > `c` 
+[RGB patch - only for hardware mod!](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-(releasever)r.tgz) > `r`
+

.ci_files/rgb.patch

@@ -1,5 +1,5 @@
 diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
-index 5769ced..c5d3088 100644
+index 35d2fe6..1af97e2 100644
 --- a/applications/services/notification/notification_app.c
 +++ b/applications/services/notification/notification_app.c
 @@ -9,6 +9,7 @@
@@ -10,16 +10,16 @@ index 5769ced..c5d3088 100644
  
  #define TAG "NotificationSrv"
  
-@@ -589,6 +590,7 @@ int32_t notification_srv(void* p) {
+@@ -616,6 +617,7 @@ int32_t notification_srv(void* p) {
              break;
          case SaveSettingsMessage:
              notification_save_settings(app);
 +            rgb_backlight_save_settings();
              break;
-         }
- 
+         case LoadSettingsMessage:
+             notification_load_settings(app);
 diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c
-index 1955012..19d953d 100644
+index 2462b32..8e045ce 100644
 --- a/applications/settings/notification_settings/notification_settings_app.c
 +++ b/applications/settings/notification_settings/notification_settings_app.c
 @@ -3,6 +3,7 @@
@@ -30,16 +30,16 @@ index 1955012..19d953d 100644
  
  #define MAX_NOTIFICATION_SETTINGS 4
  
-@@ -20,6 +21,8 @@ static const NotificationSequence sequence_note_c = {
-     NULL,
- };
+@@ -13,6 +14,8 @@ typedef struct {
+     VariableItemList* variable_item_list;
+ } NotificationAppSettings;
  
 +static VariableItem* temp_item;
 +
- #define CONTRAST_COUNT 11
- const char* const contrast_text[CONTRAST_COUNT] = {
-     "-5",
-@@ -156,6 +159,59 @@ static void vibro_changed(VariableItem* item) {
+ static const NotificationSequence sequence_note_c = {
+     &message_note_c5,
+     &message_delay_100,
+@@ -168,6 +171,59 @@ static void vibro_changed(VariableItem* item) {
      notification_message(app->notification, &sequence_single_vibro);
  }
  
@@ -99,7 +99,7 @@ index 1955012..19d953d 100644
  static uint32_t notification_app_settings_exit(void* context) {
      UNUSED(context);
      return VIEW_NONE;
-@@ -180,8 +236,40 @@ static NotificationAppSettings* alloc_settings() {
+@@ -192,8 +248,40 @@ static NotificationAppSettings* alloc_settings(void) {
      variable_item_set_current_value_index(item, value_index);
      variable_item_set_current_value_text(item, contrast_text[value_index]);
  
@@ -143,7 +143,7 @@ index 1955012..19d953d 100644
      variable_item_set_current_value_index(item, value_index);
 diff --git a/applications/settings/notification_settings/rgb_backlight.c b/applications/settings/notification_settings/rgb_backlight.c
 new file mode 100644
-index 0000000..98f0d3a
+index 0000000..4edd775
 --- /dev/null
 +++ b/applications/settings/notification_settings/rgb_backlight.c
 @@ -0,0 +1,217 @@
@@ -169,9 +169,9 @@ index 0000000..98f0d3a
 +#include <furi_hal.h>
 +#include <storage/storage.h>
 +
-+#define RGB_BACKLIGHT_SETTINGS_VERSION 6
++#define RGB_BACKLIGHT_SETTINGS_VERSION   6
 +#define RGB_BACKLIGHT_SETTINGS_FILE_NAME ".rgb_backlight.settings"
-+#define RGB_BACKLIGHT_SETTINGS_PATH INT_PATH(RGB_BACKLIGHT_SETTINGS_FILE_NAME)
++#define RGB_BACKLIGHT_SETTINGS_PATH      INT_PATH(RGB_BACKLIGHT_SETTINGS_FILE_NAME)
 +
 +#define COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightColor))
 +
@@ -263,7 +263,7 @@ index 0000000..98f0d3a
 +    storage_file_free(file);
 +    furi_record_close(RECORD_STORAGE);
 +    rgb_settings.settings_is_loaded = true;
-+};
++}
 +
 +void rgb_backlight_save_settings(void) {
 +    RGBBacklightSettings settings;
@@ -294,7 +294,7 @@ index 0000000..98f0d3a
 +    storage_file_close(file);
 +    storage_file_free(file);
 +    furi_record_close(RECORD_STORAGE);
-+};
++}
 +
 +RGBBacklightSettings* rgb_backlight_get_settings(void) {
 +    if(!rgb_settings.settings_is_loaded) {
@@ -366,7 +366,7 @@ index 0000000..98f0d3a
 +}
 diff --git a/applications/settings/notification_settings/rgb_backlight.h b/applications/settings/notification_settings/rgb_backlight.h
 new file mode 100644
-index 0000000..68dacda
+index 0000000..f215ed3
 --- /dev/null
 +++ b/applications/settings/notification_settings/rgb_backlight.h
 @@ -0,0 +1,91 @@
@@ -461,58 +461,9 @@ index 0000000..68dacda
 + * @return Указатель на строку с названием цвета
 + */
 +const char* rgb_backlight_get_color_text(uint8_t index);
-\ No newline at end of file
-diff --git a/firmware/targets/f7/furi_hal/furi_hal_light.c b/firmware/targets/f7/furi_hal/furi_hal_light.c
-index 83e1603..45798ca 100644
---- a/firmware/targets/f7/furi_hal/furi_hal_light.c
-+++ b/firmware/targets/f7/furi_hal/furi_hal_light.c
-@@ -3,6 +3,7 @@
- #include <furi_hal_light.h>
- #include <lp5562.h>
- #include <stdint.h>
-+#include <applications/settings/notification_settings/rgb_backlight.h>
- 
- #define LED_CURRENT_RED 50
- #define LED_CURRENT_GREEN 50
-@@ -31,22 +32,21 @@ void furi_hal_light_init() {
- }
- 
- void furi_hal_light_set(Light light, uint8_t value) {
--    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
--    if(light & LightRed) {
--        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
--    }
--    if(light & LightGreen) {
--        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
--    }
--    if(light & LightBlue) {
--        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
--    }
-     if(light & LightBacklight) {
--        uint8_t prev = lp5562_get_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelWhite);
--        lp5562_execute_ramp(
--            &furi_hal_i2c_handle_power, LP5562Engine1, LP5562ChannelWhite, prev, value, 100);
-+        rgb_backlight_update(value, false);
-+    } else {
-+        furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
-+        if(light & LightRed) {
-+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
-+        }
-+        if(light & LightGreen) {
-+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
-+        }
-+        if(light & LightBlue) {
-+            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
-+        }
-+        furi_hal_i2c_release(&furi_hal_i2c_handle_power);
-     }
--    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
- }
- 
- void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_time, uint16_t period) {
 diff --git a/lib/drivers/SK6805.c b/lib/drivers/SK6805.c
 new file mode 100644
-index 0000000..572e1df
+index 0000000..b89f82a
 --- /dev/null
 +++ b/lib/drivers/SK6805.c
 @@ -0,0 +1,101 @@
@@ -539,14 +490,14 @@ index 0000000..572e1df
 +
 +/* Настройки */
 +#define SK6805_LED_COUNT 3 //Количество светодиодов на плате подсветки
-+#define SK6805_LED_PIN &led_pin //Порт подключения светодиодов
++#define SK6805_LED_PIN   &led_pin //Порт подключения светодиодов
 +
 +#ifdef FURI_DEBUG
 +#define DEBUG_PIN &gpio_ext_pa7
 +#define DEBUG_INIT() \
 +    furi_hal_gpio_init(DEBUG_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh)
 +#define DEBUG_SET_HIGH() furi_hal_gpio_write(DEBUG_PIN, true)
-+#define DEBUG_SET_LOW() furi_hal_gpio_write(DEBUG_PIN, false)
++#define DEBUG_SET_LOW()  furi_hal_gpio_write(DEBUG_PIN, false)
 +#else
 +#define DEBUG_INIT()
 +#define DEBUG_SET_HIGH()
@@ -575,7 +526,7 @@ index 0000000..572e1df
 +
 +void SK6805_update(void) {
 +    SK6805_init();
-+    furi_kernel_lock();
++    FURI_CRITICAL_ENTER();
 +    uint32_t end;
 +    /* Последовательная отправка цветов светодиодов */
 +    for(uint8_t lednumber = 0; lednumber < SK6805_LED_COUNT; lednumber++) {
@@ -615,11 +566,11 @@ index 0000000..572e1df
 +            }
 +        }
 +    }
-+    furi_kernel_unlock();
++    FURI_CRITICAL_EXIT();
 +}
 diff --git a/lib/drivers/SK6805.h b/lib/drivers/SK6805.h
 new file mode 100644
-index 0000000..7c58956
+index 0000000..c97054f
 --- /dev/null
 +++ b/lib/drivers/SK6805.h
 @@ -0,0 +1,51 @@
@@ -674,4 +625,51 @@ index 0000000..7c58956
 +void SK6805_update(void);
 +
 +#endif /* SK6805_H_ */
-\ No newline at end of file
+diff --git a/targets/f7/furi_hal/furi_hal_light.c b/targets/f7/furi_hal/furi_hal_light.c
+index 621478d..ef15153 100644
+--- a/targets/f7/furi_hal/furi_hal_light.c
++++ b/targets/f7/furi_hal/furi_hal_light.c
+@@ -3,6 +3,7 @@
+ #include <furi_hal_light.h>
+ #include <lp5562.h>
+ #include <stdint.h>
++#include <applications/settings/notification_settings/rgb_backlight.h>
+ 
+ #define LED_CURRENT_RED   (50u)
+ #define LED_CURRENT_GREEN (50u)
+@@ -31,22 +32,21 @@ void furi_hal_light_init(void) {
+ }
+ 
+ void furi_hal_light_set(Light light, uint8_t value) {
+-    furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
+-    if(light & LightRed) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
+-    }
+-    if(light & LightGreen) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
+-    }
+-    if(light & LightBlue) {
+-        lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
+-    }
+     if(light & LightBacklight) {
+-        uint8_t prev = lp5562_get_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelWhite);
+-        lp5562_execute_ramp(
+-            &furi_hal_i2c_handle_power, LP5562Engine1, LP5562ChannelWhite, prev, value, 100);
++        rgb_backlight_update(value, false);
++    } else {
++        furi_hal_i2c_acquire(&furi_hal_i2c_handle_power);
++        if(light & LightRed) {
++            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelRed, value);
++        }
++        if(light & LightGreen) {
++            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelGreen, value);
++        }
++        if(light & LightBlue) {
++            lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value);
++        }
++        furi_hal_i2c_release(&furi_hal_i2c_handle_power);
+     }
+-    furi_hal_i2c_release(&furi_hal_i2c_handle_power);
+ }
+ 
+ void furi_hal_light_blink_start(Light light, uint8_t brightness, uint16_t on_time, uint16_t period) {

.clang-format

@@ -3,22 +3,55 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
 AlignArrayOfStructures: None
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveBitFields: None
-AlignConsecutiveDeclarations: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   true
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveShortCaseStatements:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCaseColons: false
 AlignEscapedNewlines: Left
 AlignOperands:   Align
-AlignTrailingComments: false
+AlignTrailingComments:
+  Kind:            Never
+  OverEmptyLines:  0
 AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortEnumsOnASingleLine: true
+AllowBreakBeforeNoexceptSpecifier: Never
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
-AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLoopsOnASingleLine: true
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
@@ -27,17 +60,18 @@ AttributeMacros:
   - __capability
 BinPackArguments: false
 BinPackParameters: false
+BitFieldColonSpacing: Both
 BraceWrapping:
   AfterCaseLabel:  false
   AfterClass:      false
   AfterControlStatement: Never
   AfterEnum:       false
+  AfterExternBlock: false
   AfterFunction:   false
   AfterNamespace:  false
   AfterObjCDeclaration: false
   AfterStruct:     false
   AfterUnion:      false
-  AfterExternBlock: false
   BeforeCatch:     false
   BeforeElse:      false
   BeforeLambdaBody: false
@@ -46,38 +80,35 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: true
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeComma
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Leave
 BreakAfterJavaFieldAnnotations: false
+BreakArrays:     true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeColon
 BreakStringLiterals: false
 ColumnLimit:     99
 CommentPragmas:  '^ IWYU pragma:'
-QualifierAlignment: Leave
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
-PackConstructorInitializers: BinPack
-BasedOnStyle:    ''
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-AllowAllConstructorInitializersOnNextLine: true
 FixNamespaceComments: false
 ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+  - M_EACH
 IfMacros:
   - KJ_IF_MAYBE
 IncludeBlocks:   Preserve
@@ -97,19 +128,30 @@ IncludeCategories:
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false
-IndentCaseLabels: false
 IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
 IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
-IndentRequires:  false
+IndentRequiresClause: false
 IndentWidth:     4
 IndentWrappedFunctionNames: true
+InsertBraces:    false
+InsertNewlineAtEOF: true
 InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
+KeepEmptyLinesAtEOF: false
 LambdaBodyIndentation: Signature
+LineEnding:      DeriveLF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
@@ -119,34 +161,44 @@ ObjCBlockIndentWidth: 4
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 10
 PenaltyBreakBeforeFirstCallParameter: 30
 PenaltyBreakComment: 10
 PenaltyBreakFirstLessLess: 0
 PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
 PenaltyBreakString: 10
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
 PPIndentWidth:   -1
+QualifierAlignment: Leave
 ReferenceAlignment: Pointer
 ReflowComments:  false
 RemoveBracesLLVM: false
+RemoveParentheses: Leave
+RemoveSemicolon: true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Leave
 ShortNamespaceLines: 1
+SkipMacroDefinitionBody: false
 SortIncludes:    Never
 SortJavaStaticImport: Before
-SortUsingDeclarations: false
+SortUsingDeclarations: Never
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
+SpaceBeforeJsonColon: false
 SpaceBeforeParens: Never
 SpaceBeforeParensOptions:
   AfterControlStatements: false
@@ -155,32 +207,35 @@ SpaceBeforeParensOptions:
   AfterFunctionDeclarationName: false
   AfterIfMacros:   false
   AfterOverloadedOperator: false
+  AfterPlacementOperator: true
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
   BeforeNonEmptyParentheses: false
-SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  Never
-SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
 SpacesInLineCommentPrefix:
   Minimum:         1
   Maximum:         -1
-SpacesInParentheses: false
+SpacesInParens:  Never
+SpacesInParensOptions:
+  InCStyleCasts:   false
+  InConditionalStatements: false
+  InEmptyParentheses: false
+  Other:           false
 SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
-BitFieldColonSpacing: Both
-Standard:        c++03
+Standard:        c++20
 StatementAttributeLikeMacros:
   - Q_EMIT
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth:        4
-UseCRLF:         false
 UseTab:          Never
+VerilogBreakBetweenInstancePorts: true
 WhitespaceSensitiveMacros:
   - STRINGIZE
   - PP_STRINGIZE

.clangd

@@ -0,0 +1,17 @@
+CompileFlags:
+    Add: 
+        - -Wno-unknown-warning-option
+        - -Wno-format
+    Remove: 
+        - -mword-relocations
+
+Diagnostics:
+    ClangTidy:
+        FastCheckFilter: None
+
+---
+
+If:
+    PathMatch: .*\.h
+Diagnostics:
+    UnusedIncludes: None

.drone.yml

@@ -45,7 +45,9 @@ steps:
       - export FORCE_NO_DIRTY=yes
       - export FBT_GIT_SUBMODULE_SHALLOW=1
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
-      - tar zxvf all-the-apps-base.tgz
+      - tar zxf all-the-apps-base.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - mkdir -p applications/main/clock_app/resources/apps_data
       - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
       - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
       - rm -rf base_pack_build
@@ -65,7 +67,8 @@ steps:
     pull: never
     commands:
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
-      - tar zxvf 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
       - export DIST_SUFFIX=${DRONE_TAG}e
@@ -97,74 +100,38 @@ steps:
       - mv dist/f7-C/* artifacts-rgb-patch/
       - ls -laS artifacts-rgb-patch
       - ls -laS artifacts-rgb-patch/f7-update-${DRONE_TAG}r
-    environment:
-      FBT_TOOLS_CUSTOM_LINK:
-        from_secret: fbt_link
-
-  - name: "Build with ofw anims"
-    image: hfdj/fztools
-    pull: never
-    commands:
-      - git clean -df
-      - git checkout -- .
-      - rm -f assets/dolphin/external/manifest.txt
-      - cp .ci_files/anims_ofw.txt assets/dolphin/external/manifest.txt
-      - rm -rf applications/main/clock_app/resources/apps/
-      - export DIST_SUFFIX=${DRONE_TAG}n
-      - export WORKFLOW_BRANCH_OR_TAG=no-custom-anims
-      - export FORCE_NO_DIRTY=yes
-      - export FBT_GIT_SUBMODULE_SHALLOW=1
-      - rm -f build/f7-firmware-C/toolbox/version.*
-      - ./fbt COMPACT=1 DEBUG=0 updater_package
-      - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
-      - tar zxvf all-the-apps-base.tgz
-      - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
-      - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
-      - rm -rf base_pack_build
-      - rm -rf all-the-apps-base.tgz
-      - rm -f build/f7-firmware-C/toolbox/version.*
-      - ./fbt COMPACT=1 DEBUG=0 updater_package
-      - mkdir artifacts-ofw-anims
-      - mv dist/f7-C/* artifacts-ofw-anims/
-      - ls -laS artifacts-ofw-anims
-      - ls -laS artifacts-ofw-anims/f7-update-${DRONE_TAG}n
       - sed -i 's/(version)/'${DRONE_TAG}'/g' CHANGELOG.md
-      - echo '# [Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')' >> CHANGELOG.md
+      - echo '# Install FW via Web Updater:' >> CHANGELOG.md
+      - echo '### [Default](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}') > ` `' >> CHANGELOG.md
       - echo '' >> CHANGELOG.md
-      - echo '### [Version with only main apps - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)' >> CHANGELOG.md
+      - echo '### [Extra apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e) > `e`' >> CHANGELOG.md
       - echo '' >> CHANGELOG.md
-      - echo '### [Version without custom animations - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)' >> CHANGELOG.md
+      - echo '### [No apps](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c) > `c`' >> CHANGELOG.md
       - echo '' >> CHANGELOG.md
-      - echo '### [Version with RGB patch - only for hardware mod! - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)' >> CHANGELOG.md
-      - echo '' >> CHANGELOG.md
-      - echo '## [Version with Extra apps - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)' >> CHANGELOG.md
+      - echo '### [RGB patch - only for hardware mod!](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r) > `r`' >> CHANGELOG.md
     environment:
       FBT_TOOLS_CUSTOM_LINK:
         from_secret: fbt_link
 
   - name: "Bundle self-update packages"
-    image: kramos/alpine-zip
+    image: joshkeegan/zip
     commands:
       - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.tgz .
       - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.tgz .
       - cp artifacts-clean/flipper-z-f7-update-${DRONE_TAG}c.tgz .
-      - cp artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.tgz .
       - cp artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz .
       - zip -r artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.zip artifacts-extra-apps/f7-update-${DRONE_TAG}e
       - zip -r artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.zip artifacts-rgb-patch/f7-update-${DRONE_TAG}r
       - zip -r artifacts-clean/flipper-z-f7-update-${DRONE_TAG}c.zip artifacts-clean/f7-update-${DRONE_TAG}c
-      - zip -r artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.zip artifacts-ofw-anims/f7-update-${DRONE_TAG}n
       - zip -r artifacts-default/flipper-z-f7-update-${DRONE_TAG}.zip artifacts-default/f7-update-${DRONE_TAG}
       - tar czpf artifacts-default/flipper-z-any-scripts-${DRONE_TAG}.tgz scripts
       - rm -rf artifacts-extra-apps/f7-update-${DRONE_TAG}
       - rm -rf artifacts-rgb-patch/f7-update-${DRONE_TAG}
       - rm -rf artifacts-clean/f7-update-${DRONE_TAG}
-      - rm -rf artifacts-ofw-anims/f7-update-${DRONE_TAG}
       - rm -rf artifacts-default/f7-update-${DRONE_TAG}
       - ls -laS artifacts-extra-apps
       - ls -laS artifacts-rgb-patch
       - ls -laS artifacts-clean
-      - ls -laS artifacts-ofw-anims
       - ls -laS artifacts-default
       - mv artifacts-default/ ${DRONE_TAG}
       - ls -laS ${DRONE_TAG}
@@ -190,21 +157,6 @@ steps:
         - ${DRONE_TAG}/*.dfu
         - ${DRONE_TAG}/*.bin
 
-  - name: "Upload no-anims to updates srv"
-    image: appleboy/drone-scp:linux-amd64
-    settings:
-      host:
-        from_secret: dep_host
-      username:
-        from_secret: dep_user
-      password:
-        from_secret: dep_passwd
-      port:
-        from_secret: dep_port
-      target:
-        from_secret: dep_target_noanim
-      source: flipper-z-f7-update-${DRONE_TAG}n.tgz
-
   - name: "Upload extra apps version to updates srv"
     image: appleboy/drone-scp:linux-amd64
     settings:
@@ -262,7 +214,6 @@ steps:
       files:
         - ${DRONE_TAG}/*.tgz
         - ${DRONE_TAG}/*.zip
-        - artifacts-ofw-anims/*.tgz
         - artifacts-extra-apps/*.tgz
         - artifacts-rgb-patch/*.tgz
         - artifacts-clean/*.tgz
@@ -284,51 +235,6 @@ steps:
     commands:
       - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL
 
-  - name: "Send files to telegram"
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: tgtoken
-      to:
-        from_secret: tgid
-      format: markdown
-      message: "New Unleashed firmware released!
-
-
-        Version: {{build.tag}}
-
-
-        [-> Sponsor our project](https://boosty.to/mmxdev)
-
-
-        [-Github - Changelog-](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG})
-
-
-        [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
-
-
-        [-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)
-
-
-        [-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=release-cfw&version=${DRONE_TAG})
-
-
-        [-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}c.tgz&channel=release-cfw&version=${DRONE_TAG}c)
-
-
-        [-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-${DRONE_TAG}n.tgz&channel=release-cfw&version=${DRONE_TAG}n)
-
-
-        [-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}r.tgz&channel=release-cfw&version=${DRONE_TAG}r)
-
-
-        [-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}r.tgz)
-
-
-        [-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_TAG}e.tgz&channel=release-cfw&version=${DRONE_TAG}e)"
-      document:
-        - ${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz
-
   - name: "Send discord notification"
     image: hfdj/fztools
     pull: never
@@ -336,9 +242,42 @@ steps:
       DISCORD_WEBHOOK:
         from_secret: dis_release_webhook
     commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
-      - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
+      - sed -n '/## Main changes/,/## Other changes/p' CHANGELOG.md | sed -e 's/## Main changes//' -e 's/## Other changes//' > changelogcut.txt
+      - head -c 1544 changelogcut.txt > changelogcutfin.txt
+      - truncate -s -1 changelogcutfin.txt
+      - tail -c +2 changelogcutfin.txt > changelogready.txt
+      - rm -f changelogcut.txt
+      - rm -f changelogcutfin.txt
+      - echo '' >> changelogready.txt
+      - echo '## [Read full changelog](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')' >> changelogready.txt
+      - sed -i 's/(releasever)/'${DRONE_TAG}'/g' .ci_files/release_msg_discord.txt
+      - sed -i 's/(releasever)/'${DRONE_TAG}'/g' .ci_files/release_msg_telegram.txt
+      - cp .ci_files/release_msg_telegram.txt tg_release_message.tpl
+      - ./discord.sh --title "Main changes" --description "$(jq -Rs . <changelogready.txt | cut -c 2- | rev | cut -c 2- | rev)" --timestamp --text "$(jq -Rs . <.ci_files/release_msg_discord.txt | cut -c 2- | rev | cut -c 2- | rev)" 
+
+  - name: "Send notification to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid
+      format: markdown
+      message_file: tg_release_message.tpl
+
+  - name: "Send default build to telegram"
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: tgtoken
+      to:
+        from_secret: tgid
+      format: markdown
+      message: "Default build:"
+      document:
+        - ${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz
 
   - name: "Send clean build to telegram"
     image: appleboy/drone-telegram
@@ -360,7 +299,7 @@ steps:
       to:
         from_secret: tgid
       format: markdown
-      message: "Build with extra apps pack:"
+      message: "Build with extra apps:"
       document:
         - flipper-z-f7-update-${DRONE_TAG}e.tgz
 
@@ -369,7 +308,7 @@ trigger:
     - tag
 
 node:
-  typ: haupt
+  typ: dev2
 
 ---
 kind: pipeline
@@ -420,7 +359,9 @@ steps:
       - export FORCE_NO_DIRTY=yes
       - export FBT_GIT_SUBMODULE_SHALLOW=1
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
-      - tar zxvf all-the-apps-base.tgz
+      - tar zxf all-the-apps-base.tgz
+      - mkdir -p applications/main/clock_app/resources/apps
+      - mkdir -p applications/main/clock_app/resources/apps_data
       - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
       - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
       - rm -rf base_pack_build
@@ -440,7 +381,8 @@ steps:
     pull: never
     commands:
       - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
-      - tar zxvf 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
       - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e
@@ -477,7 +419,7 @@ steps:
         from_secret: fbt_link
 
   - name: "Bundle self-update packages"
-    image: kramos/alpine-zip
+    image: joshkeegan/zip
     commands:
       - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz .
       - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz .
@@ -580,6 +522,30 @@ steps:
     commands:
       - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL
 
+  - name: "Send discord notification"
+    image: hfdj/fztools
+    pull: never
+    environment:
+      DISCORD_WEBHOOK:
+        from_secret: dis_dev_webhook
+    commands:
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
+      - chmod +x ./discord.sh
+      - sed -n '/## Main changes/,/## Other changes/p' CHANGELOG.md | sed -e 's/## Main changes//' -e 's/## Other changes//' > changelogcut.txt
+      - head -c 1544 changelogcut.txt > changelogcutfin.txt
+      - truncate -s -1 changelogcutfin.txt
+      - tail -c +2 changelogcutfin.txt > changelogready.txt
+      - rm -f changelogcut.txt
+      - rm -f changelogcutfin.txt
+      - echo '' >> changelogready.txt
+      - echo '## [Read full changelog](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/CHANGELOG.md)' >> changelogready.txt
+      - sed -i 's/(buildnum)/'${DRONE_BUILD_NUMBER}'/g' .ci_files/devbuild_msg_discord.txt
+      - sed -i 's/(commitsha)/'${DRONE_COMMIT_SHA}'/g' .ci_files/devbuild_msg_discord.txt
+      - sed -i 's/(buildnum)/'${DRONE_BUILD_NUMBER}'/g' .ci_files/devbuild_msg_telegram.txt
+      - sed -i 's/(commitsha)/'${DRONE_COMMIT_SHA}'/g' .ci_files/devbuild_msg_telegram.txt
+      - cp .ci_files/devbuild_msg_telegram.txt tg_dev_message.tpl
+      - ./discord.sh --title "Changelog" --description "$(jq -Rs . <changelogready.txt | cut -c 2- | rev | cut -c 2- | rev)" --timestamp --text "$(jq -Rs . <.ci_files/devbuild_msg_discord.txt | cut -c 2- | rev | cut -c 2- | rev)" 
+
   - name: "Send message to telegram"
     image: appleboy/drone-telegram
     settings:
@@ -588,33 +554,9 @@ steps:
       to:
         from_secret: tgid_dev
       format: markdown
-      message: "Unleashed firmware dev build successful!
+      message_file: tg_dev_message.tpl
 
-
-        Build: {{build.number}}
-
-        Commit: https://github.com/DarkFlippers/unleashed-firmware/commit/{{commit.sha}}
-
-
-
-        [-> Sponsor our project](https://boosty.to/mmxdev)
-
-
-        [-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER})
-        
-
-        [-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}c.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}c)
-        
-
-        [-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}r)
-
-
-        [-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz)
-
-
-        [-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}e)"
-
-  - name: "Send build to telegram"
+  - name: "Send default build to telegram"
     image: appleboy/drone-telegram
     settings:
       token:
@@ -622,7 +564,7 @@ steps:
       to:
         from_secret: tgid_dev
       format: markdown
-      message: "Regular Build:"
+      message: "Default Build:"
       document:
         - dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz
 
@@ -646,21 +588,10 @@ steps:
       to:
         from_secret: tgid_dev
       format: markdown
-      message: "Build with extra apps pack:"
+      message: "Build with extra apps:"
       document:
         - flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz
 
-  - name: "Send discord notification"
-    image: hfdj/fztools
-    pull: never
-    environment:
-      DISCORD_WEBHOOK:
-        from_secret: dis_dev_webhook
-    commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
-      - chmod +x ./discord.sh
-      - ./discord.sh --text 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')'
-
 trigger:
   branch:
     - dev
@@ -668,4 +599,4 @@ trigger:
     - push
 
 node:
-  typ: haupt
+  typ: dev2

.editorconfig

@@ -8,6 +8,3 @@ charset = utf-8
 [*.{cpp,h,c,py,sh}]
 indent_style = space
 indent_size = 4
-
-[{Makefile,*.mk}]
-indent_size = tab

.gitignore

@@ -12,6 +12,9 @@ compile_commands.json
 # JetBrains IDEs
 .idea/
 
+# Sublime Text
+.sublime-project.sublime-workspace
+
 # Python VirtEnvironments
 .env
 .venv
@@ -42,9 +45,6 @@ null.d
 .sconsign.dblite
 
 
-# Visual Studio Code
-/.vscode
-
 # bundle output
 /dist
 /artifacts-default
@@ -69,4 +69,7 @@ PVS-Studio.log
 
 .gdbinit
 
-/fbt_options_local.py
+/fbt_options_local.py
+
+# JS packages
+node_modules/

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "lib/mlib"]
 	path = lib/mlib
 	url = https://github.com/P-p-H-d/mlib.git
-[submodule "lib/littlefs"]
-	path = lib/littlefs
-	url = https://github.com/littlefs-project/littlefs.git
 [submodule "lib/nanopb"]
 	path = lib/nanopb
 	url = https://github.com/nanopb/nanopb.git
@@ -23,9 +20,6 @@
 [submodule "lib/mbedtls"]
 	path = lib/mbedtls
 	url = https://github.com/Mbed-TLS/mbedtls.git
-[submodule "lib/cxxheaderparser"]
-	path = lib/cxxheaderparser
-	url = https://github.com/robotpy/cxxheaderparser.git
 [submodule "lib/heatshrink"]
 	path = lib/heatshrink
 	url = https://github.com/flipperdevices/heatshrink.git

.pvsconfig

@@ -1,12 +1,14 @@
 # MLib macros we can't do much about.
 //-V:M_LET:1048,1044
 //-V:M_EACH:1048,1044
-//-V:ARRAY_DEF:760,747,568,776,729,712,654
-//-V:LIST_DEF:760,747,568,712,729,654,776
+//-V:ARRAY_DEF:760,747,568,776,729,712,654,1103
+//-V:LIST_DEF:760,747,568,712,729,654,776,1103
+//-V:LIST_DUAL_PUSH_DEF:524,760,774
 //-V:BPTREE_DEF2:779,1086,557,773,512
-//-V:DICT_DEF2:779,524,776,760,1044,1001,729,590,568,747,685
+//-V:DICT_DEF2:779,524,776,760,1044,1001,729,590,568,747,685,1103
 //-V:ALGO_DEF:1048,747,1044
 //-V:TUPLE_DEF2:524,590,1001,760
+//-V:DEQUE_DEF:658,747,760
 
 # Non-severe malloc/null pointer deref warnings
 //-V::522:2,3
@@ -42,8 +44,5 @@
 # Model-related warnings
 //-V:with_view_model:1044,1048
 
-# Functions that always return the same error code
-//-V:picopass_device_decrypt:1048
-
 # Examples
-//V_EXCLUDE_PATH applications/examples/
+//V_EXCLUDE_PATH applications/examples/

.pvsoptions

@@ -1 +1 @@
---ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
+--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/mbedtls -e lib/microtar -e lib/mlib -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e lib/mjs -e */arm-none-eabi/*

.sublime-project

@@ -0,0 +1,23 @@
+{
+    "folders":
+    [
+        {
+            "path": ".",
+        }
+    ],
+    "settings": {
+        "LSP": {
+            "clangd": {
+                "enabled": true,
+                "initializationOptions": {
+                    // Set `"binary": "custom",` option in LSP-clangd config to use toolchain clangd
+                    "custom_command": ["toolchain/current/bin/clangd"],
+                    "clangd.compile-commands-dir": "build/latest",
+                    "clangd.header-insertion": "never",
+                    "clangd.query-driver": "**/arm-none-eabi-*",
+                    "clangd.clang-tidy": true,
+                },
+            },
+        },
+   },
+}

.vscode/.gitignore

@@ -1,5 +1,3 @@
-/c_cpp_properties.json
-/extensions.json
-/launch.json
-/settings.json
-/tasks.json
+*
+!example/
+!ReadMe.md

.vscode/ReadMe.md

@@ -1,4 +1,4 @@
-# Visual Studio Code workspace for Flipper Zero
+# Visual Studio Code workspace for Flipper Zero {#vscode}
 
 ## Setup
 

.vscode/example/clangd/extensions.json

@@ -8,7 +8,8 @@
 		"amiralizadeh9480.cpp-helper",
 		"marus25.cortex-debug",
 		"zxh404.vscode-proto3",
-		"augustocdias.tasks-shell-input"
+		"augustocdias.tasks-shell-input",
+		"rioj7.command-variable"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
@@ -16,4 +17,4 @@
 		"ms-vscode.cpptools",
 		"ms-vscode.cmake-tools"
 	]
-}
+}

.vscode/example/cpptools/c_cpp_properties.json

@@ -2,30 +2,27 @@
     "configurations": [
         {
             "name": "Win32",
-            "compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
+            "compilerPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gcc.exe",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
+            "cStandard": "gnu23",
+            "cppStandard": "c++20"
         },
         {
             "name": "Linux",
-            "compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
+            "compilerPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gcc",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
+            "cStandard": "gnu23",
+            "cppStandard": "c++20"
         },
         {
             "name": "Mac",
-            "compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
+            "compilerPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gcc",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
-            "configurationProvider": "ms-vscode.cpptools",
-            "cStandard": "gnu17",
-            "cppStandard": "c++17"
+            "cStandard": "gnu23",
+            "cppStandard": "c++20"
         }
     ],
     "version": 4

.vscode/example/settings.json

@@ -1,30 +0,0 @@
-{
-    "C_Cpp.default.cStandard": "gnu17",
-    "C_Cpp.default.cppStandard": "c++17",
-    "python.formatting.provider": "black",
-    "workbench.tree.indent": 12,
-    "cortex-debug.enableTelemetry": false,
-    "cortex-debug.variableUseNaturalFormat": true,
-    "cortex-debug.showRTOS": true,
-    "cortex-debug.armToolchainPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/bin",
-    "cortex-debug.armToolchainPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin",
-    "cortex-debug.armToolchainPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin",
-    "cortex-debug.openocdPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/openocd/bin/openocd.exe",
-    "cortex-debug.openocdPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/openocd/bin/openocd",
-    "cortex-debug.openocdPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/openocd/bin/openocd",
-    "cortex-debug.gdbPath.windows": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gdb-py.bat",
-    "cortex-debug.gdbPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gdb-py",
-    "cortex-debug.gdbPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gdb-py",
-    "editor.formatOnSave": true,
-    "files.associations": {
-        "*.scons": "python",
-        "SConscript": "python",
-        "SConstruct": "python",
-        "*.fam": "python",
-    },
-    "clangd.arguments": [
-        // We might be able to tighten this a bit more to only include the correct toolchain.
-        "--query-driver=**",
-        "--compile-commands-dir=${workspaceFolder}/build/latest"
-    ]
-}

.vscode/example/settings.json.tmpl

@@ -0,0 +1,22 @@
+{
+    "workbench.tree.indent": 12,
+    "cortex-debug.enableTelemetry": false,
+    "cortex-debug.variableUseNaturalFormat": true,
+    "cortex-debug.armToolchainPath": "${workspaceFolder}/toolchain/current/bin",
+    "cortex-debug.openocdPath": "${workspaceFolder}/toolchain/current/bin/openocd",
+    "cortex-debug.gdbPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gdb-py3",
+    "editor.formatOnSave": true,
+    "files.associations": {
+        "*.scons": "python",
+        "SConscript": "python",
+        "SConstruct": "python",
+        "*.fam": "python"
+    },
+    "clangd.path": "${workspaceFolder}/toolchain/current/bin/clangd@FBT_PLATFORM_EXECUTABLE_EXT@",
+    "clangd.arguments": [
+        "--query-driver=**/arm-none-eabi-*",
+        "--compile-commands-dir=${workspaceFolder}/build/latest",
+        "--clang-tidy",
+        "--header-insertion=never"
+    ]
+}

.vscode/example/tasks.json

@@ -75,29 +75,23 @@
             "type": "shell",
             "command": "./fbt updater_all"
         },
-        {
-            "label": "[Debug] Flash (USB, w/o resources)",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt FORCE=1 flash_usb"
-        },
         {
             "label": "[Release] Flash (USB, w/o resources)",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb"
         },
+        {
+            "label": "[Debug] Flash (USB, w/o resources)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt FORCE=1 flash_usb"
+        },
         {
             "label": "[Debug:unit_tests] Flash (USB)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb"
-        },
-        {
-            "label": "[Debug] Flash (USB, with resources)",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt FORCE=1 flash_usb_full"
+            "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full"
         },
         {
             "label": "[Release] Flash (USB, with resources)",
@@ -105,18 +99,18 @@
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
         },
+        {
+            "label": "[Debug] Flash (USB, with resources)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt FORCE=1 flash_usb_full"
+        },
         {
             "label": "[Debug] Create PVS-Studio report",
             "group": "build",
             "type": "shell",
             "command": "./fbt firmware_pvs"
         },
-        {
-            "label": "[Debug] Build FAPs",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt fap_dist"
-        },
         {
             "label": "[Release] Build FAPs",
             "group": "build",
@@ -124,10 +118,10 @@
             "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
         },
         {
-            "label": "[Debug] Build App",
+            "label": "[Debug] Build FAPs",
             "group": "build",
             "type": "shell",
-            "command": "./fbt build APPSRC=${relativeFileDirname}"
+            "command": "./fbt fap_dist"
         },
         {
             "label": "[Release] Build App",
@@ -136,10 +130,10 @@
             "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
         },
         {
-            "label": "[Debug] Launch App on Flipper",
+            "label": "[Debug] Build App",
             "group": "build",
             "type": "shell",
-            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+            "command": "./fbt build APPSRC=${relativeFileDirname}"
         },
         {
             "label": "[Release] Launch App on Flipper",
@@ -147,6 +141,12 @@
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}"
         },
+        {
+            "label": "[Debug] Launch App on Flipper",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+        },
         {
             "label": "[Debug] Launch App on Flipper with Serial Console",
             "dependsOrder": "sequence",
@@ -156,18 +156,18 @@
                 "Serial Console"
             ]
         },
-        {
-            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt fap_deploy"
-        },
         {
             "label": "[Release] Build and upload all FAPs to Flipper over USB",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
         },
+        {
+            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt fap_deploy"
+        },
         {
             // Press Ctrl+] to quit
             "label": "Serial Console",
@@ -192,4 +192,4 @@
             }
         }
     ]
-}
+}

Brewfile

@@ -1,7 +0,0 @@
-cask "brew-cask/gcc-arm-embedded.rb"
-brew "protobuf"
-brew "gdb"
-brew "open-ocd"
-brew "clang-format"
-brew "dfu-util"
-brew "protobuf-c"

CHANGELOG.md

@@ -1,13 +1,38 @@
-## New changes
-* SubGHz: Add 4 more systems to Add Manually (untested!)
-* SubGHz: Add Manually fixes
-* SubGHz: Added NiceFlor-S to ignore options, removed colons. (by @G2Dolphin | PR #620)
-* Misc code cleanup
-* RGB: Fix white color on reboot, move settings, add custom color option
-* **BLE Spam app** updated to latest version (Android, Windows support) (by @Willy-JL) -> (app can be found in builds ` `, `e`, `n`, `r`)
-* OFW: Fix double arrows and add proper indication
-* OFW: SubGHz: add manually fix 12-bits is 0xFFF (or 0xFF0) CAME/NICE 12-bit
-* OFW: Fix various crashes if debug libraries used 
+## Main changes
+- Current API: 79.3
+* SubGHz: Jolly Motors support (with add manually) (Thanks @pkooiman !)
+* Power: Auto Power Off Timer (by @Dmitry422 with some fixes by @xMasterX)
+* OFW: **Fix lost BadBLE keystrokes**
+* OFW: **Add the ability to send a signal once via RPC**
+* OFW PR 4070: Infrared: increase max carrier limit (by @skotopes)
+* OFW PR 4025: Increase system stack's reserved memory size (Fix USB UART Bridge Crash) (by @Astrrra)
+* OFW: merged gsurkov/vcp_break_support branch for usb uart bridge (WIP!!!)
+* Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
+## Other changes
+* Power & Desktop: Add input events sub check & use event system for auto power off
+* OFW: Rename FuriHalDebuging.md to FuriHalDebugging.md
+* OFW: nfc: Fix MIFARE Plus detection
+* OFW: u2f: Fix leaking message digest contexts
+* OFW: nfc: Fix MFUL PWD_AUTH command creation
+* OFW: Bump cross-spawn in /applications/system/js_app/packages/create-fz-app
+* OFW: **Pipe** (new api funcs)
+* OFW: Fix invalid path errors while deploying SDK by enforcing toolchain to use UTF-8 on initial SDK Extraction
+* OFW: **Added flipper_format_write_empty_line(...)**
+* OFW: Fix skylander ID reading
+* OFW: Work around incorrect serial port handling by the OS
+* OFW: Add winter animations 
+* OFW: FBT: Don't lint JS packages
+* OFW: **Loader: Fix BusFault in handling of OOM** (was already included in previous UL release)
+* OFW: **NFC Fix ISO15693 stucking in wrong mode.**
+* OFW: Update `infrared_test.c` reference
+* OFW: **FuriThread stdin**
+* OFW: NFC: Plantain parser Last payment amount fix 
+* OFW: NFC clipper: BART station ids for San Lorenzo, Bay Fair
+* OFW: Fix typo for mf_classic_key_cahce_get_next_key() function
+<br><br>
+#### Known NFC post-refactor regressions list: 
+- Mifare Mini clones reading is broken (original mini working fine) (OFW)
+- NFC CLI was removed with refactoring (OFW) (will be back soon)
 
 ----
 
@@ -16,41 +41,41 @@
 [-> Download qFlipper (official link)](https://flipperzero.one/update)
 
 ## Please support development of the project
-|Service|Remark|Link/Wallet|
-|-|-|-|
-|**Patreon**||https://patreon.com/mmxdev|
-|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
-|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
-|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
-|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
-|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
-|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
-|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
-|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
-|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
-|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
-|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+|Service|Remark|QR Code|Link/Wallet|
+|-|-|-|-|
+|**Patreon**||<div align="center"><a href="https://github.com/user-attachments/assets/a88a90a5-28c3-40b4-864a-0c0b79494a42"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://patreon.com/mmxdev|
+|**Boosty**|patreon alternative|<div align="center"><a href="https://github.com/user-attachments/assets/893c0760-f738-42c1-acaa-916019a7bdf8"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://boosty.to/mmxdev|
+|cloudtips|only RU payments accepted|<div align="center"><a href="https://github.com/user-attachments/assets/5de31d6a-ef24-4d30-bd8e-c06af815332a"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://pay.cloudtips.ru/p/7b3e9d65|
+|YooMoney|only RU payments accepted|<div align="center"><a href="https://github.com/user-attachments/assets/33454f79-074b-4349-b453-f94fdadc3c68"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
+|USDT|(TRC20)|<div align="center"><a href="https://github.com/user-attachments/assets/0500498d-18ed-412d-a1a4-8a66d0b6f057"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
+|ETH|(BSC/ERC20-Tokens)|<div align="center"><a href="https://github.com/user-attachments/assets/0f323e98-c524-4f41-abb2-f4f1cec83ab6"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`|
+|BTC||<div align="center"><a href="https://github.com/user-attachments/assets/5a904d45-947e-4b92-9f0f-7fbaaa7b37f8"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|SOL|(Solana/Tokens)|<div align="center"><a href="https://github.com/user-attachments/assets/ab33c5e0-dd59-497b-9c91-ceb89c36b34d"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`DSgwouAEgu8iP5yr7EHHDqMNYWZxAqXWsTEeqCAXGLj8`|
+|DOGE||<div align="center"><a href="https://github.com/user-attachments/assets/2937edd0-5c85-4465-a444-14d4edb481c0"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
+|LTC||<div align="center"><a href="https://github.com/user-attachments/assets/441985fe-f028-4400-83c1-c215760c1e74"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|BCH||<div align="center"><a href="https://github.com/user-attachments/assets/7f365976-19a3-4777-b17e-4bfba5f69eff"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
+|XMR|(Monero)|<div align="center"><a href="https://github.com/user-attachments/assets/96186c06-61e7-4b4d-b716-6eaf1779bfd8"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
+|TON||<div align="center"><a href="https://github.com/user-attachments/assets/92a57e57-7462-42b7-a342-6f22c6e600c1"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`UQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmsxa`|
 
-#### Thanks to our sponsors:
-callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
+#### Thanks to our sponsors who supported project in the past and special thanks to sponsors who supports us on regular basis:
+@mishamyte, ClaraCrazy, Pathfinder [Count Zero cDc], callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
 and all other great people who supported our project and me (xMasterX), thanks to you all!
 
 
 ## **Recommended update option - Web Updater**
 
-### What `n`, `r`, `e`, ` `, `c` means? What I need to download if I don't want to use Web updater?
-What build I should download and what this name means - `flipper-z-f7-update-(version)(n / r / e / c).tgz` ? <br>
+### What `r`, `e`, ` `, `c` means? What I need to download if I don't want to use Web updater?
+What build I should download and what this name means - `flipper-z-f7-update-(version)(r / e / c).tgz` ? <br>
 `flipper-z` = for Flipper Zero device<br>
 `f7` = Hardware version - same for all flipper zero devices<br>
 `update` = Update package, contains updater, all assets (plugins, IR libs, etc.), and firmware itself<br>
 `(version)` = Firmware version<br>
-| Designation | 3 Custom Animation | [Base Apps](https://github.com/xMasterX/all-the-plugins#default-pack) | [Extra Apps](https://github.com/xMasterX/all-the-plugins#extra-pack) | ⚠️RGB mode* |
-|-----|:---:|:---:|:---:|:---:|
-| ` ` | ✅ | ✅ |  |  |
-| `c` | ✅ |  |  |  |
-| `n` |  | ✅ |  |  |
-| `e` | ✅ | ✅ | ✅ |  |
-| `r` | ✅ | ✅ | ✅ | ✅ |
+| Designation | [Base Apps](https://github.com/xMasterX/all-the-plugins#default-pack) | [Extra Apps](https://github.com/xMasterX/all-the-plugins#extra-pack) | ⚠️RGB mode* |
+|-----|:---:|:---:|:---:|
+| ` ` | ✅ |  |  |
+| `c` |  |  |  |
+| `e` | ✅ | ✅ |  |
+| `r` | ✅ | ✅ | ⚠️ |
 
 ⚠️This is [hardware mod](https://github.com/quen0n/flipperzero-firmware-rgb#readme), works only on modded flippers! do not install on non modded device!
 

ReadMe.md

@@ -1,6 +1,6 @@
 <h3 align="center">
 <a href="https://github.com/DarkFlippers/unleashed-firmware">
-<img src="https://user-images.githubusercontent.com/10697207/186202043-26947e28-b1cc-459a-8f20-ffcc7fc0c71c.png" align="center" alt="fzCUSTOM" border="0">
+<img src="https://user-images.githubusercontent.com/10697207/186202043-26947e28-b1cc-459a-8f20-ffcc7fc0c71c.png" align="center" alt="Unleashed Firmware Logo" border="0">
 </a>
 </h3>
 <div align="center" id="badges">
@@ -20,15 +20,15 @@
 
 ### Welcome to the Flipper Zero Unleashed Firmware repo! 
 
-#### **This firmware is a fork from** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)
+#### **This firmware is a fork from original (OFW) firmware** [flipperdevices/flipperzero-firmware](https://github.com/flipperdevices/flipperzero-firmware)
 
 <br>
 
-### Most stable custom firmware focused on new features and improvements of original firmware components, with almost no UI changes
+### Most stable custom firmware focused on new features and improvements of original firmware components, keeping compatibility with original firmware API and Apps
 
 <br>
 
-##### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official devs. 
+##### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official team. 
 
 
 <br>
@@ -36,32 +36,38 @@
 ## FAQ (frequently asked questions)
 [Follow this link to find answers to most asked questions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/FAQ.md)
 
-## Dev builds (unstable)
+## Our official domains
+- https://flipperunleashed.com/ -> our main web page
+- https://unleashedflip.com/ -> update server, direct .tgz update links for web updater or direct download
+
+## Dev builds (unstable) (built automatically from dev branch)
 - https://dev.unleashedflip.com/
 - https://t.me/kotnehleb
+
 ## Releases in Telegram
 - https://t.me/unleashed_fw
 
 # What's changed
 - **Sub-GHz** *lib & hal*
 	- Regional TX restrictions removed
-	- Extra Sub-GHz frequencies
+	- Extra Sub-GHz frequencies added
 	- Frequency range can be extended in settings file (Warning: It can damage Flipper's hardware)
 	- Many rolling code [protocols](https://github.com/DarkFlippers/unleashed-firmware#current-modified-and-new-sub-ghz-protocols-list) now have the ability to save & send captured signals
 	- FAAC SLH (Spa) & BFT Mitto (keeloq secure with seed) manual creation
 	- External CC1101 module support [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307)
 - **Sub-GHz** *Main App*
-	- Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+	- Save last used settings [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 	- New frequency analyzer [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
 	- Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
 	- Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
-	- New option to use timestamps + protocol name when you saving file, instead of random name - Enable in `Radio Settings -> Time in names = ON`
+	- New option to use timestamps + protocol name when you saving file, instead of random name or timestamp only - Enable in `Radio Settings -> Protocol Names = ON`
 	- Read mode UI improvements (shows time when signal was received) (by @wosk)
 	- External CC1101 module support (Hardware SPI used)
+	- External CC1101 module amplifier control (or LED control) support (enabled by default)
 	- **Hold right in received signal list to delete selected signal**
 	- **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis / Security+ 2.0 / CAME Atomo** - now you can use arrow buttons to send signal with different button code
 	-   `Add manually` menu extended with new protocols
-	- FAAC SLH, BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis)
+	- FAAC SLH, BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis, (right arrow button for other protocols))
 	- Debug mode counter increase settings (+1 -> +5, +10, default: +1)
 	- Debug PIN output settings for protocol development
 	
@@ -75,21 +81,23 @@
 	- Recompiled IR TV Universal Remote for ALL buttons
 	- Universal remotes for Projectors, Fans, A/Cs and Audio(soundbars, etc.) -> Also always updated and verified by our team
 	- Infrared -> `RCA` Protocol
-	- Infrared -> Debug TX PIN output settings
+	- Infrared -> External IR modules support (with autodetect by OFW)
 - **NFC/RFID/iButton**
-	* LFRFID/iButton Fuzzer plugins
-	* Extra Mifare Classic keys
-	* `Add manually` -> Mifare Classic with custom UID
-	* Picopass/iClass plugin (now with emulation support!) included in releases
+	* LFRFID and iButton Fuzzer plugins
+	* Add DEZ 8 display form for EM4100 (by @korden32)
+	* Extra Mifare Classic keys in system dict
+	* EMV Protocol + Public data parser (by @Leptopt1los and @wosk)
+	* NFC `Add manually` -> Mifare Classic with custom UID
+	* NFC parsers: Umarsh, Zolotaya Korona, Kazan, Metromoney, Moscow Social Card, Troika (reworked) and [many others](https://github.com/DarkFlippers/unleashed-firmware/tree/dev/applications/main/nfc/plugins/supported_cards) (by @Leptopt1los and @assasinfil)
 - **Quality of life & other features**
 	- Customizable Flipper name **Update! Now can be changed in Settings->Desktop** (by @xMasterX and @Willy-JL)
 	- Text Input UI element -> Cursor feature (by @Willy-JL)
-	- Byte Input Mini editor -> **Press UP** multiple times until the nibble editor appears
-	- Clock on Desktop -> `Settings -> Desktop -> Show Clock`
+	- Byte Input Mini editor -> **Press UP** multiple times until the nibble editor appears (by @gid9798)
+	- Clock on Desktop -> `Settings -> Desktop -> Show Clock` (by @gid9798)
 	- Battery percentage display with different styles `Settings -> Desktop -> Battery View`
 	- More games in Dummy Mode -> click or hold any of arrow buttons
 	- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107)
-	- **BadBT** plugin (BT version of BadKB) [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/main/bad_kb) - (See in Applications->Tools) - (aka BadUSB via Bluetooth)
+	- **BadKB** plugin [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/Flipper-XFW/Xtreme-Firmware/tree/dev/applications/main/bad_kb) - (See in Applications->Tools) - (aka BadUSB via Bluetooth)
 	- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
 	- Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release
 	- Other small fixes and changes throughout
@@ -98,37 +106,28 @@
 Also check the [changelog in releases](https://github.com/DarkFlippers/unleashed-firmware/releases) for latest updates!
 
 ### Current modified and new Sub-GHz protocols list:
-Thanks to Official team (to their SubGHz Developer, Skorp) for implementing decoders for these protocols in OFW.
+Thanks to Official team (to their SubGHz Developer, Skorp) for implementing support (decoder + encoder / or decode only) for these protocols in OFW.
 
-Keeloq [Not ALL systems supported for decode or emulation yet!] - [Supported manufacturers list](https://0bin.net/paste/VwR2lNJY#WH9vnPgvcp7w6zVKucFCuNREKAcOij8KsJ6vqLfMn3b)
+Keeloq [Not ALL systems supported for decode or emulation!] - [Supported manufacturers list](https://pastes.io/raw/unuj9bhe4m)
 
-Encoders or sending made by @xMasterX:
-- Nero Radio 57bit (+ 56bit encoder improvements)
-- CAME 12bit/24bit encoder fixes (Fixes now merged in OFW)
-- Keeloq: HCS101
-- Keeloq: AN-Motors
-- Keeloq: JCM Tech
-- Keeloq: MHouse
-- Keeloq: Nice Smilo
-- Keeloq: DTM Neo
-- Keeloq: FAAC RC,XT
-- Keeloq: Mutancode
-- Keeloq: Normstahl
-- Keeloq: Beninca + Allmatic
-- Keeloq: Stilmatic
-- Keeloq: CAME Space
-- Keeloq: Aprimatic (model TR and similar)
-- Keeloq: Centurion Nova (thanks Carlos !)
+Decoders/Encoders or emulation (+ programming mode) support made by @xMasterX:
+- Marantec24 (static 24 bit) with add manually support
+- GangQi (static 34 bit) with button parsing and add manually support (thanks to @mishamyte for captures and testing, thanks @Skorpionm for help)
+- Hollarm (static 42 bit) with button parsing and add manually support (thanks to @mishamyte for captures, thanks @Skorpionm for help)
+- Hay21 (dynamic 21 bit) with button parsing
+- Nero Radio 57bit (+ 56bit support)
+- CAME 12bit/24bit encoder fixes (Fixes are now merged in OFW)
+- Keeloq: Dea Mio, Genius Bravo, GSN, HCS101, AN-Motors, JCM Tech, MHouse, Nice Smilo, DTM Neo, FAAC RC,XT, Mutancode, Normstahl, Beninca + Allmatic, Stilmatic, CAME Space, Aprimatic (model TR and similar), Centurion Nova (thanks Carlos !), Hormann EcoStar, Novoferm, Sommer, Monarch (thanks @ashphx !)
 
-Encoders or sending made by @Eng1n33r(first implementation in Q2 2022) & @xMasterX (current version):
+Protocols support made by Skorp (original implementation) and @xMasterX (current version):
 - CAME Atomo -> Update! check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Nice Flor S -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-- FAAC SLH (Spa) -> Update!!! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+- FAAC SLH (Spa) -> Update!!! (Programming mode!) Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Keeloq: BFT Mitto -> Update! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Star Line
-- Security+ v1 & v2 (encoders was made in OFW)
+- Security+ v1 & v2
 
-Encoders made by @assasinfil & @xMasterX:
+Encoders made by @assasinfil and @xMasterX:
 - Somfy Telis -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
 - Somfy Keytis
 - KingGates Stylo 4k
@@ -137,47 +136,50 @@ Encoders made by @assasinfil & @xMasterX:
 
 ## Please support development of the project
 The majority of this project is developed and maintained by me, @xMasterX.
-I'm unemployed, and the only income I receive is from your donations.
 Our team is small and the guys are working on this project as much as they can solely based on the enthusiasm they have for this project and the community.
-- @gid9798 - SubGHz, Plugins, many other things
-- @assasinfil - SubGHz protocols
+- @Leptopt1los - NFC, RFID, Plugins, and many other things
+- @gid9798 - SubGHz, Plugins, many other things - currently offline :( 
+- @assasinfil - SubGHz protocols, NFC parsers
 - @Svaarich - UI design and animations
-- @amec0e & @Leptopt1los - Infrared assets
+- @amec0e - Infrared assets
 - Community moderators in Telegram, Discord, and Reddit
 - And of course our GitHub community. Your PRs are a very important part of this firmware and open-source development.
 
 The amount of work done on this project is huge and we need your support, no matter how large or small. Even if you just say, "Thank you Unleashed firmware developers!" somewhere. Doing so will help us continue our work and will help drive us to make the firmware better every time.
 Also, regarding our releases, every build has and always will be free and open-source. There will be no paywall releases or closed-source apps within the firmware. As long as I am working on this project it will never happen.
 You can support us by using links or addresses below:
-|Service|Remark|Link/Wallet|
-|-|-|-|
-|**Patreon**||https://patreon.com/mmxdev|
-|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
-|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
-|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
-|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
-|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
-|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
-|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
-|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
-|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
-|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
-|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
+|Service|Remark|QR Code|Link/Wallet|
+|-|-|-|-|
+|**Patreon**||<div align="center"><a href="https://github.com/user-attachments/assets/a88a90a5-28c3-40b4-864a-0c0b79494a42"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://patreon.com/mmxdev|
+|**Boosty**|patreon alternative|<div align="center"><a href="https://github.com/user-attachments/assets/893c0760-f738-42c1-acaa-916019a7bdf8"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://boosty.to/mmxdev|
+|cloudtips|only RU payments accepted|<div align="center"><a href="https://github.com/user-attachments/assets/5de31d6a-ef24-4d30-bd8e-c06af815332a"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://pay.cloudtips.ru/p/7b3e9d65|
+|YooMoney|only RU payments accepted|<div align="center"><a href="https://github.com/user-attachments/assets/33454f79-074b-4349-b453-f94fdadc3c68"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
+|USDT|(TRC20)|<div align="center"><a href="https://github.com/user-attachments/assets/0500498d-18ed-412d-a1a4-8a66d0b6f057"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
+|ETH|(BSC/ERC20-Tokens)|<div align="center"><a href="https://github.com/user-attachments/assets/0f323e98-c524-4f41-abb2-f4f1cec83ab6"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`|
+|BTC||<div align="center"><a href="https://github.com/user-attachments/assets/5a904d45-947e-4b92-9f0f-7fbaaa7b37f8"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|SOL|(Solana/Tokens)|<div align="center"><a href="https://github.com/user-attachments/assets/ab33c5e0-dd59-497b-9c91-ceb89c36b34d"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`DSgwouAEgu8iP5yr7EHHDqMNYWZxAqXWsTEeqCAXGLj8`|
+|DOGE||<div align="center"><a href="https://github.com/user-attachments/assets/2937edd0-5c85-4465-a444-14d4edb481c0"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
+|LTC||<div align="center"><a href="https://github.com/user-attachments/assets/441985fe-f028-4400-83c1-c215760c1e74"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|BCH||<div align="center"><a href="https://github.com/user-attachments/assets/7f365976-19a3-4777-b17e-4bfba5f69eff"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
+|XMR|(Monero)|<div align="center"><a href="https://github.com/user-attachments/assets/96186c06-61e7-4b4d-b716-6eaf1779bfd8"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
+|TON||<div align="center"><a href="https://github.com/user-attachments/assets/92a57e57-7462-42b7-a342-6f22c6e600c1"><img src="https://github.com/user-attachments/assets/da3a864d-d1c7-42cc-8a86-6fcaf26663ec" alt="QR image"/></a></div>|`UQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmsxa`|
 
 ## Community apps included
 
 ### [🎲 Download Extra plugins for Unleashed](https://github.com/xMasterX/all-the-plugins/releases/latest)
-### [List of Extra pack](https://github.com/xMasterX/all-the-plugins/tree/dev#extra-pack) | [List of Base *(Deafult)* pack](https://github.com/xMasterX/all-the-plugins/tree/dev#default-pack)
+### [List of Extra pack](https://github.com/xMasterX/all-the-plugins/tree/dev#extra-pack) | [List of Base *(Default)* pack](https://github.com/xMasterX/all-the-plugins/tree/dev#default-pack)
 
 See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xMasterX/all-the-plugins/tree/dev)
 
 ### Official Flipper Zero Apps Catalog [web version](https://lab.flipper.net/apps) or mobile app
 
 # Instructions
-## First lock official docs [docs.flipper.net](https://docs.flipper.net/)
-## [How to install](/documentation/HowToInstall.md) - [versions info](/CHANGELOG.md#recommended-update-option---web-updater): `n`,` `,`e`...
+## First look at official docs [docs.flipper.net](https://docs.flipper.net/)
+## [How to install](/documentation/HowToInstall.md) - [versions info](/CHANGELOG.md#recommended-update-option---web-updater): `r`,` `,`e`...
 ## Firmware & Development
 
+### - **Developer Documentation** - [developer.flipper.net](https://developer.flipper.net/flipperzero/doxygen)
+
 ### - **[How to build](/documentation/HowToBuild.md#how-to-build-by-yourself) | [Project-structure](#project-structure)**
 
 ### - **CLion IDE** - How to setup workspace for flipper firmware development [by Savely Krasovsky](https://krasovs.ky/2022/11/01/flipper-zero-clion.html)
@@ -196,22 +198,20 @@ See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xM
 
 ## **Sub-GHz**
 
+### - [How to use Flipper as new remote (Nice FlorS, BFT Mitto, Somfy Telis, Aprimatic, AN-Motors, etc..)](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+
 ### - External Radio: [How to connect CC1101 module](https://github.com/quen0n/flipperzero-ext-cc1101)
 
 ### - Transmission is blocked? [How to extend Sub-GHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)
 
 ### - [How to add extra Sub-GHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)
 
-### - [How to use Flipper as new remote (Nice FlorS, BFT Mitto, Somfy Telis, Aprimatic, AN-Motors, etc..)](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
-
-### - [~~Configure Sub-GHz Remote App~~](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) Not recomeded, please use embedded configurator
+### - [~~Configure Sub-GHz Remote App~~](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) Not recommended, please use embedded configurator
 
 ## **Plugins**
 
 ### - TOTP (Authenticator): [config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)
 
-### - Mifare Nested plugin: [How to recover keys](https://github.com/AloneLiberty/FlipperNested#how-to-use-it)
-
 ### - Barcode Generator: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)
 
 ### - Multi Converter: [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/MultiConverter.md)
@@ -258,6 +258,8 @@ See full list and sources here: [xMasterX/all-the-plugins](https://github.com/xM
 * Official Docs: [docs.flipper.net](https://docs.flipper.net/)
 * Official Forum: [forum.flipperzero.one](https://forum.flipperzero.one/)
 
+* Update! Developer Documentation [developer.flipper.net](https://developer.flipper.net/flipperzero/doxygen)
+
 # Project structure
 
 - `applications`    - Applications and services used in firmware

SConstruct

@@ -7,7 +7,7 @@
 # construction of certain targets behind command-line options.
 
 import os
-from fbt.util import path_as_posix
+from fbt.util import open_browser_action
 
 DefaultEnvironment(tools=[])
 
@@ -42,10 +42,11 @@ distenv = coreenv.Clone(
         "openocd",
         "blackmagic",
         "jflash",
+        "doxygen",
+        "textfile",
     ],
     ENV=os.environ,
     UPDATE_BUNDLE_DIR="dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}",
-    VSCODE_LANG_SERVER=ARGUMENTS.get("LANG_SERVER", "cpptools"),
 )
 
 firmware_env = distenv.AddFwProject(
@@ -66,6 +67,7 @@ if GetOption("fullenv") or any(
 
     # Target for self-update package
     dist_basic_arguments = [
+        "${ARGS}",
         "--bundlever",
         "${UPDATE_VERSION_STRING}",
     ]
@@ -172,17 +174,20 @@ Alias("fap_dist", fap_dist)
 
 fap_deploy = distenv.PhonyTarget(
     "fap_deploy",
-    [
+    Action(
         [
-            "${PYTHON3}",
-            "${FBT_SCRIPT_DIR}/storage.py",
-            "-p",
-            "${FLIP_PORT}",
-            "send",
-            "${SOURCE}",
-            "/ext/apps",
+            [
+                "${PYTHON3}",
+                "${FBT_SCRIPT_DIR}/storage.py",
+                "-p",
+                "${FLIP_PORT}",
+                "send",
+                "${SOURCE}",
+                "/ext/apps",
+                "${ARGS}",
+            ]
         ]
-    ],
+    ),
     source=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
 )
 Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
@@ -206,7 +211,7 @@ distenv.Alias("jflash", firmware_jflash)
 
 distenv.PhonyTarget(
     "gdb_trace_all",
-    "$GDB $GDBOPTS $SOURCES $GDBFLASH",
+    [["${GDB}", "${GDBOPTS}", "${SOURCES}", "${GDBFLASH}"]],
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
@@ -225,18 +230,19 @@ firmware_debug = distenv.PhonyTarget(
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE}",
     GDBREMOTE="${OPENOCD_GDB_PIPE}",
-    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
+    FBT_FAP_DEBUG_ELF_ROOT=firmware_env["FBT_FAP_DEBUG_ELF_ROOT"],
 )
 distenv.Depends(firmware_debug, firmware_flash)
 
-distenv.PhonyTarget(
+firmware_blackmagic = distenv.PhonyTarget(
     "blackmagic",
     "${GDBPYCOM}",
     source=firmware_env["FW_ELF"],
     GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
-    FBT_FAP_DEBUG_ELF_ROOT=path_as_posix(firmware_env.subst("$FBT_FAP_DEBUG_ELF_ROOT")),
+    FBT_FAP_DEBUG_ELF_ROOT=firmware_env["FBT_FAP_DEBUG_ELF_ROOT"],
 )
+distenv.Depends(firmware_blackmagic, firmware_flash)
 
 # Debug alien elf
 debug_other_opts = [
@@ -261,7 +267,7 @@ distenv.PhonyTarget(
 distenv.PhonyTarget(
     "debug_other_blackmagic",
     "${GDBPYCOM}",
-    GDBOPTS="${GDBOPTS_BASE}  ${GDBOPTS_BLACKMAGIC}",
+    GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
     GDBREMOTE="${BLACKMAGIC_ADDR}",
     GDBPYOPTS=debug_other_opts,
 )
@@ -270,39 +276,76 @@ distenv.PhonyTarget(
 # Just start OpenOCD
 distenv.PhonyTarget(
     "openocd",
-    "${OPENOCDCOM}",
+    [["${OPENOCDCOM}", "${ARGS}"]],
 )
 
 # Linter
 distenv.PhonyTarget(
     "lint",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py check ${LINT_SOURCES}",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/lint.py",
+            "check",
+            "${LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
 distenv.PhonyTarget(
     "format",
-    "${PYTHON3} ${FBT_SCRIPT_DIR}/lint.py format ${LINT_SOURCES}",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/lint.py",
+            "format",
+            "${LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
     LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
 )
 
-# PY_LINT_SOURCES contains recursively-built modules' SConscript files + application manifests
+# PY_LINT_SOURCES contains recursively-built modules' SConscript files
 # Here we add additional Python files residing in repo root
 firmware_env.Append(
     PY_LINT_SOURCES=[
         # Py code folders
         "site_scons",
         "scripts",
+        "applications",
+        "applications_user",
+        "assets",
+        "targets",
         # Extra files
         "SConstruct",
         "firmware.scons",
         "fbt_options.py",
-    ]
+    ],
+    IMG_LINT_SOURCES=[
+        # Image assets
+        "applications",
+        "assets",
+    ],
 )
 
 
-black_commandline = "@${PYTHON3} -m black ${PY_BLACK_ARGS} ${PY_LINT_SOURCES}"
-black_base_args = ["--include", '"\\.scons|\\.py|SConscript|SConstruct"']
+black_commandline = [
+    [
+        "@${PYTHON3}",
+        "-m",
+        "black",
+        "${PY_BLACK_ARGS}",
+        "${PY_LINT_SOURCES}",
+        "${ARGS}",
+    ]
+]
+black_base_args = [
+    "--include",
+    '"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"',
+]
 
 distenv.PhonyTarget(
     "lint_py",
@@ -322,11 +365,64 @@ distenv.PhonyTarget(
     PY_LINT_SOURCES=firmware_env["PY_LINT_SOURCES"],
 )
 
-# Start Flipper CLI via PySerial's miniterm
-distenv.PhonyTarget("cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py -p ${FLIP_PORT}")
+# Image assets linting
+distenv.PhonyTarget(
+    "lint_img",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/imglint.py",
+            "check",
+            "${IMG_LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
+    IMG_LINT_SOURCES=firmware_env["IMG_LINT_SOURCES"],
+)
 
-# Update WiFi devboard firmware
-distenv.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")
+distenv.PhonyTarget(
+    "format_img",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/imglint.py",
+            "format",
+            "${IMG_LINT_SOURCES}",
+            "${ARGS}",
+        ]
+    ],
+    IMG_LINT_SOURCES=firmware_env["IMG_LINT_SOURCES"],
+)
+
+distenv.Alias("lint_all", ["lint", "lint_py", "lint_img"])
+distenv.Alias("format_all", ["format", "format_py", "format_img"])
+
+
+# Start Flipper CLI via PySerial's miniterm
+distenv.PhonyTarget(
+    "cli",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/serial_cli.py",
+            "-p",
+            "${FLIP_PORT}",
+            "${ARGS}",
+        ]
+    ],
+)
+
+# Update WiFi devboard firmware with release channel
+distenv.PhonyTarget(
+    "devboard_flash",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/wifi_board.py",
+            "${ARGS}",
+        ]
+    ],
+)
 
 
 # Find blackmagic probe
@@ -340,26 +436,50 @@ distenv.PhonyTarget(
 distenv.PhonyTarget(
     "get_stlink",
     distenv.Action(
-        lambda **kw: distenv.GetDevices(),
+        lambda **_: distenv.GetDevices(),
         None,
     ),
 )
 
 # Prepare vscode environment
-VSCODE_LANG_SERVER = cmd_environment["LANG_SERVER"]
 vscode_dist = distenv.Install(
     "#.vscode",
     [
-        distenv.Glob("#.vscode/example/*.json"),
-        distenv.Glob(f"#.vscode/example/{VSCODE_LANG_SERVER}/*.json"),
+        distenv.Glob("#.vscode/example/*.json", exclude="*.tmpl"),
+        distenv.Glob("#.vscode/example/${LANG_SERVER}/*.json"),
     ],
 )
+for template_file in distenv.Glob("#.vscode/example/*.tmpl"):
+    vscode_dist.append(
+        distenv.Substfile(
+            distenv.Dir("#.vscode").File(template_file.name.replace(".tmpl", "")),
+            template_file,
+            SUBST_DICT={
+                "@FBT_PLATFORM_EXECUTABLE_EXT@": ".exe" if os.name == "nt" else ""
+            },
+        )
+    )
 distenv.Precious(vscode_dist)
 distenv.NoClean(vscode_dist)
-distenv.Alias("vscode_dist", vscode_dist)
+distenv.Alias("vscode_dist", (vscode_dist, firmware_env["FW_CDB"]))
 
 # Configure shell with build tools
 distenv.PhonyTarget(
     "env",
-    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
+    "@echo $( ${FBT_SCRIPT_DIR.abspath}/toolchain/fbtenv.sh $)",
 )
+
+doxy_build = distenv.DoxyBuild(
+    "documentation/doxygen/build/html/index.html",
+    "documentation/doxygen/Doxyfile-awesome.cfg",
+    doxy_env_variables={
+        "DOXY_SRC_ROOT": Dir(".").abspath,
+        "DOXY_BUILD_DIR": Dir("documentation/doxygen/build").abspath,
+        "DOXY_CONFIG_DIR": "documentation/doxygen",
+    },
+)
+distenv.Alias("doxygen", doxy_build)
+distenv.AlwaysBuild(doxy_build)
+
+# Open generated documentation in browser
+distenv.PhonyTarget("doxy", open_browser_action, source=doxy_build)

applications/ReadMe.md

@@ -40,7 +40,6 @@ Applications for main Flipper menu.
 Background services providing system APIs to applications.
 
 - `applications.h`      - Firmware application list header
-
 - `bt`                  - BLE service and application
 - `cli`                 - Console service and API
 - `crypto`              - Crypto cli tools
@@ -72,7 +71,10 @@ Small applications providing configuration for basic firmware and its services.
 
 ## system
 
-Utility apps not visible in other menus.
+Utility apps not visible in other menus, plus few external apps pre-packaged with the firmware.
 
+- `hid_app`             - BLE & USB HID remote
+- `js_app`              - JS engine runner
+- `snake_game`          - Snake game
 - `storage_move_to_sd`  - Data migration tool for internal storage
 - `updater`             - Update service & application

applications/debug/accessor/accessor_app.cpp

@@ -34,12 +34,16 @@ void AccessorApp::run(void) {
 AccessorApp::AccessorApp()
     : text_store{0} {
     notification = static_cast<NotificationApp*>(furi_record_open(RECORD_NOTIFICATION));
+    expansion = static_cast<Expansion*>(furi_record_open(RECORD_EXPANSION));
     onewire_host = onewire_host_alloc(&gpio_ibutton);
+    expansion_disable(expansion);
     furi_hal_power_enable_otg();
 }
 
 AccessorApp::~AccessorApp() {
     furi_hal_power_disable_otg();
+    expansion_enable(expansion);
+    furi_record_close(RECORD_EXPANSION);
     furi_record_close(RECORD_NOTIFICATION);
     onewire_host_free(onewire_host);
 }

applications/debug/accessor/accessor_app.h

@@ -6,34 +6,35 @@
 #include "helpers/wiegand.h"
 #include <one_wire/one_wire_host.h>
 #include <notification/notification_messages.h>
+#include <expansion/expansion.h>
 
 class AccessorApp {
 public:
     void run(void);
 
-    AccessorApp();
-    ~AccessorApp();
+    AccessorApp(void);
+    ~AccessorApp(void);
 
     enum class Scene : uint8_t {
         Exit,
         Start,
     };
 
-    AccessorAppViewManager* get_view_manager();
+    AccessorAppViewManager* get_view_manager(void);
     void switch_to_next_scene(Scene index);
     void search_and_switch_to_previous_scene(std::initializer_list<Scene> scenes_list);
     bool switch_to_previous_scene(uint8_t count = 1);
-    Scene get_previous_scene();
+    Scene get_previous_scene(void);
 
-    void notify_green_blink();
-    void notify_success();
+    void notify_green_blink(void);
+    void notify_success(void);
 
-    char* get_text_store();
-    uint8_t get_text_store_size();
+    char* get_text_store(void);
+    uint8_t get_text_store_size(void);
     void set_text_store(const char* text...);
 
-    WIEGAND* get_wiegand();
-    OneWireHost* get_one_wire();
+    WIEGAND* get_wiegand(void);
+    OneWireHost* get_one_wire(void);
 
 private:
     std::list<Scene> previous_scenes_list = {Scene::Exit};
@@ -51,4 +52,5 @@ private:
     OneWireHost* onewire_host;
 
     NotificationApp* notification;
+    Expansion* expansion;
 };

applications/debug/accessor/accessor_view_manager.cpp

@@ -1,49 +1,53 @@
 #include "accessor_view_manager.h"
 #include "accessor_event.h"
-#include <callback-connector.h>
+#include "callback_connector.h"
 
 AccessorAppViewManager::AccessorAppViewManager() {
     event_queue = furi_message_queue_alloc(10, sizeof(AccessorEvent));
 
-    view_dispatcher = view_dispatcher_alloc();
-    auto callback = cbc::obtain_connector(this, &AccessorAppViewManager::previous_view_callback);
+    view_holder = view_holder_alloc();
+    auto callback =
+        cbc::obtain_connector(this, &AccessorAppViewManager::view_holder_back_callback);
 
     // allocate views
     submenu = submenu_alloc();
-    add_view(ViewType::Submenu, submenu_get_view(submenu));
-
     popup = popup_alloc();
-    add_view(ViewType::Popup, popup_get_view(popup));
+
+    // set back callback
+    view_holder_set_back_callback(view_holder, callback, NULL);
 
     gui = static_cast<Gui*>(furi_record_open(RECORD_GUI));
-    view_dispatcher_attach_to_gui(view_dispatcher, gui, ViewDispatcherTypeFullscreen);
-
-    // set previous view callback for all views
-    view_set_previous_callback(submenu_get_view(submenu), callback);
-    view_set_previous_callback(popup_get_view(popup), callback);
+    view_holder_attach_to_gui(view_holder, gui);
 }
 
 AccessorAppViewManager::~AccessorAppViewManager() {
-    // remove views
-    view_dispatcher_remove_view(
-        view_dispatcher, static_cast<uint32_t>(AccessorAppViewManager::ViewType::Submenu));
-    view_dispatcher_remove_view(
-        view_dispatcher, static_cast<uint32_t>(AccessorAppViewManager::ViewType::Popup));
-
+    // remove current view
+    view_holder_set_view(view_holder, NULL);
     // free view modules
     furi_record_close(RECORD_GUI);
     submenu_free(submenu);
     popup_free(popup);
-
-    // free dispatcher
-    view_dispatcher_free(view_dispatcher);
-
+    // free view holder
+    view_holder_free(view_holder);
     // free event queue
     furi_message_queue_free(event_queue);
 }
 
 void AccessorAppViewManager::switch_to(ViewType type) {
-    view_dispatcher_switch_to_view(view_dispatcher, static_cast<uint32_t>(type));
+    View* view;
+
+    switch(type) {
+    case ViewType::Submenu:
+        view = submenu_get_view(submenu);
+        break;
+    case ViewType::Popup:
+        view = popup_get_view(popup);
+        break;
+    default:
+        furi_crash();
+    }
+
+    view_holder_set_view(view_holder, view);
 }
 
 Submenu* AccessorAppViewManager::get_submenu() {
@@ -65,16 +69,10 @@ void AccessorAppViewManager::send_event(AccessorEvent* event) {
     furi_check(result == FuriStatusOk);
 }
 
-uint32_t AccessorAppViewManager::previous_view_callback(void*) {
+void AccessorAppViewManager::view_holder_back_callback(void*) {
     if(event_queue != NULL) {
         AccessorEvent event;
         event.type = AccessorEvent::Type::Back;
         send_event(&event);
     }
-
-    return VIEW_IGNORE;
-}
-
-void AccessorAppViewManager::add_view(ViewType view_type, View* view) {
-    view_dispatcher_add_view(view_dispatcher, static_cast<uint32_t>(view_type), view);
 }

applications/debug/accessor/accessor_view_manager.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <furi.h>
-#include <gui/view_dispatcher.h>
+#include <gui/view_holder.h>
 #include <gui/modules/submenu.h>
 #include <gui/modules/popup.h>
 #include "accessor_event.h"
@@ -10,28 +10,26 @@ public:
     enum class ViewType : uint8_t {
         Submenu,
         Popup,
-        Tune,
     };
 
     FuriMessageQueue* event_queue;
 
-    AccessorAppViewManager();
-    ~AccessorAppViewManager();
+    AccessorAppViewManager(void);
+    ~AccessorAppViewManager(void);
 
     void switch_to(ViewType type);
 
     void receive_event(AccessorEvent* event);
     void send_event(AccessorEvent* event);
 
-    Submenu* get_submenu();
-    Popup* get_popup();
+    Submenu* get_submenu(void);
+    Popup* get_popup(void);
 
 private:
-    ViewDispatcher* view_dispatcher;
     Gui* gui;
+    ViewHolder* view_holder;
 
-    uint32_t previous_view_callback(void* context);
-    void add_view(ViewType view_type, View* view);
+    void view_holder_back_callback(void* context);
 
     // view elements
     Submenu* submenu;

applications/debug/accessor/application.fam

@@ -4,7 +4,6 @@ App(
     apptype=FlipperAppType.DEBUG,
     targets=["f7"],
     entry_point="accessor_app",
-    cdefines=["APP_ACCESSOR"],
     requires=["gui"],
     stack_size=4 * 1024,
     order=40,

applications/debug/accessor/callback_connector.h

@@ -1,10 +1,13 @@
 #ifndef CALLBACKCONNECTOR_H
 #define CALLBACKCONNECTOR_H
+
+#ifdef __cplusplus
 #include <functional>
 namespace cbc {
 namespace Details {
 
-template <std::size_t Tag, typename T, typename Ret, typename... Args> class FuncMemberWrapper {
+template <std::size_t Tag, typename T, typename Ret, typename... Args>
+class FuncMemberWrapper {
 public:
     FuncMemberWrapper() = delete;
     using member_fun_t = Ret (T::*)(Args...);
@@ -43,7 +46,8 @@ template <std::size_t Tag, typename T, typename Ret, typename... Args>
 typename FuncMemberWrapper<Tag, T, Ret, Args...>::const_member_fun_t
     FuncMemberWrapper<Tag, T, Ret, Args...>::const_member{};
 
-template <typename Functor, typename Ret, typename... Args> struct FunctorWrapper {
+template <typename Functor, typename Ret, typename... Args>
+struct FunctorWrapper {
 public:
     static std::function<Ret(Args...)> functor;
     static auto instatiate(Functor fn) {
@@ -75,7 +79,8 @@ auto const_instantiate(T* t, Ret (T::*ptr)(Args...) const) {
     return FuncMemberWrapper<tag, T, Ret, Args...>::instantiate(t, ptr);
 }
 
-template <std::size_t tag, typename T, typename Func> auto const_instantiate(T* t, Func ptr) {
+template <std::size_t tag, typename T, typename Func>
+auto const_instantiate(T* t, Func ptr) {
     return const_instantiate(t, ptr);
 }
 
@@ -91,9 +96,11 @@ auto obtain_connector(T* t, Ret (T::*ptr)(Args...) const) {
     return Details::FuncMemberWrapper<tag, T, Ret, Args...>::instantiate(t, ptr);
 }
 
-template <typename Functor> auto obtain_connector(Functor functor) {
+template <typename Functor>
+auto obtain_connector(Functor functor) {
     return Details::deducer(std::move(functor), &Functor::operator());
 }
 } //end of cbc scope
 
+#endif // __cplusplus
 #endif // CALLBACKCONNECTOR_H

applications/debug/accessor/helpers/wiegand.cpp

@@ -2,12 +2,12 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-volatile unsigned long WIEGAND::_cardTempHigh = 0;
-volatile unsigned long WIEGAND::_cardTemp = 0;
-volatile unsigned long WIEGAND::_lastWiegand = 0;
+unsigned long WIEGAND::_cardTempHigh = 0;
+unsigned long WIEGAND::_cardTemp = 0;
+unsigned long WIEGAND::_lastWiegand = 0;
 unsigned long WIEGAND::_code = 0;
 unsigned long WIEGAND::_codeHigh = 0;
-volatile int WIEGAND::_bitCount = 0;
+int WIEGAND::_bitCount = 0;
 int WIEGAND::_wiegandType = 0;
 
 constexpr uint32_t clocks_in_ms = 64 * 1000;
@@ -98,10 +98,7 @@ void WIEGAND::ReadD1() {
     _lastWiegand = DWT->CYCCNT; // Keep track of last wiegand bit received
 }
 
-unsigned long WIEGAND::GetCardId(
-    volatile unsigned long* codehigh,
-    volatile unsigned long* codelow,
-    char bitlength) {
+unsigned long WIEGAND::GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength) {
     if(bitlength == 26) // EM tag
         return (*codelow & 0x1FFFFFE) >> 1;
 

applications/debug/accessor/helpers/wiegand.h

@@ -2,28 +2,26 @@
 
 class WIEGAND {
 public:
-    WIEGAND();
-    void begin();
-    void end();
-    bool available();
-    unsigned long getCode();
-    unsigned long getCodeHigh();
-    int getWiegandType();
+    WIEGAND(void);
+    void begin(void);
+    void end(void);
+    bool available(void);
+    unsigned long getCode(void);
+    unsigned long getCodeHigh(void);
+    int getWiegandType(void);
 
-    static void ReadD0();
-    static void ReadD1();
+    static void ReadD0(void);
+    static void ReadD1(void);
 
 private:
-    static bool DoWiegandConversion();
-    static unsigned long GetCardId(
-        volatile unsigned long* codehigh,
-        volatile unsigned long* codelow,
-        char bitlength);
+    static bool DoWiegandConversion(void);
+    static unsigned long
+        GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength);
 
-    static volatile unsigned long _cardTempHigh;
-    static volatile unsigned long _cardTemp;
-    static volatile unsigned long _lastWiegand;
-    static volatile int _bitCount;
+    static unsigned long _cardTempHigh;
+    static unsigned long _cardTemp;
+    static unsigned long _lastWiegand;
+    static int _bitCount;
     static int _wiegandType;
     static unsigned long _code;
     static unsigned long _codeHigh;

applications/debug/accessor/scene/accessor_scene_start.cpp

@@ -1,7 +1,6 @@
 #include "../accessor_app.h"
 #include "../accessor_view_manager.h"
 #include "../accessor_event.h"
-#include <callback-connector.h>
 #include "accessor_scene_start.h"
 
 void AccessorSceneStart::on_enter(AccessorApp* app) {

applications/debug/battery_test_app/application.fam

@@ -3,7 +3,6 @@ App(
     name="Battery Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="battery_test_app",
-    cdefines=["APP_BATTERY_TEST"],
     requires=[
         "gui",
         "power",

applications/debug/battery_test_app/battery_test_app.c

@@ -12,7 +12,8 @@ void battery_test_dialog_callback(DialogExResult result, void* context) {
     }
 }
 
-uint32_t battery_test_exit_confirm_view() {
+uint32_t battery_test_exit_confirm_view(void* context) {
+    UNUSED(context);
     return BatteryTestAppViewExitDialog;
 }
 
@@ -31,7 +32,7 @@ static void battery_test_battery_info_update_model(void* context) {
     notification_message(app->notifications, &sequence_display_backlight_on);
 }
 
-BatteryTestApp* battery_test_alloc() {
+BatteryTestApp* battery_test_alloc(void) {
     BatteryTestApp* app = malloc(sizeof(BatteryTestApp));
 
     // Records
@@ -41,7 +42,6 @@ BatteryTestApp* battery_test_alloc() {
 
     // View dispatcher
     app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(app->view_dispatcher);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
     view_dispatcher_set_tick_event_callback(
         app->view_dispatcher, battery_test_battery_info_update_model, 500);

applications/debug/battery_test_app/views/battery_info.c

@@ -3,7 +3,7 @@
 #include <gui/elements.h>
 #include <assets_icons.h>
 
-#define LOW_CHARGE_THRESHOLD 10
+#define LOW_CHARGE_THRESHOLD         10
 #define HIGH_DRAIN_CURRENT_THRESHOLD 100
 
 struct BatteryInfo {
@@ -17,7 +17,7 @@ static void draw_stat(Canvas* canvas, int x, int y, const Icon* icon, char* val)
     canvas_draw_box(canvas, x - 4, y + 16, 24, 6);
     canvas_set_color(canvas, ColorBlack);
     canvas_draw_str_aligned(canvas, x + 8, y + 22, AlignCenter, AlignBottom, val);
-};
+}
 
 static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
     char emote[20] = {};
@@ -68,7 +68,7 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
             drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA");
     } else if(drain_current != 0) {
         snprintf(header, 20, "...");
-    } else if(data->charging_voltage < 4.2) {
+    } else if(data->charging_voltage < 4.2f) {
         // Non-default battery charging limit, mention it
         snprintf(emote, sizeof(emote), "Charged!");
         snprintf(header, sizeof(header), "Limited to");
@@ -85,7 +85,7 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
     canvas_draw_str_aligned(canvas, 92, y + 3, AlignCenter, AlignCenter, emote);
     canvas_draw_str_aligned(canvas, 92, y + 15, AlignCenter, AlignCenter, header);
     canvas_draw_str_aligned(canvas, 92, y + 27, AlignCenter, AlignCenter, value);
-};
+}
 
 static void battery_info_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
@@ -116,7 +116,7 @@ static void battery_info_draw_callback(Canvas* canvas, void* context) {
     draw_stat(canvas, 104, 42, &I_Health_16x16, health);
 }
 
-BatteryInfo* battery_info_alloc() {
+BatteryInfo* battery_info_alloc(void) {
     BatteryInfo* battery_info = malloc(sizeof(BatteryInfo));
     battery_info->view = view_alloc();
     view_set_context(battery_info->view, battery_info);

applications/debug/battery_test_app/views/battery_info.h

@@ -14,7 +14,7 @@ typedef struct {
     uint8_t health;
 } BatteryInfoModel;
 
-BatteryInfo* battery_info_alloc();
+BatteryInfo* battery_info_alloc(void);
 
 void battery_info_free(BatteryInfo* battery_info);
 

applications/debug/blink_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Blink Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="blink_test_app",
-    cdefines=["APP_BLINK"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=10,

applications/debug/blink_test/blink_test.c

@@ -1,4 +1,3 @@
-#include <core/common_defines.h>
 #include <furi.h>
 #include <furi_hal.h>
 

applications/debug/bt_debug_app/bt_debug_app.c

@@ -28,7 +28,7 @@ uint32_t bt_debug_start_view(void* context) {
     return BtDebugAppViewSubmenu;
 }
 
-BtDebugApp* bt_debug_app_alloc() {
+BtDebugApp* bt_debug_app_alloc(void) {
     BtDebugApp* app = malloc(sizeof(BtDebugApp));
 
     // Gui
@@ -36,7 +36,6 @@ BtDebugApp* bt_debug_app_alloc() {
 
     // View dispatcher
     app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(app->view_dispatcher);
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
     // Views

applications/debug/bt_debug_app/views/bt_carrier_test.c

@@ -129,7 +129,7 @@ static void bt_test_carrier_timer_callback(void* context) {
     }
 }
 
-BtCarrierTest* bt_carrier_test_alloc() {
+BtCarrierTest* bt_carrier_test_alloc(void) {
     BtCarrierTest* bt_carrier_test = malloc(sizeof(BtCarrierTest));
     bt_carrier_test->bt_test = bt_test_alloc();
     bt_test_set_context(bt_carrier_test->bt_test, bt_carrier_test);

applications/debug/bt_debug_app/views/bt_carrier_test.h

@@ -3,7 +3,7 @@
 
 typedef struct BtCarrierTest BtCarrierTest;
 
-BtCarrierTest* bt_carrier_test_alloc();
+BtCarrierTest* bt_carrier_test_alloc(void);
 
 void bt_carrier_test_free(BtCarrierTest* bt_carrier_test);
 

applications/debug/bt_debug_app/views/bt_packet_test.c

@@ -97,7 +97,7 @@ static void bt_test_packet_timer_callback(void* context) {
     }
 }
 
-BtPacketTest* bt_packet_test_alloc() {
+BtPacketTest* bt_packet_test_alloc(void) {
     BtPacketTest* bt_packet_test = malloc(sizeof(BtPacketTest));
     bt_packet_test->bt_test = bt_test_alloc();
     bt_test_set_context(bt_packet_test->bt_test, bt_packet_test);

applications/debug/bt_debug_app/views/bt_packet_test.h

@@ -3,7 +3,7 @@
 
 typedef struct BtPacketTest BtPacketTest;
 
-BtPacketTest* bt_packet_test_alloc();
+BtPacketTest* bt_packet_test_alloc(void);
 
 void bt_packet_test_free(BtPacketTest* bt_packet_test);
 

applications/debug/bt_debug_app/views/bt_test.c

@@ -39,7 +39,7 @@ typedef struct {
 } BtTestModel;
 
 #define BT_TEST_START_MESSAGE "Ok - Start"
-#define BT_TEST_STOP_MESSAGE "Ok - Stop"
+#define BT_TEST_STOP_MESSAGE  "Ok - Stop"
 
 static void bt_test_process_up(BtTest* bt_test);
 static void bt_test_process_down(BtTest* bt_test);
@@ -305,7 +305,7 @@ void bt_test_process_back(BtTest* bt_test) {
     }
 }
 
-BtTest* bt_test_alloc() {
+BtTest* bt_test_alloc(void) {
     BtTest* bt_test = malloc(sizeof(BtTest));
     bt_test->view = view_alloc();
     view_set_context(bt_test->view, bt_test);
@@ -384,8 +384,7 @@ BtTestParam* bt_test_param_add(
 
 void bt_test_set_rssi(BtTest* bt_test, float rssi) {
     furi_assert(bt_test);
-    with_view_model(
-        bt_test->view, BtTestModel * model, { model->rssi = rssi; }, true);
+    with_view_model(bt_test->view, BtTestModel * model, { model->rssi = rssi; }, true);
 }
 
 void bt_test_set_packets_tx(BtTest* bt_test, uint32_t packets_num) {

applications/debug/bt_debug_app/views/bt_test.h

@@ -12,7 +12,7 @@ typedef void (*BtTestBackCallback)(void* context);
 typedef struct BtTestParam BtTestParam;
 typedef void (*BtTestParamChangeCallback)(BtTestParam* param);
 
-BtTest* bt_test_alloc();
+BtTest* bt_test_alloc(void);
 
 void bt_test_free(BtTest* bt_test);
 

applications/debug/ccid_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="CCID Debug",
     apptype=FlipperAppType.DEBUG,
     entry_point="ccid_test_app",
-    cdefines=["CCID_TEST"],
     requires=[
         "gui",
     ],

applications/debug/ccid_test/ccid_test_app.c

@@ -7,7 +7,12 @@
 #include <gui/modules/submenu.h>
 #include <gui/gui.h>
 
-#include "iso7816_t0_apdu.h"
+#include "iso7816/iso7816_handler.h"
+#include "iso7816/iso7816_t0_apdu.h"
+#include "iso7816/iso7816_atr.h"
+#include "iso7816/iso7816_response.h"
+
+#include "ccid_test_app_commands.h"
 
 typedef enum {
     EventTypeInput,
@@ -18,6 +23,7 @@ typedef struct {
     ViewPort* view_port;
     FuriMessageQueue* event_queue;
     FuriHalUsbCcidConfig ccid_cfg;
+    Iso7816Handler* iso7816_handler;
 } CcidTestApp;
 
 typedef struct {
@@ -33,38 +39,6 @@ typedef enum {
     CcidTestSubmenuIndexInsertSmartcardReader
 } SubmenuIndex;
 
-void icc_power_on_callback(uint8_t* atrBuffer, uint32_t* atrlen, void* context) {
-    UNUSED(context);
-
-    iso7816_answer_to_reset(atrBuffer, atrlen);
-}
-
-//dataBlock points to the buffer
-//dataBlockLen tells reader how nany bytes should be read
-void xfr_datablock_callback(
-    const uint8_t* dataBlock,
-    uint32_t dataBlockLen,
-    uint8_t* responseDataBlock,
-    uint32_t* responseDataBlockLen,
-    void* context) {
-    UNUSED(context);
-
-    struct ISO7816_Command_APDU commandAPDU;
-    iso7816_read_command_apdu(&commandAPDU, dataBlock, dataBlockLen);
-
-    struct ISO7816_Response_APDU responseAPDU;
-    //class not supported
-    responseAPDU.SW1 = 0x6E;
-    responseAPDU.SW2 = 0x00;
-
-    iso7816_write_response_apdu(&responseAPDU, responseDataBlock, responseDataBlockLen);
-}
-
-static const CcidCallbacks ccid_cb = {
-    icc_power_on_callback,
-    xfr_datablock_callback,
-};
-
 static void ccid_test_app_render_callback(Canvas* canvas, void* ctx) {
     UNUSED(ctx);
     canvas_clear(canvas);
@@ -90,9 +64,18 @@ uint32_t ccid_test_exit(void* context) {
     return VIEW_NONE;
 }
 
-CcidTestApp* ccid_test_app_alloc() {
+CcidTestApp* ccid_test_app_alloc(void) {
     CcidTestApp* app = malloc(sizeof(CcidTestApp));
 
+    //setup CCID USB
+    // On linux: set VID PID using: /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
+    app->ccid_cfg.vid = 0x076B;
+    app->ccid_cfg.pid = 0x3A21;
+
+    app->iso7816_handler = iso7816_handler_alloc();
+    app->iso7816_handler->iso7816_answer_to_reset = iso7816_answer_to_reset;
+    app->iso7816_handler->iso7816_process_command = iso7816_process_command;
+
     // Gui
     app->gui = furi_record_open(RECORD_GUI);
 
@@ -103,7 +86,6 @@ CcidTestApp* ccid_test_app_alloc() {
 
     //message queue
     app->event_queue = furi_message_queue_alloc(8, sizeof(CcidTestAppEvent));
-    furi_check(app->event_queue);
     view_port_input_callback_set(app->view_port, ccid_test_app_input_callback, app->event_queue);
 
     return app;
@@ -123,6 +105,8 @@ void ccid_test_app_free(CcidTestApp* app) {
     furi_record_close(RECORD_GUI);
     app->gui = NULL;
 
+    iso7816_handler_free(app->iso7816_handler);
+
     // Free rest
     free(app);
 }
@@ -133,15 +117,12 @@ int32_t ccid_test_app(void* p) {
     //setup view
     CcidTestApp* app = ccid_test_app_alloc();
 
-    //setup CCID USB
-    // On linux: set VID PID using: /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
-    app->ccid_cfg.vid = 0x1234;
-    app->ccid_cfg.pid = 0x5678;
-
     FuriHalUsbInterface* usb_mode_prev = furi_hal_usb_get_config();
     furi_hal_usb_unlock();
-    furi_hal_ccid_set_callbacks((CcidCallbacks*)&ccid_cb);
+
     furi_check(furi_hal_usb_set_config(&usb_ccid, &app->ccid_cfg) == true);
+    iso7816_handler_set_usb_ccid_callbacks();
+    furi_hal_usb_ccid_insert_smartcard();
 
     //handle button events
     CcidTestAppEvent event;
@@ -160,8 +141,8 @@ int32_t ccid_test_app(void* p) {
     }
 
     //tear down USB
+    iso7816_handler_reset_usb_ccid_callbacks();
     furi_hal_usb_set_config(usb_mode_prev, NULL);
-    furi_hal_ccid_set_callbacks(NULL);
 
     //teardown view
     ccid_test_app_free(app);

applications/debug/ccid_test/ccid_test_app_commands.c

@@ -0,0 +1,123 @@
+#include "iso7816/iso7816_t0_apdu.h"
+#include "iso7816/iso7816_response.h"
+
+//Instruction 1: returns an OK response unconditionally
+//APDU example: 0x01:0x01:0x00:0x00
+//response: SW1=0x90, SW2=0x00
+void handle_instruction_01(ISO7816_Response_APDU* response_apdu) {
+    response_apdu->DataLen = 0;
+    iso7816_set_response(response_apdu, ISO7816_RESPONSE_OK);
+}
+
+//Instruction 2: expect command with no body, replies wit with a body with two bytes
+//APDU example: 0x01:0x02:0x00:0x00:0x02
+//response: 'bc' (0x62, 0x63) SW1=0x90, SW2=0x00
+void handle_instruction_02(
+    uint8_t p1,
+    uint8_t p2,
+    uint16_t lc,
+    uint16_t le,
+    ISO7816_Response_APDU* response_apdu) {
+    if(p1 == 0 && p2 == 0 && lc == 0 && le >= 2) {
+        response_apdu->Data[0] = 0x62;
+        response_apdu->Data[1] = 0x63;
+
+        response_apdu->DataLen = 2;
+
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_OK);
+    } else if(p1 != 0 || p2 != 0) {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_PARAMETERS_P1_P2);
+    } else {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_LENGTH);
+    }
+}
+
+//Instruction 3: sends a command with a body with two bytes, receives a response with no bytes
+//APDU example: 0x01:0x03:0x00:0x00:0x02:CA:FE
+//response SW1=0x90, SW2=0x00
+void handle_instruction_03(
+    uint8_t p1,
+    uint8_t p2,
+    uint16_t lc,
+    ISO7816_Response_APDU* response_apdu) {
+    if(p1 == 0 && p2 == 0 && lc == 2) {
+        response_apdu->DataLen = 0;
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_OK);
+    } else if(p1 != 0 || p2 != 0) {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_PARAMETERS_P1_P2);
+    } else {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_LENGTH);
+    }
+}
+
+//instruction 4: sends a command with a body with 'n' bytes, receives a response with 'n' bytes
+//APDU example: 0x01:0x04:0x00:0x00:0x04:0x01:0x02:0x03:0x04:0x04
+//receives (0x01, 0x02, 0x03, 0x04) SW1=0x90, SW2=0x00
+void handle_instruction_04(
+    uint8_t p1,
+    uint8_t p2,
+    uint16_t lc,
+    uint16_t le,
+    const uint8_t* command_apdu_data_buffer,
+    ISO7816_Response_APDU* response_apdu) {
+    if(p1 == 0 && p2 == 0 && lc > 0 && le > 0 && le >= lc) {
+        for(uint16_t i = 0; i < lc; i++) {
+            response_apdu->Data[i] = command_apdu_data_buffer[i];
+        }
+
+        response_apdu->DataLen = lc;
+
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_OK);
+    } else if(p1 != 0 || p2 != 0) {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_PARAMETERS_P1_P2);
+    } else {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_LENGTH);
+    }
+}
+
+void iso7816_answer_to_reset(Iso7816Atr* atr) {
+    //minimum valid ATR: https://smartcard-atr.apdu.fr/parse?ATR=3B+00
+    atr->TS = 0x3B;
+    atr->T0 = 0x00;
+}
+
+void iso7816_process_command(
+    const ISO7816_Command_APDU* command_apdu,
+    ISO7816_Response_APDU* response_apdu) {
+    //example 1: sends a command with no body, receives a response with no body
+    //sends APDU 0x01:0x01:0x00:0x00
+    //receives SW1=0x90, SW2=0x00
+
+    if(command_apdu->CLA == 0x01) {
+        switch(command_apdu->INS) {
+        case 0x01:
+            handle_instruction_01(response_apdu);
+            break;
+        case 0x02:
+            handle_instruction_02(
+                command_apdu->P1,
+                command_apdu->P2,
+                command_apdu->Lc,
+                command_apdu->Le,
+                response_apdu);
+            break;
+        case 0x03:
+            handle_instruction_03(
+                command_apdu->P1, command_apdu->P2, command_apdu->Lc, response_apdu);
+            break;
+        case 0x04:
+            handle_instruction_04(
+                command_apdu->P1,
+                command_apdu->P2,
+                command_apdu->Lc,
+                command_apdu->Le,
+                command_apdu->Data,
+                response_apdu);
+            break;
+        default:
+            iso7816_set_response(response_apdu, ISO7816_RESPONSE_INSTRUCTION_NOT_SUPPORTED);
+        }
+    } else {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_CLASS_NOT_SUPPORTED);
+    }
+}

applications/debug/ccid_test/ccid_test_app_commands.h

@@ -0,0 +1,7 @@
+#include "iso7816/iso7816_t0_apdu.h"
+
+void iso7816_answer_to_reset(Iso7816Atr* atr);
+
+void iso7816_process_command(
+    const ISO7816_Command_APDU* command_apdu,
+    ISO7816_Response_APDU* response_apdu);

applications/debug/ccid_test/client/ccid_client.py

@@ -0,0 +1,119 @@
+#!/usr/bin/env python
+# pylint: disable=missing-module-docstring, too-many-arguments, consider-using-f-string, missing-function-docstring
+from smartcard.System import readers
+
+
+def test_apdu(connection, test_name, apdu, expected_sw1, expected_sw2, expected_data):
+    print("Running test: [%s]" % test_name)
+    data, sw1, sw2 = connection.transmit(apdu)
+
+    failed = []
+
+    if sw1 != expected_sw1:
+        failed.append("SW1: Expected %x, actual %x" % (expected_sw1, sw1))
+
+    if sw2 != expected_sw2:
+        failed.append("SW2: Expected %x, actual %x" % (expected_sw2, sw2))
+
+    if len(data) != len(expected_data):
+        failed.append(
+            "Data: Sizes differ: Expected %x, actual %x"
+            % (len(expected_data), len(data))
+        )
+        print(data)
+    elif len(data) > 0:
+        data_matches = True
+        for i, _ in enumerate(data):
+            if data[i] != expected_data[i]:
+                data_matches = False
+
+        if not data_matches:
+            failed.append("Data: Expected %s, actual %s" % (expected_data, data))
+
+    if len(failed) > 0:
+        print("Test failed: ")
+        for failure in failed:
+            print("- %s" % failure)
+    else:
+        print("Test passed!")
+
+
+def main():
+    r = readers()
+    print("Found following smartcard readers: ")
+
+    for i, sc in enumerate(r):
+        print("[%d] %s" % (i, sc))
+
+    print("Select the smartcard reader you want to run tests against:")
+
+    reader_index = int(input())
+
+    if reader_index < len(r):
+        connection = r[reader_index].createConnection()
+
+        connection.connect()
+
+        test_apdu(
+            connection,
+            "INS 0x01: No Lc, no Data, No Le. Expect no data in return",
+            [0x01, 0x01, 0x00, 0x00],
+            0x90,
+            0x00,
+            [],
+        )
+
+        test_apdu(
+            connection,
+            "INS 0x02: No Lc, no Data, Le=2. Expect 2 byte data in return",
+            [0x01, 0x02, 0x00, 0x00, 0x02],
+            0x90,
+            0x00,
+            [0x62, 0x63],
+        )
+
+        test_apdu(
+            connection,
+            "INS 0x03: Lc=2, data=[0xCA, 0xFE], No Le. Expect no data in return",
+            [0x01, 0x03, 0x00, 0x00, 0x02, 0xCA, 0xFE],
+            0x90,
+            0x00,
+            [],
+        )
+
+        test_apdu(
+            connection,
+            "INS 0x04: Lc=2, data=[0xCA, 0xFE], Le=2. Expect 1 byte data in return",
+            [0x01, 0x04, 0x00, 0x00, 0x02, 0xCA, 0xFE, 0x02],
+            0x90,
+            0x00,
+            [0xCA, 0xFE],
+        )
+
+        small_apdu = list(range(0, 0x0F))
+
+        test_apdu(
+            connection,
+            "INS 0x04: Lc=0x0F, data=small_apdu, Le=0x0F. Expect 14 bytes data in return",
+            [0x01, 0x04, 0x00, 0x00, 0x0F] + small_apdu + [0x0F],
+            0x90,
+            0x00,
+            small_apdu,
+        )
+
+        upper_bound = 0xF0
+        max_apdu = list(range(0, upper_bound))
+
+        test_apdu(
+            connection,
+            "INS 0x04: Lc=0x%x, data=max_apdu, Le=0x%x. Expect 0x%x bytes data in return"
+            % (upper_bound, upper_bound, upper_bound),
+            [0x01, 0x04, 0x00, 0x00, upper_bound] + max_apdu + [upper_bound],
+            0x90,
+            0x00,
+            max_apdu,
+        )
+
+
+if __name__ == "__main__":
+    main()

applications/debug/ccid_test/client/requirements.txt

@@ -0,0 +1,2 @@
+pyscard
+# or sudo apt install python3-pyscard

applications/debug/ccid_test/iso7816/iso7816_atr.h

@@ -0,0 +1,6 @@
+#pragma once
+
+typedef struct {
+    uint8_t TS;
+    uint8_t T0;
+} Iso7816Atr;

applications/debug/ccid_test/iso7816/iso7816_handler.c

@@ -0,0 +1,96 @@
+// transforms low level calls such as XFRCallback or ICC Power on to a structured one
+// an application can register these calls and listen for the callbacks defined in Iso7816Callbacks
+
+#include <stdint.h>
+#include <stddef.h>
+#include <furi.h>
+#include <furi_hal.h>
+
+#include "iso7816_handler.h"
+
+#include "iso7816_t0_apdu.h"
+#include "iso7816_atr.h"
+#include "iso7816_response.h"
+
+static Iso7816Handler* iso7816_handler;
+static CcidCallbacks* ccid_callbacks;
+static uint8_t* command_apdu_buffer;
+static uint8_t* response_apdu_buffer;
+
+void iso7816_icc_power_on_callback(uint8_t* atr_data, uint32_t* atr_data_len, void* context) {
+    furi_check(context);
+
+    Iso7816Handler* handler = (Iso7816Handler*)context;
+
+    Iso7816Atr iso7816_atr;
+    handler->iso7816_answer_to_reset(&iso7816_atr);
+
+    furi_assert(iso7816_atr.T0 == 0x00);
+
+    uint8_t atr_buffer[2] = {iso7816_atr.TS, iso7816_atr.T0};
+
+    *atr_data_len = 2;
+
+    memcpy(atr_data, atr_buffer, sizeof(uint8_t) * (*atr_data_len));
+}
+
+//dataBlock points to the buffer
+//dataBlockLen tells reader how nany bytes should be read
+void iso7816_xfr_datablock_callback(
+    const uint8_t* pc_to_reader_datablock,
+    uint32_t pc_to_reader_datablock_len,
+    uint8_t* reader_to_pc_datablock,
+    uint32_t* reader_to_pc_datablock_len,
+    void* context) {
+    furi_check(context);
+
+    Iso7816Handler* handler = (Iso7816Handler*)context;
+
+    ISO7816_Response_APDU* response_apdu = (ISO7816_Response_APDU*)response_apdu_buffer;
+    ISO7816_Command_APDU* command_apdu = (ISO7816_Command_APDU*)command_apdu_buffer;
+
+    uint8_t result = iso7816_read_command_apdu(
+        command_apdu, pc_to_reader_datablock, pc_to_reader_datablock_len, CCID_SHORT_APDU_SIZE);
+
+    if(result == ISO7816_READ_COMMAND_APDU_OK) {
+        handler->iso7816_process_command(command_apdu, response_apdu);
+
+        furi_assert(response_apdu->DataLen < CCID_SHORT_APDU_SIZE);
+    } else if(result == ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LE) {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_LE);
+    } else if(result == ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LENGTH) {
+        iso7816_set_response(response_apdu, ISO7816_RESPONSE_WRONG_LENGTH);
+    }
+
+    iso7816_write_response_apdu(response_apdu, reader_to_pc_datablock, reader_to_pc_datablock_len);
+}
+
+Iso7816Handler* iso7816_handler_alloc() {
+    iso7816_handler = malloc(sizeof(Iso7816Handler));
+
+    command_apdu_buffer = malloc(sizeof(ISO7816_Command_APDU) + CCID_SHORT_APDU_SIZE);
+    response_apdu_buffer = malloc(sizeof(ISO7816_Response_APDU) + CCID_SHORT_APDU_SIZE);
+
+    ccid_callbacks = malloc(sizeof(CcidCallbacks));
+    ccid_callbacks->icc_power_on_callback = iso7816_icc_power_on_callback;
+    ccid_callbacks->xfr_datablock_callback = iso7816_xfr_datablock_callback;
+
+    return iso7816_handler;
+}
+
+void iso7816_handler_set_usb_ccid_callbacks() {
+    furi_hal_usb_ccid_set_callbacks(ccid_callbacks, iso7816_handler);
+}
+
+void iso7816_handler_reset_usb_ccid_callbacks() {
+    furi_hal_usb_ccid_set_callbacks(NULL, NULL);
+}
+
+void iso7816_handler_free(Iso7816Handler* handler) {
+    free(ccid_callbacks);
+
+    free(command_apdu_buffer);
+    free(response_apdu_buffer);
+
+    free(handler);
+}

applications/debug/ccid_test/iso7816/iso7816_handler.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <stdint.h>
+#include "iso7816_atr.h"
+#include "iso7816_t0_apdu.h"
+
+typedef struct {
+    void (*iso7816_answer_to_reset)(Iso7816Atr* atr);
+    void (*iso7816_process_command)(
+        const ISO7816_Command_APDU* command,
+        ISO7816_Response_APDU* response);
+} Iso7816Handler;
+
+Iso7816Handler* iso7816_handler_alloc();
+
+void iso7816_handler_free(Iso7816Handler* handler);
+void iso7816_handler_set_usb_ccid_callbacks();
+void iso7816_handler_reset_usb_ccid_callbacks();

applications/debug/ccid_test/iso7816/iso7816_response.c

@@ -0,0 +1,8 @@
+#include <stdint.h>
+#include "iso7816_t0_apdu.h"
+#include "iso7816_response.h"
+
+void iso7816_set_response(ISO7816_Response_APDU* responseAPDU, uint16_t responseCode) {
+    responseAPDU->SW1 = (responseCode >> (8 * 1)) & 0xff;
+    responseAPDU->SW2 = (responseCode >> (8 * 0)) & 0xff;
+}

applications/debug/ccid_test/iso7816/iso7816_response.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#define ISO7816_RESPONSE_OK 0x9000
+
+#define ISO7816_RESPONSE_WRONG_LENGTH              0x6700
+#define ISO7816_RESPONSE_WRONG_PARAMETERS_P1_P2    0x6A00
+#define ISO7816_RESPONSE_WRONG_LE                  0x6C00
+#define ISO7816_RESPONSE_INSTRUCTION_NOT_SUPPORTED 0x6D00
+#define ISO7816_RESPONSE_CLASS_NOT_SUPPORTED       0x6E00
+#define ISO7816_RESPONSE_INTERNAL_EXCEPTION        0x6F00
+
+void iso7816_set_response(ISO7816_Response_APDU* responseAPDU, uint16_t responseCode);

applications/debug/ccid_test/iso7816/iso7816_t0_apdu.c

@@ -0,0 +1,84 @@
+/* Implements rudimentary iso7816-3 support for APDU (T=0) */
+#include <stdint.h>
+#include <string.h>
+#include "iso7816_t0_apdu.h"
+
+//reads pc_to_reader_datablock_len with pc_to_reader_datablock_len size, translate it into a ISO7816_Command_APDU type
+//extra data will be pointed to commandDataBuffer
+uint8_t iso7816_read_command_apdu(
+    ISO7816_Command_APDU* command,
+    const uint8_t* pc_to_reader_datablock,
+    uint32_t pc_to_reader_datablock_len,
+    uint32_t max_apdu_size) {
+    command->CLA = pc_to_reader_datablock[0];
+    command->INS = pc_to_reader_datablock[1];
+    command->P1 = pc_to_reader_datablock[2];
+    command->P2 = pc_to_reader_datablock[3];
+
+    if(pc_to_reader_datablock_len == 4) {
+        command->Lc = 0;
+        command->Le = 0;
+        command->LePresent = false;
+
+        return ISO7816_READ_COMMAND_APDU_OK;
+    } else if(pc_to_reader_datablock_len == 5) {
+        //short le
+
+        command->Lc = 0;
+        command->Le = pc_to_reader_datablock[4];
+        command->LePresent = true;
+
+        return ISO7816_READ_COMMAND_APDU_OK;
+    } else if(pc_to_reader_datablock_len > 5 && pc_to_reader_datablock[4] != 0x00) {
+        //short lc
+
+        command->Lc = pc_to_reader_datablock[4];
+        if(command->Lc > 0 && command->Lc < max_apdu_size) { //-V560
+            memcpy(command->Data, &pc_to_reader_datablock[5], command->Lc);
+
+            //does it have a short le too?
+            if(pc_to_reader_datablock_len == (uint32_t)(command->Lc + 5)) {
+                command->Le = 0;
+                command->LePresent = false;
+                return ISO7816_READ_COMMAND_APDU_OK;
+            } else if(pc_to_reader_datablock_len == (uint32_t)(command->Lc + 6)) {
+                command->Le = pc_to_reader_datablock[pc_to_reader_datablock_len - 1];
+                command->LePresent = true;
+
+                return ISO7816_READ_COMMAND_APDU_OK;
+            } else {
+                return ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LENGTH;
+            }
+        } else {
+            return ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LENGTH;
+        }
+    } else {
+        return ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LENGTH;
+    }
+}
+
+//data buffer contains the whole APU response (response + trailer (SW1+SW2))
+void iso7816_write_response_apdu(
+    const ISO7816_Response_APDU* response,
+    uint8_t* reader_to_pc_datablock,
+    uint32_t* reader_to_pc_datablock_len) {
+    uint32_t responseDataBufferIndex = 0;
+
+    //response body
+    if(response->DataLen > 0) {
+        while(responseDataBufferIndex < response->DataLen) {
+            reader_to_pc_datablock[responseDataBufferIndex] =
+                response->Data[responseDataBufferIndex];
+            responseDataBufferIndex++;
+        }
+    }
+
+    //trailer
+    reader_to_pc_datablock[responseDataBufferIndex] = response->SW1;
+    responseDataBufferIndex++;
+
+    reader_to_pc_datablock[responseDataBufferIndex] = response->SW2;
+    responseDataBufferIndex++;
+
+    *reader_to_pc_datablock_len = responseDataBufferIndex;
+}

applications/debug/ccid_test/iso7816/iso7816_t0_apdu.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <stdint.h>
+#include "iso7816_atr.h"
+#include "core/common_defines.h"
+
+#define ISO7816_READ_COMMAND_APDU_OK                 0
+#define ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LE     1
+#define ISO7816_READ_COMMAND_APDU_ERROR_WRONG_LENGTH 2
+
+typedef struct {
+    //header
+    uint8_t CLA;
+    uint8_t INS;
+    uint8_t P1;
+    uint8_t P2;
+
+    //body
+    uint16_t Lc; //data length
+    uint16_t Le; //maximum response data length expected by client
+
+    //Le can have value of 0x00, which actually meand 0x100 = 256
+    bool LePresent;
+    uint8_t Data[0];
+} FURI_PACKED ISO7816_Command_APDU;
+
+typedef struct {
+    uint8_t SW1;
+    uint8_t SW2;
+    uint16_t DataLen;
+    uint8_t Data[0];
+} FURI_PACKED ISO7816_Response_APDU;
+
+uint8_t iso7816_read_command_apdu(
+    ISO7816_Command_APDU* command,
+    const uint8_t* pc_to_reader_datablock,
+    uint32_t pc_to_reader_datablock_len,
+    uint32_t max_apdu_size);
+void iso7816_write_response_apdu(
+    const ISO7816_Response_APDU* response,
+    uint8_t* reader_to_pc_datablock,
+    uint32_t* reader_to_pc_datablock_len);

applications/debug/ccid_test/iso7816_t0_apdu.c

@@ -1,37 +0,0 @@
-/* Implements rudimentary iso7816-3 support for APDU (T=0) */
-#include <stdint.h>
-#include <string.h>
-#include <furi.h>
-#include "iso7816_t0_apdu.h"
-
-void iso7816_answer_to_reset(uint8_t* dataBuffer, uint32_t* atrlen) {
-    //minimum valid ATR: https://smartcard-atr.apdu.fr/parse?ATR=3B+00
-    uint8_t AtrBuffer[2] = {
-        0x3B, //TS (direct convention)
-        0x00 // T0 (Y(1): b0000, K: 0 (historical bytes))
-    };
-    *atrlen = 2;
-
-    memcpy(dataBuffer, AtrBuffer, sizeof(uint8_t) * (*atrlen));
-}
-
-void iso7816_read_command_apdu(
-    struct ISO7816_Command_APDU* command,
-    const uint8_t* dataBuffer,
-    uint32_t dataLen) {
-    UNUSED(dataLen);
-    command->CLA = dataBuffer[0];
-    command->INS = dataBuffer[1];
-    command->P1 = dataBuffer[2];
-    command->P2 = dataBuffer[3];
-    command->Lc = dataBuffer[4];
-}
-
-void iso7816_write_response_apdu(
-    const struct ISO7816_Response_APDU* response,
-    uint8_t* dataBuffer,
-    uint32_t* dataLen) {
-    dataBuffer[0] = response->SW1;
-    dataBuffer[1] = response->SW2;
-    *dataLen = 2;
-}

applications/debug/ccid_test/iso7816_t0_apdu.h

@@ -1,32 +0,0 @@
-#ifndef _ISO7816_T0_APDU_H_
-#define _ISO7816_T0_APDU_H_
-
-#include <stdint.h>
-
-struct ISO7816_Command_APDU {
-    //header
-    uint8_t CLA;
-    uint8_t INS;
-    uint8_t P1;
-    uint8_t P2;
-
-    //body
-    uint8_t Lc;
-    uint8_t Le;
-} __attribute__((packed));
-
-struct ISO7816_Response_APDU {
-    uint8_t SW1;
-    uint8_t SW2;
-} __attribute__((packed));
-
-void iso7816_answer_to_reset(uint8_t* atrBuffer, uint32_t* atrlen);
-void iso7816_read_command_apdu(
-    struct ISO7816_Command_APDU* command,
-    const uint8_t* dataBuffer,
-    uint32_t dataLen);
-void iso7816_write_response_apdu(
-    const struct ISO7816_Response_APDU* response,
-    uint8_t* dataBuffer,
-    uint32_t* dataLen);
-#endif //_ISO7816_T0_APDU_H_

applications/debug/crash_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Crash Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="crash_test_app",
-    cdefines=["APP_CRASH_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     fap_category="Debug",

applications/debug/crash_test/crash_test.c

@@ -50,7 +50,7 @@ static void crash_test_submenu_callback(void* context, uint32_t index) {
         furi_halt("Crash test: furi_halt");
         break;
     default:
-        furi_crash("Programming error");
+        furi_crash();
     }
 }
 
@@ -59,14 +59,13 @@ static uint32_t crash_test_exit_callback(void* context) {
     return VIEW_NONE;
 }
 
-CrashTest* crash_test_alloc() {
+CrashTest* crash_test_alloc(void) {
     CrashTest* instance = malloc(sizeof(CrashTest));
 
     View* view = NULL;
 
     instance->gui = furi_record_open(RECORD_GUI);
     instance->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(instance->view_dispatcher);
     view_dispatcher_attach_to_gui(
         instance->view_dispatcher, instance->gui, ViewDispatcherTypeFullscreen);
 

applications/debug/direct_draw/direct_draw.c

@@ -1,6 +1,5 @@
 #include <furi.h>
 #include <gui/gui.h>
-#include <gui/canvas_i.h>
 #include <input/input.h>
 
 #define BUFFER_SIZE (32U)
@@ -26,7 +25,7 @@ static void gui_input_events_callback(const void* value, void* ctx) {
     }
 }
 
-static DirectDraw* direct_draw_alloc() {
+static DirectDraw* direct_draw_alloc(void) {
     DirectDraw* instance = malloc(sizeof(DirectDraw));
 
     instance->input = furi_record_open(RECORD_INPUT_EVENTS);
@@ -42,10 +41,11 @@ static DirectDraw* direct_draw_alloc() {
 static void direct_draw_free(DirectDraw* instance) {
     furi_pubsub_unsubscribe(instance->input, instance->input_subscription);
 
-    instance->canvas = NULL;
     gui_direct_draw_release(instance->gui);
     furi_record_close(RECORD_GUI);
     furi_record_close(RECORD_INPUT_EVENTS);
+
+    free(instance);
 }
 
 static void direct_draw_block(Canvas* canvas, uint32_t size, uint32_t counter) {

applications/debug/display_test/application.fam

@@ -3,9 +3,8 @@ App(
     name="Display Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="display_test_app",
-    cdefines=["APP_DISPLAY_TEST"],
     requires=["gui"],
-    fap_libs=["misc"],
+    fap_libs=["u8g2"],
     stack_size=1 * 1024,
     order=120,
     fap_category="Debug",

applications/debug/display_test/display_test.c

@@ -1,5 +1,3 @@
-#include "display_test.h"
-
 #include <furi_hal.h>
 #include <furi.h>
 
@@ -121,14 +119,13 @@ static void display_config_set_contrast(VariableItem* item) {
     display_test_reload_config(instance);
 }
 
-DisplayTest* display_test_alloc() {
+DisplayTest* display_test_alloc(void) {
     DisplayTest* instance = malloc(sizeof(DisplayTest));
 
     View* view = NULL;
 
     instance->gui = furi_record_open(RECORD_GUI);
     instance->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(instance->view_dispatcher);
     view_dispatcher_attach_to_gui(
         instance->view_dispatcher, instance->gui, ViewDispatcherTypeFullscreen);
 

applications/debug/display_test/display_test.h

@@ -1 +0,0 @@
-#pragma once

applications/debug/display_test/view_display_test.c

@@ -150,11 +150,10 @@ static void view_display_test_exit(void* context) {
 
 static void view_display_test_timer_callback(void* context) {
     ViewDisplayTest* instance = context;
-    with_view_model(
-        instance->view, ViewDisplayTestModel * model, { model->counter++; }, true);
+    with_view_model(instance->view, ViewDisplayTestModel * model, { model->counter++; }, true);
 }
 
-ViewDisplayTest* view_display_test_alloc() {
+ViewDisplayTest* view_display_test_alloc(void) {
     ViewDisplayTest* instance = malloc(sizeof(ViewDisplayTest));
 
     instance->view = view_alloc();

applications/debug/display_test/view_display_test.h

@@ -5,7 +5,7 @@
 
 typedef struct ViewDisplayTest ViewDisplayTest;
 
-ViewDisplayTest* view_display_test_alloc();
+ViewDisplayTest* view_display_test_alloc(void);
 
 void view_display_test_free(ViewDisplayTest* instance);
 

applications/debug/event_loop_blink_test/application.fam

@@ -0,0 +1,10 @@
+App(
+    appid="event_loop_blink_test",
+    name="Event Loop Blink Test",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="event_loop_blink_test_app",
+    requires=["input"],
+    stack_size=1 * 1024,
+    order=20,
+    fap_category="Debug",
+)

applications/debug/event_loop_blink_test/event_loop_blink_test.c

@@ -0,0 +1,168 @@
+#include <furi.h>
+#include <furi_hal_resources.h>
+
+#include <gui/gui.h>
+#include <gui/elements.h>
+#include <gui/view_port.h>
+
+#include <input/input.h>
+
+#define TAG "EventLoopBlinkTest"
+
+#define TIMER_COUNT (6U)
+
+typedef struct {
+    FuriEventLoop* event_loop;
+    FuriMessageQueue* input_queue;
+    FuriEventLoopTimer* timers[TIMER_COUNT];
+} EventLoopBlinkTestApp;
+
+static const GpioPin* blink_gpio_pins[] = {
+    &gpio_ext_pa7,
+    &gpio_ext_pa6,
+    &gpio_ext_pa4,
+    &gpio_ext_pb3,
+    &gpio_ext_pb2,
+    &gpio_ext_pc3,
+};
+
+static_assert(COUNT_OF(blink_gpio_pins) == TIMER_COUNT);
+
+static const uint32_t timer_intervals[] = {
+    25,
+    50,
+    100,
+    200,
+    400,
+    800,
+};
+
+static_assert(COUNT_OF(timer_intervals) == TIMER_COUNT);
+
+static void blink_gpio_init(void) {
+    for(size_t i = 0; i < TIMER_COUNT; ++i) {
+        furi_hal_gpio_init_simple(blink_gpio_pins[i], GpioModeOutputPushPull);
+        furi_hal_gpio_write(blink_gpio_pins[i], false);
+    }
+
+    furi_hal_gpio_init_simple(&gpio_ext_pc0, GpioModeOutputPushPull);
+    furi_hal_gpio_write(&gpio_ext_pc0, false);
+}
+
+static void blink_gpio_deinit(void) {
+    for(size_t i = 0; i < TIMER_COUNT; ++i) {
+        furi_hal_gpio_write(blink_gpio_pins[i], false);
+        furi_hal_gpio_init_simple(blink_gpio_pins[i], GpioModeAnalog);
+    }
+
+    furi_hal_gpio_write(&gpio_ext_pc0, false);
+    furi_hal_gpio_init_simple(&gpio_ext_pc0, GpioModeAnalog);
+}
+
+static void view_port_draw_callback(Canvas* canvas, void* context) {
+    UNUSED(context);
+    canvas_clear(canvas);
+    elements_text_box(
+        canvas,
+        0,
+        0,
+        canvas_width(canvas),
+        canvas_height(canvas),
+        AlignCenter,
+        AlignCenter,
+        "\e#Event Loop Timers Test\e#\n"
+        "Press buttons\n"
+        "to enable or disable timers\n"
+        "\e#Exit\e# = long press \e#Back\e#",
+        false);
+}
+
+static void view_port_input_callback(InputEvent* input_event, void* context) {
+    EventLoopBlinkTestApp* app = context;
+    furi_message_queue_put(app->input_queue, input_event, 0);
+}
+
+static void input_queue_callback(FuriEventLoopObject* object, void* context) {
+    FuriMessageQueue* queue = object;
+    EventLoopBlinkTestApp* app = context;
+
+    InputEvent event;
+    FuriStatus status = furi_message_queue_get(queue, &event, 0);
+    furi_assert(status == FuriStatusOk);
+
+    if(event.type == InputTypeShort) {
+        const size_t timer_idx = event.key;
+        furi_assert(timer_idx < TIMER_COUNT);
+
+        FuriEventLoopTimer* timer = app->timers[timer_idx];
+
+        if(furi_event_loop_timer_is_running(timer)) {
+            furi_event_loop_timer_stop(timer);
+        } else {
+            furi_event_loop_timer_restart(timer);
+        }
+
+    } else if(event.type == InputTypeLong) {
+        if(event.key == InputKeyBack) {
+            furi_event_loop_stop(app->event_loop);
+        }
+    }
+}
+
+static void blink_timer_callback(void* context) {
+    const GpioPin* gpio = blink_gpio_pins[(size_t)context];
+    furi_hal_gpio_write(gpio, !furi_hal_gpio_read(gpio));
+}
+
+static void event_loop_tick_callback(void* context) {
+    UNUSED(context);
+    furi_hal_gpio_write(&gpio_ext_pc0, !furi_hal_gpio_read(&gpio_ext_pc0));
+}
+
+int32_t event_loop_blink_test_app(void* arg) {
+    UNUSED(arg);
+
+    blink_gpio_init();
+
+    EventLoopBlinkTestApp app;
+
+    app.event_loop = furi_event_loop_alloc();
+    app.input_queue = furi_message_queue_alloc(3, sizeof(InputEvent));
+
+    for(size_t i = 0; i < TIMER_COUNT; ++i) {
+        app.timers[i] = furi_event_loop_timer_alloc(
+            app.event_loop, blink_timer_callback, FuriEventLoopTimerTypePeriodic, (void*)i);
+        furi_event_loop_timer_start(app.timers[i], timer_intervals[i]);
+    }
+
+    ViewPort* view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, view_port_draw_callback, &app);
+    view_port_input_callback_set(view_port, view_port_input_callback, &app);
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+
+    furi_event_loop_tick_set(app.event_loop, 500, event_loop_tick_callback, &app);
+    furi_event_loop_subscribe_message_queue(
+        app.event_loop, app.input_queue, FuriEventLoopEventIn, input_queue_callback, &app);
+
+    furi_event_loop_run(app.event_loop);
+
+    gui_remove_view_port(gui, view_port);
+    view_port_free(view_port);
+
+    furi_record_close(RECORD_GUI);
+
+    furi_event_loop_unsubscribe(app.event_loop, app.input_queue);
+    furi_message_queue_free(app.input_queue);
+
+    for(size_t i = 0; i < TIMER_COUNT; ++i) {
+        furi_event_loop_timer_free(app.timers[i]);
+    }
+
+    furi_event_loop_free(app.event_loop);
+
+    blink_gpio_deinit();
+
+    return 0;
+}

applications/debug/example_custom_font/example_custom_font.c

@@ -1,98 +0,0 @@
-#include <furi.h>
-#include <furi_hal.h>
-
-#include <gui/gui.h>
-#include <input/input.h>
-
-//This arrays contains the font itself. You can use any u8g2 font you want
-
-/*
-Fontname: -Raccoon-Fixed4x6-Medium-R-Normal--6-60-75-75-P-40-ISO10646-1
-Copyright: 
-Glyphs: 95/203
-BBX Build Mode: 0
-*/
-const uint8_t u8g2_font_tom_thumb_4x6_tr[725] =
-    "_\0\2\2\2\3\3\4\4\3\6\0\377\5\377\5\0\0\352\1\330\2\270 \5\340\315\0!\6\265\310"
-    "\254\0\42\6\213\313$\25#\10\227\310\244\241\206\12$\10\227\310\215\70b\2%\10\227\310d\324F\1"
-    "&\10\227\310(\65R\22'\5\251\313\10(\6\266\310\251\62)\10\226\310\304\224\24\0*\6\217\312\244"
-    "\16+\7\217\311\245\225\0,\6\212\310)\0-\5\207\312\14.\5\245\310\4/\7\227\310Ve\4\60"
-    "\7\227\310-k\1\61\6\226\310\255\6\62\10\227\310h\220\312\1\63\11\227\310h\220\62X\0\64\10\227"
-    "\310$\65b\1\65\10\227\310\214\250\301\2\66\10\227\310\315\221F\0\67\10\227\310\314TF\0\70\10\227"
-    "\310\214\64\324\10\71\10\227\310\214\64\342\2:\6\255\311\244\0;\7\222\310e\240\0<\10\227\310\246\32"
-    "d\20=\6\217\311l\60>\11\227\310d\220A*\1\77\10\227\310\314\224a\2@\10\227\310UC\3"
-    "\1A\10\227\310UC\251\0B\10\227\310\250\264\322\2C\7\227\310\315\32\10D\10\227\310\250d-\0"
-    "E\10\227\310\214\70\342\0F\10\227\310\214\70b\4G\10\227\310\315\221\222\0H\10\227\310$\65\224\12"
-    "I\7\227\310\254X\15J\7\227\310\226\252\2K\10\227\310$\265\222\12L\7\227\310\304\346\0M\10\227"
-    "\310\244\61\224\12N\10\227\310\244q\250\0O\7\227\310UV\5P\10\227\310\250\264b\4Q\10\227\310"
-    "Uj$\1R\10\227\310\250\64V\1S\10\227\310m\220\301\2T\7\227\310\254\330\2U\7\227\310$"
-    "W\22V\10\227\310$\253L\0W\10\227\310$\65\206\12X\10\227\310$\325R\1Y\10\227\310$U"
-    "V\0Z\7\227\310\314T\16[\7\227\310\214X\16\134\10\217\311d\220A\0]\7\227\310\314r\4^"
-    "\5\213\313\65_\5\207\310\14`\6\212\313\304\0a\7\223\310\310\65\2b\10\227\310D\225\324\2c\7"
-    "\223\310\315\14\4d\10\227\310\246\245\222\0e\6\223\310\235\2f\10\227\310\246\264b\2g\10\227\307\35"
-    "\61%\0h\10\227\310D\225\254\0i\6\265\310\244\1j\10\233\307f\30U\5k\10\227\310\304\264T"
-    "\1l\7\227\310\310\326\0m\7\223\310<R\0n\7\223\310\250d\5o\7\223\310U\252\2p\10\227"
-    "\307\250\244V\4q\10\227\307-\225d\0r\6\223\310\315\22s\10\223\310\215\70\22\0t\10\227\310\245"
-    "\25\243\0u\7\223\310$+\11v\10\223\310$\65R\2w\7\223\310\244q\4x\7\223\310\244\62\25"
-    "y\11\227\307$\225dJ\0z\7\223\310\254\221\6{\10\227\310\251\32D\1|\6\265\310(\1}\11"
-    "\227\310\310\14RR\0~\6\213\313\215\4\0\0\0\4\377\377\0";
-
-// Screen is 128x64 px
-static void app_draw_callback(Canvas* canvas, void* ctx) {
-    UNUSED(ctx);
-
-    canvas_clear(canvas);
-
-    canvas_set_custom_u8g2_font(canvas, u8g2_font_tom_thumb_4x6_tr);
-
-    canvas_draw_str(canvas, 0, 6, "This is a tiny custom font");
-    canvas_draw_str(canvas, 0, 12, "012345.?! ,:;\"\'@#$%");
-}
-
-static void app_input_callback(InputEvent* input_event, void* ctx) {
-    furi_assert(ctx);
-
-    FuriMessageQueue* event_queue = ctx;
-    furi_message_queue_put(event_queue, input_event, FuriWaitForever);
-}
-
-int32_t example_custom_font_main(void* p) {
-    UNUSED(p);
-    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
-
-    // Configure view port
-    ViewPort* view_port = view_port_alloc();
-    view_port_draw_callback_set(view_port, app_draw_callback, view_port);
-    view_port_input_callback_set(view_port, app_input_callback, event_queue);
-
-    // Register view port in GUI
-    Gui* gui = furi_record_open(RECORD_GUI);
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-    InputEvent event;
-
-    bool running = true;
-
-    while(running) {
-        if(furi_message_queue_get(event_queue, &event, 100) == FuriStatusOk) {
-            if((event.type == InputTypePress) || (event.type == InputTypeRepeat)) {
-                switch(event.key) {
-                case InputKeyBack:
-                    running = false;
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-    }
-
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    view_port_free(view_port);
-    furi_message_queue_free(event_queue);
-
-    furi_record_close(RECORD_GUI);
-
-    return 0;
-}

applications/debug/expansion_test/application.fam

@@ -0,0 +1,12 @@
+App(
+    appid="expansion_test",
+    name="Expansion Module Test",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="expansion_test_app",
+    requires=["expansion_start"],
+    fap_libs=["assets"],
+    stack_size=1 * 1024,
+    order=20,
+    fap_category="Debug",
+    fap_file_assets="assets",
+)

applications/debug/expansion_test/assets/test.txt

@@ -0,0 +1,9 @@
+"Did you ever hear the tragedy of Darth Plagueis the Wise?"
+"No."
+"I thought not. It's not a story the Jedi would tell you. It's a Sith legend. Darth Plagueis... was a Dark Lord of the Sith so powerful and so wise, he could use the Force to influence the midi-chlorians... to create... life. He had such a knowledge of the dark side, he could even keep the ones he cared about... from dying."
+"He could actually... save people from death?"
+"The dark side of the Force is a pathway to many abilities... some consider to be unnatural."
+"Wh– What happened to him?"
+"He became so powerful, the only thing he was afraid of was... losing his power. Which eventually, of course, he did. Unfortunately, he taught his apprentice everything he knew. Then his apprentice killed him in his sleep. It's ironic. He could save others from death, but not himself."
+"Is it possible to learn this power?"
+"Not from a Jedi."

applications/debug/expansion_test/expansion_test.c

@@ -0,0 +1,508 @@
+/**
+ * @file expansion_test.c
+ * @brief Expansion module support testing application.
+ *
+ * Before running, connect pins using the following scheme:
+ * 13 -> 16 (USART TX to LPUART RX)
+ * 14 -> 15 (USART RX to LPUART TX)
+ *
+ * Optional: Connect an LED with an appropriate series resistor
+ * between pins 1 and 8. It will always be on if the device is
+ * connected to USB power, so unplug it before running the app.
+ *
+ * What this application does:
+ *
+ * - Enables module support and emulates the module on a single device
+ *   (hence the above connection),
+ * - Connects to the expansion module service, sets baud rate,
+ * - Enables OTG (5V) on GPIO via plain expansion protocol,
+ * - Waits 5 cycles of idle loop (1 second),
+ * - Starts the RPC session,
+ * - Disables OTG (5V) on GPIO via RPC messages,
+ * - Waits 5 cycles of idle loop (1 second),
+ * - Creates a directory at `/ext/ExpansionTest` and writes a file
+ *   named `test.txt` under it,
+ * - Plays an audiovisual alert (sound and blinking display),
+ * - Enables OTG (5V) on GPIO via RPC messages,
+ * - Waits 5 cycles of idle loop (1 second),
+ * - Stops the RPC session,
+ * - Disables OTG (5V) on GPIO via plain expansion protocol,
+ * - Exits (plays a sound if any of the above steps failed).
+ */
+#include <furi.h>
+
+#include <furi_hal_resources.h>
+
+#include <furi_hal_serial.h>
+#include <furi_hal_serial_control.h>
+
+#include <pb.h>
+#include <pb_decode.h>
+#include <pb_encode.h>
+
+#include <flipper.pb.h>
+
+#include <storage/storage.h>
+#include <expansion/expansion.h>
+#include <notification/notification_messages.h>
+#include <expansion/expansion_protocol.h>
+
+#define TAG "ExpansionTest"
+
+#define TEST_DIR_PATH  EXT_PATH(TAG)
+#define TEST_FILE_NAME "test.txt"
+#define TEST_FILE_PATH EXT_PATH(TAG "/" TEST_FILE_NAME)
+
+#define HOST_SERIAL_ID   (FuriHalSerialIdLpuart)
+#define MODULE_SERIAL_ID (FuriHalSerialIdUsart)
+
+#define RECEIVE_BUFFER_SIZE (sizeof(ExpansionFrame) + sizeof(ExpansionFrameChecksum))
+
+typedef enum {
+    ExpansionTestAppFlagData = 1U << 0,
+    ExpansionTestAppFlagExit = 1U << 1,
+} ExpansionTestAppFlag;
+
+#define EXPANSION_TEST_APP_ALL_FLAGS (ExpansionTestAppFlagData | ExpansionTestAppFlagExit)
+
+typedef struct {
+    FuriThreadId thread_id;
+    Expansion* expansion;
+    FuriHalSerialHandle* handle;
+    FuriStreamBuffer* buf;
+    ExpansionFrame frame;
+    PB_Main msg;
+    Storage* storage;
+} ExpansionTestApp;
+
+static void expansion_test_app_serial_rx_callback(
+    FuriHalSerialHandle* handle,
+    FuriHalSerialRxEvent event,
+    void* context) {
+    furi_assert(handle);
+    furi_assert(context);
+    ExpansionTestApp* app = context;
+
+    if(event == FuriHalSerialRxEventData) {
+        const uint8_t data = furi_hal_serial_async_rx(handle);
+        furi_stream_buffer_send(app->buf, &data, sizeof(data), 0);
+        furi_thread_flags_set(app->thread_id, ExpansionTestAppFlagData);
+    }
+}
+
+static ExpansionTestApp* expansion_test_app_alloc(void) {
+    ExpansionTestApp* instance = malloc(sizeof(ExpansionTestApp));
+    instance->buf = furi_stream_buffer_alloc(RECEIVE_BUFFER_SIZE, 1);
+    return instance;
+}
+
+static void expansion_test_app_free(ExpansionTestApp* instance) {
+    furi_stream_buffer_free(instance->buf);
+    free(instance);
+}
+
+static void expansion_test_app_start(ExpansionTestApp* instance) {
+    instance->thread_id = furi_thread_get_current_id();
+    instance->expansion = furi_record_open(RECORD_EXPANSION);
+    instance->handle = furi_hal_serial_control_acquire(MODULE_SERIAL_ID);
+    furi_check(instance->handle);
+    // Configure the serial port
+    furi_hal_serial_init(instance->handle, EXPANSION_PROTOCOL_DEFAULT_BAUD_RATE);
+    // Start waiting for the initial pulse
+    expansion_set_listen_serial(instance->expansion, HOST_SERIAL_ID);
+
+    furi_hal_serial_async_rx_start(
+        instance->handle, expansion_test_app_serial_rx_callback, instance, false);
+}
+
+static void expansion_test_app_stop(ExpansionTestApp* instance) {
+    // Disable expansion module support
+    expansion_disable(instance->expansion);
+    // Give back the module handle
+    furi_hal_serial_control_release(instance->handle);
+    // Restore expansion user settings
+    expansion_enable(instance->expansion);
+    furi_record_close(RECORD_EXPANSION);
+}
+
+static inline bool expansion_test_app_is_success_response(const ExpansionFrame* response) {
+    return response->header.type == ExpansionFrameTypeStatus &&
+           response->content.status.error == ExpansionFrameErrorNone;
+}
+
+static inline bool expansion_test_app_is_success_rpc_message(const PB_Main* message) {
+    return (message->command_status == PB_CommandStatus_OK ||
+            message->command_status == PB_CommandStatus_ERROR_STORAGE_EXIST) &&
+           (message->which_content == PB_Main_empty_tag);
+}
+
+static size_t expansion_test_app_receive_callback(uint8_t* data, size_t data_size, void* context) {
+    ExpansionTestApp* instance = context;
+
+    size_t received_size = 0;
+
+    while(true) {
+        received_size += furi_stream_buffer_receive(
+            instance->buf, data + received_size, data_size - received_size, 0);
+        if(received_size == data_size) break;
+
+        const uint32_t flags = furi_thread_flags_wait(
+            EXPANSION_TEST_APP_ALL_FLAGS, FuriFlagWaitAny, EXPANSION_PROTOCOL_TIMEOUT_MS);
+
+        // Exit on any error
+        if(flags & FuriFlagError) break;
+    }
+
+    return received_size;
+}
+
+static size_t
+    expansion_test_app_send_callback(const uint8_t* data, size_t data_size, void* context) {
+    ExpansionTestApp* instance = context;
+
+    furi_hal_serial_tx(instance->handle, data, data_size);
+    furi_hal_serial_tx_wait_complete(instance->handle);
+
+    return data_size;
+}
+
+static bool expansion_test_app_receive_frame(ExpansionTestApp* instance, ExpansionFrame* frame) {
+    return expansion_protocol_decode(frame, expansion_test_app_receive_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool
+    expansion_test_app_send_status_response(ExpansionTestApp* instance, ExpansionFrameError error) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeStatus,
+        .content.status.error = error,
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_send_heartbeat(ExpansionTestApp* instance) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeHeartbeat,
+        .content.heartbeat = {},
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool
+    expansion_test_app_send_baud_rate_request(ExpansionTestApp* instance, uint32_t baud_rate) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeBaudRate,
+        .content.baud_rate.baud = baud_rate,
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_send_control_request(
+    ExpansionTestApp* instance,
+    ExpansionFrameControlCommand command) {
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeControl,
+        .content.control.command = command,
+    };
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_send_data_request(
+    ExpansionTestApp* instance,
+    const uint8_t* data,
+    size_t data_size) {
+    furi_assert(data_size <= EXPANSION_PROTOCOL_MAX_DATA_SIZE);
+
+    ExpansionFrame frame = {
+        .header.type = ExpansionFrameTypeData,
+        .content.data.size = data_size,
+    };
+
+    memcpy(frame.content.data.bytes, data, data_size);
+    return expansion_protocol_encode(&frame, expansion_test_app_send_callback, instance) ==
+           ExpansionProtocolStatusOk;
+}
+
+static bool expansion_test_app_rpc_encode_callback(
+    pb_ostream_t* stream,
+    const pb_byte_t* data,
+    size_t data_size) {
+    ExpansionTestApp* instance = stream->state;
+
+    size_t size_sent = 0;
+
+    while(size_sent < data_size) {
+        const size_t current_size = MIN(data_size - size_sent, EXPANSION_PROTOCOL_MAX_DATA_SIZE);
+        if(!expansion_test_app_send_data_request(instance, data + size_sent, current_size)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        size_sent += current_size;
+    }
+
+    return size_sent == data_size;
+}
+
+static bool expansion_test_app_send_rpc_request(ExpansionTestApp* instance, PB_Main* message) {
+    pb_ostream_t stream = {
+        .callback = expansion_test_app_rpc_encode_callback,
+        .state = instance,
+        .max_size = SIZE_MAX,
+        .bytes_written = 0,
+        .errmsg = NULL,
+    };
+
+    const bool success = pb_encode_ex(&stream, &PB_Main_msg, message, PB_ENCODE_DELIMITED);
+    pb_release(&PB_Main_msg, message);
+    return success;
+}
+
+static bool expansion_test_app_receive_rpc_request(ExpansionTestApp* instance, PB_Main* message) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_send_status_response(instance, ExpansionFrameErrorNone)) break;
+        if(instance->frame.header.type != ExpansionFrameTypeData) break;
+        pb_istream_t stream = pb_istream_from_buffer(
+            instance->frame.content.data.bytes, instance->frame.content.data.size);
+        if(!pb_decode_ex(&stream, &PB_Main_msg, message, PB_DECODE_DELIMITED)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_send_presence(ExpansionTestApp* instance) {
+    // Send pulses to emulate module insertion
+    const uint8_t init = 0xAA;
+    furi_hal_serial_tx(instance->handle, &init, sizeof(init));
+    furi_hal_serial_tx_wait_complete(instance->handle);
+    return true;
+}
+
+static bool expansion_test_app_wait_ready(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(instance->frame.header.type != ExpansionFrameTypeHeartbeat) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_handshake(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_baud_rate_request(instance, 230400)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        furi_hal_serial_set_br(instance->handle, 230400);
+        furi_delay_ms(EXPANSION_PROTOCOL_BAUD_CHANGE_DT_MS);
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_enable_otg(ExpansionTestApp* instance, bool enable) {
+    bool success = false;
+
+    do {
+        const ExpansionFrameControlCommand command = enable ?
+                                                         ExpansionFrameControlCommandEnableOtg :
+                                                         ExpansionFrameControlCommandDisableOtg;
+        if(!expansion_test_app_send_control_request(instance, command)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_start_rpc(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_control_request(instance, ExpansionFrameControlCommandStartRpc))
+            break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_mkdir(ExpansionTestApp* instance) {
+    bool success = false;
+
+    instance->msg.command_id++;
+    instance->msg.command_status = PB_CommandStatus_OK;
+    instance->msg.which_content = PB_Main_storage_mkdir_request_tag;
+    instance->msg.has_next = false;
+    instance->msg.content.storage_mkdir_request.path = TEST_DIR_PATH;
+
+    do {
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_is_success_rpc_message(&instance->msg)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_write(ExpansionTestApp* instance) {
+    bool success = false;
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* file = storage_file_alloc(storage);
+
+    do {
+        if(!storage_file_open(file, APP_ASSETS_PATH(TEST_FILE_NAME), FSAM_READ, FSOM_OPEN_EXISTING))
+            break;
+
+        const uint64_t file_size = storage_file_size(file);
+
+        instance->msg.command_id++;
+        instance->msg.command_status = PB_CommandStatus_OK;
+        instance->msg.which_content = PB_Main_storage_write_request_tag;
+        instance->msg.has_next = false;
+        instance->msg.content.storage_write_request.path = TEST_FILE_PATH;
+        instance->msg.content.storage_write_request.has_file = true;
+        instance->msg.content.storage_write_request.file.data =
+            malloc(PB_BYTES_ARRAY_T_ALLOCSIZE(file_size));
+        instance->msg.content.storage_write_request.file.data->size = file_size;
+
+        const size_t bytes_read = storage_file_read(
+            file, instance->msg.content.storage_write_request.file.data->bytes, file_size);
+
+        if(bytes_read != file_size) {
+            pb_release(&PB_Main_msg, &instance->msg);
+            break;
+        }
+
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_is_success_rpc_message(&instance->msg)) break;
+        success = true;
+    } while(false);
+
+    storage_file_free(file);
+    furi_record_close(RECORD_STORAGE);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_alert(ExpansionTestApp* instance) {
+    bool success = false;
+
+    instance->msg.command_id++;
+    instance->msg.command_status = PB_CommandStatus_OK;
+    instance->msg.which_content = PB_Main_system_play_audiovisual_alert_request_tag;
+    instance->msg.has_next = false;
+
+    do {
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(instance->msg.which_content != PB_Main_empty_tag) break;
+        if(instance->msg.command_status != PB_CommandStatus_OK) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_rpc_enable_otg(ExpansionTestApp* instance, bool enable) {
+    bool success = false;
+
+    instance->msg.command_id++;
+    instance->msg.command_status = PB_CommandStatus_OK;
+    instance->msg.which_content = PB_Main_gpio_set_otg_mode_tag;
+    instance->msg.content.gpio_set_otg_mode.mode = enable ? PB_Gpio_GpioOtgMode_ON :
+                                                            PB_Gpio_GpioOtgMode_OFF;
+    instance->msg.has_next = false;
+
+    do {
+        if(!expansion_test_app_send_rpc_request(instance, &instance->msg)) break;
+        if(!expansion_test_app_receive_rpc_request(instance, &instance->msg)) break;
+        if(instance->msg.which_content != PB_Main_empty_tag) break;
+        if(instance->msg.command_status != PB_CommandStatus_OK) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+static bool expansion_test_app_idle(ExpansionTestApp* instance, uint32_t num_cycles) {
+    uint32_t num_cycles_done;
+    for(num_cycles_done = 0; num_cycles_done < num_cycles; ++num_cycles_done) {
+        if(!expansion_test_app_send_heartbeat(instance)) break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(instance->frame.header.type != ExpansionFrameTypeHeartbeat) break;
+        furi_delay_ms(EXPANSION_PROTOCOL_TIMEOUT_MS - 50);
+    }
+
+    return num_cycles_done == num_cycles;
+}
+
+static bool expansion_test_app_stop_rpc(ExpansionTestApp* instance) {
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_control_request(instance, ExpansionFrameControlCommandStopRpc))
+            break;
+        if(!expansion_test_app_receive_frame(instance, &instance->frame)) break;
+        if(!expansion_test_app_is_success_response(&instance->frame)) break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+int32_t expansion_test_app(void* p) {
+    UNUSED(p);
+
+    ExpansionTestApp* instance = expansion_test_app_alloc();
+    expansion_test_app_start(instance);
+
+    bool success = false;
+
+    do {
+        if(!expansion_test_app_send_presence(instance)) break;
+        if(!expansion_test_app_wait_ready(instance)) break;
+        if(!expansion_test_app_handshake(instance)) break;
+        if(!expansion_test_app_enable_otg(instance, true)) break;
+        if(!expansion_test_app_idle(instance, 5)) break;
+        if(!expansion_test_app_start_rpc(instance)) break;
+        if(!expansion_test_app_rpc_enable_otg(instance, false)) break;
+        if(!expansion_test_app_idle(instance, 5)) break;
+        if(!expansion_test_app_rpc_mkdir(instance)) break;
+        if(!expansion_test_app_rpc_write(instance)) break;
+        if(!expansion_test_app_rpc_alert(instance)) break;
+        if(!expansion_test_app_rpc_enable_otg(instance, true)) break;
+        if(!expansion_test_app_idle(instance, 5)) break;
+        if(!expansion_test_app_stop_rpc(instance)) break;
+        if(!expansion_test_app_enable_otg(instance, false)) break;
+        success = true;
+    } while(false);
+
+    expansion_test_app_stop(instance);
+    expansion_test_app_free(instance);
+
+    if(!success) {
+        NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
+        notification_message(notification, &sequence_error);
+        furi_record_close(RECORD_NOTIFICATION);
+    }
+
+    return 0;
+}

applications/debug/file_browser_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="File Browser Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="file_browser_app",
-    cdefines=["APP_FILE_BROWSER_TEST"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=150,

applications/debug/file_browser_test/file_browser_app.c

@@ -33,8 +33,6 @@ FileBrowserApp* file_browser_app_alloc(char* arg) {
     app->dialogs = furi_record_open(RECORD_DIALOGS);
 
     app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(app->view_dispatcher);
-
     app->scene_manager = scene_manager_alloc(&file_browser_scene_handlers, app);
 
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);

applications/debug/file_browser_test/scenes/file_browser_scene_browser.c

@@ -2,7 +2,7 @@
 #include <furi.h>
 
 #define DEFAULT_PATH "/"
-#define EXTENSION "*"
+#define EXTENSION    "*"
 
 bool file_browser_scene_browser_on_event(void* context, SceneManagerEvent event) {
     UNUSED(context);

applications/debug/file_browser_test/scenes/file_browser_scene_start.c

@@ -19,7 +19,7 @@ bool file_browser_scene_start_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        furi_string_set(app->file_path, ANY_PATH("badusb/demo_windows.txt"));
+        furi_string_set(app->file_path, EXT_PATH("badusb/demo_windows.txt"));
         scene_manager_next_scene(app->scene_manager, FileBrowserSceneBrowser);
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {

applications/debug/infrared_test/application.fam

@@ -0,0 +1,8 @@
+App(
+    appid="infrared_test",
+    name="Infrared Test",
+    apptype=FlipperAppType.DEBUG,
+    entry_point="infrared_test_app",
+    fap_category="Debug",
+    targets=["f7"],
+)

applications/debug/infrared_test/infrared_test.c

@@ -0,0 +1,61 @@
+#include <furi.h>
+#include <furi_hal_infrared.h>
+
+#define TAG "InfraredTest"
+
+#define CARRIER_FREQ_HZ (38000UL)
+#define CARRIER_DUTY    (0.33f)
+
+#define BURST_DURATION_US (600UL)
+#define BURST_COUNT       (50UL)
+
+typedef struct {
+    bool level;
+    uint32_t count;
+} InfraredTestApp;
+
+static FuriHalInfraredTxGetDataState
+    infrared_test_app_tx_data_callback(void* context, uint32_t* duration, bool* level) {
+    furi_assert(context);
+    furi_assert(duration);
+    furi_assert(level);
+
+    InfraredTestApp* app = context;
+
+    *duration = BURST_DURATION_US;
+    *level = app->level;
+
+    app->level = !app->level;
+    app->count += 1;
+
+    if(app->count < BURST_COUNT * 2) {
+        return FuriHalInfraredTxGetDataStateOk;
+    } else {
+        return FuriHalInfraredTxGetDataStateLastDone;
+    }
+}
+
+int32_t infrared_test_app(void* arg) {
+    UNUSED(arg);
+
+    InfraredTestApp app = {
+        .level = true,
+    };
+
+    FURI_LOG_I(TAG, "Starting test signal on PA7");
+
+    furi_hal_infrared_set_tx_output(FuriHalInfraredTxPinExtPA7);
+    furi_hal_infrared_async_tx_set_data_isr_callback(infrared_test_app_tx_data_callback, &app);
+    furi_hal_infrared_async_tx_start(CARRIER_FREQ_HZ, CARRIER_DUTY);
+    furi_hal_infrared_async_tx_wait_termination();
+    furi_hal_infrared_set_tx_output(FuriHalInfraredTxPinInternal);
+
+    FURI_LOG_I(TAG, "Test signal end");
+    FURI_LOG_I(
+        TAG,
+        "The measured signal should be %luus +-%.1fus",
+        (app.count - 1) * BURST_DURATION_US,
+        (double)1000000.0 / CARRIER_FREQ_HZ);
+
+    return 0;
+}

applications/debug/keypad_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Keypad Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="keypad_test_app",
-    cdefines=["APP_KEYPAD_TEST"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=30,

applications/debug/keypad_test/keypad_test.c

@@ -64,16 +64,9 @@ static void keypad_test_input_callback(InputEvent* input_event, void* ctx) {
 int32_t keypad_test_app(void* p) {
     UNUSED(p);
     FuriMessageQueue* event_queue = furi_message_queue_alloc(32, sizeof(InputEvent));
-    furi_check(event_queue);
-
     KeypadTestState state = {{false, false, false, false, false}, 0, 0, 0, 0, 0, NULL};
     state.mutex = furi_mutex_alloc(FuriMutexTypeNormal);
 
-    if(!state.mutex) {
-        FURI_LOG_E(TAG, "cannot create mutex");
-        return 0;
-    }
-
     ViewPort* view_port = view_port_alloc();
 
     view_port_draw_callback_set(view_port, keypad_test_render_callback, &state);

applications/debug/lfrfid_debug/lfrfid_debug.c

@@ -12,12 +12,11 @@ static bool lfrfid_debug_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-static LfRfidDebug* lfrfid_debug_alloc() {
+static LfRfidDebug* lfrfid_debug_alloc(void) {
     LfRfidDebug* app = malloc(sizeof(LfRfidDebug));
 
     app->view_dispatcher = view_dispatcher_alloc();
     app->scene_manager = scene_manager_alloc(&lfrfid_debug_scene_handlers, app);
-    view_dispatcher_enable_queue(app->view_dispatcher);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
     view_dispatcher_set_custom_event_callback(
         app->view_dispatcher, lfrfid_debug_custom_event_callback);
@@ -78,4 +77,4 @@ int32_t lfrfid_debug_app(void* p) {
     lfrfid_debug_free(app);
 
     return 0;
-}
+}

applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.c

@@ -34,8 +34,8 @@ static void lfrfid_debug_view_tune_draw_callback(Canvas* canvas, void* _model) {
     canvas_set_color(canvas, ColorBlack);
 
     char buffer[TEMP_STR_LEN + 1];
-    double freq = ((float)SystemCoreClock / ((float)model->ARR + 1));
-    double duty = ((float)model->CCR + 1) / ((float)model->ARR + 1) * 100.0f;
+    double freq = ((double)SystemCoreClock / (model->ARR + 1));
+    double duty = (double)((model->CCR + 1) * 100) / (model->ARR + 1);
     snprintf(
         buffer,
         TEMP_STR_LEN,
@@ -170,7 +170,7 @@ static bool lfrfid_debug_view_tune_input_callback(InputEvent* event, void* conte
     return consumed;
 }
 
-LfRfidTuneView* lfrfid_debug_view_tune_alloc() {
+LfRfidTuneView* lfrfid_debug_view_tune_alloc(void) {
     LfRfidTuneView* tune_view = malloc(sizeof(LfRfidTuneView));
     tune_view->view = view_alloc();
     view_set_context(tune_view->view, tune_view);
@@ -223,16 +223,14 @@ bool lfrfid_debug_view_tune_is_dirty(LfRfidTuneView* tune_view) {
 
 uint32_t lfrfid_debug_view_tune_get_arr(LfRfidTuneView* tune_view) {
     uint32_t result = false;
-    with_view_model(
-        tune_view->view, LfRfidTuneViewModel * model, { result = model->ARR; }, false);
+    with_view_model(tune_view->view, LfRfidTuneViewModel * model, { result = model->ARR; }, false);
 
     return result;
 }
 
 uint32_t lfrfid_debug_view_tune_get_ccr(LfRfidTuneView* tune_view) {
     uint32_t result = false;
-    with_view_model(
-        tune_view->view, LfRfidTuneViewModel * model, { result = model->CCR; }, false);
+    with_view_model(tune_view->view, LfRfidTuneViewModel * model, { result = model->CCR; }, false);
 
     return result;
 }

applications/debug/lfrfid_debug/views/lfrfid_debug_view_tune.h

@@ -3,7 +3,7 @@
 
 typedef struct LfRfidTuneView LfRfidTuneView;
 
-LfRfidTuneView* lfrfid_debug_view_tune_alloc();
+LfRfidTuneView* lfrfid_debug_view_tune_alloc(void);
 
 void lfrfid_debug_view_tune_free(LfRfidTuneView* tune_view);
 

applications/debug/locale_test/application.fam

@@ -3,7 +3,6 @@ App(
     name="Locale Test",
     apptype=FlipperAppType.DEBUG,
     entry_point="locale_test_app",
-    cdefines=["APP_LOCALE"],
     requires=["gui", "locale"],
     stack_size=2 * 1024,
     order=70,

applications/debug/locale_test/locale_test.c

@@ -30,7 +30,7 @@ static void locale_test_view_draw_callback(Canvas* canvas, void* _model) {
     }
     canvas_draw_str(canvas, 0, 10, furi_string_get_cstr(tmp_string));
 
-    FuriHalRtcDateTime datetime;
+    DateTime datetime;
     furi_hal_rtc_get_datetime(&datetime);
 
     locale_format_time(tmp_string, &datetime, locale_get_time_format(), false);
@@ -53,7 +53,7 @@ static uint32_t locale_test_exit(void* context) {
     return VIEW_NONE;
 }
 
-static LocaleTestApp* locale_test_alloc() {
+static LocaleTestApp* locale_test_alloc(void) {
     LocaleTestApp* app = malloc(sizeof(LocaleTestApp));
 
     // Gui
@@ -61,7 +61,6 @@ static LocaleTestApp* locale_test_alloc() {
 
     // View dispatcher
     app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(app->view_dispatcher);
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
     // Views

applications/debug/rpc_debug_app/rpc_debug_app.c

@@ -24,7 +24,7 @@ static void rpc_debug_app_tick_event_callback(void* context) {
 static void
     rpc_debug_app_format_hex(const uint8_t* data, size_t data_size, char* buf, size_t buf_size) {
     if(data == NULL || data_size == 0) {
-        strncpy(buf, "<Data empty>", buf_size);
+        strlcpy(buf, "<Data empty>", buf_size);
         return;
     }
 
@@ -83,7 +83,7 @@ static bool rpc_debug_app_rpc_init_rpc(RpcDebugApp* app, const char* args) {
     return ret;
 }
 
-static RpcDebugApp* rpc_debug_app_alloc() {
+static RpcDebugApp* rpc_debug_app_alloc(void) {
     RpcDebugApp* app = malloc(sizeof(RpcDebugApp));
 
     app->gui = furi_record_open(RECORD_GUI);
@@ -99,7 +99,6 @@ static RpcDebugApp* rpc_debug_app_alloc() {
     view_dispatcher_set_tick_event_callback(
         app->view_dispatcher, rpc_debug_app_tick_event_callback, 100);
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
-    view_dispatcher_enable_queue(app->view_dispatcher);
 
     app->widget = widget_alloc();
     view_dispatcher_add_view(

applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_code.c

@@ -1,5 +1,7 @@
 #include "../rpc_debug_app.h"
 
+#include <lib/toolbox/strint.h>
+
 static bool rpc_debug_app_scene_input_error_code_validator_callback(
     const char* text,
     FuriString* error,
@@ -24,7 +26,7 @@ static void rpc_debug_app_scene_input_error_code_result_callback(void* context)
 
 void rpc_debug_app_scene_input_error_code_on_enter(void* context) {
     RpcDebugApp* app = context;
-    strncpy(app->text_store, "666", TEXT_STORE_SIZE);
+    strlcpy(app->text_store, "666", TEXT_STORE_SIZE);
     text_input_set_header_text(app->text_input, "Enter error code");
     text_input_set_validator(
         app->text_input, rpc_debug_app_scene_input_error_code_validator_callback, NULL);
@@ -44,9 +46,8 @@ bool rpc_debug_app_scene_input_error_code_on_event(void* context, SceneManagerEv
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == RpcDebugAppCustomEventInputErrorCode) {
-            char* end;
-            int error_code = strtol(app->text_store, &end, 10);
-            if(!*end) {
+            uint32_t error_code;
+            if(strint_to_uint32(app->text_store, NULL, &error_code, 10) == StrintParseNoError) {
                 rpc_system_app_set_error_code(app->rpc, error_code);
             }
             scene_manager_previous_scene(app->scene_manager);

applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_input_error_text.c

@@ -7,7 +7,7 @@ static void rpc_debug_app_scene_input_error_text_result_callback(void* context)
 
 void rpc_debug_app_scene_input_error_text_on_enter(void* context) {
     RpcDebugApp* app = context;
-    strncpy(app->text_store, "I'm a scary error message!", TEXT_STORE_SIZE);
+    strlcpy(app->text_store, "I'm a scary error message!", TEXT_STORE_SIZE);
     text_input_set_header_text(app->text_input, "Enter error text");
     text_input_set_result_callback(
         app->text_input,

applications/debug/rpc_debug_app/scenes/rpc_debug_app_scene_receive_data_exchange.c

@@ -2,7 +2,7 @@
 
 void rpc_debug_app_scene_receive_data_exchange_on_enter(void* context) {
     RpcDebugApp* app = context;
-    strncpy(app->text_store, "Received data will appear here...", TEXT_STORE_SIZE);
+    strlcpy(app->text_store, "Received data will appear here...", TEXT_STORE_SIZE);
 
     text_box_set_text(app->text_box, app->text_store);
     text_box_set_font(app->text_box, TextBoxFontHex);

applications/debug/speaker_debug/speaker_debug.c

@@ -5,6 +5,7 @@
 #include <toolbox/args.h>
 
 #define TAG "SpeakerDebug"
+
 #define CLI_COMMAND "speaker_debug"
 
 typedef enum {
@@ -21,7 +22,7 @@ typedef struct {
     Cli* cli;
 } SpeakerDebugApp;
 
-static SpeakerDebugApp* speaker_app_alloc() {
+static SpeakerDebugApp* speaker_app_alloc(void) {
     SpeakerDebugApp* app = (SpeakerDebugApp*)malloc(sizeof(SpeakerDebugApp));
     app->music_worker = music_worker_alloc();
     app->message_queue = furi_message_queue_alloc(8, sizeof(SpeakerDebugAppMessage));

applications/debug/subghz_test/helpers/subghz_test_types.h

@@ -4,8 +4,8 @@
 #include <furi_hal.h>
 
 #define SUBGHZ_TEST_VERSION_APP "0.1"
-#define SUBGHZ_TEST_DEVELOPED "SkorP"
-#define SUBGHZ_TEST_GITHUB "https://github.com/flipperdevices/flipperzero-firmware"
+#define SUBGHZ_TEST_DEVELOPED   "SkorP"
+#define SUBGHZ_TEST_GITHUB      "https://github.com/flipperdevices/flipperzero-firmware"
 
 typedef enum {
     SubGhzTestViewVariableItemList,