Merge branch 'dev' into release

Fix keyboard capitalization bug

.ci_files/anims_ofw.txt

@@ -36,13 +36,6 @@ Min level: 1
 Max level: 1
 Weight: 3
 
-Name: L1_Happy_holidays_128x64
-Min butthurt: 0
-Max butthurt: 14
-Min level: 1
-Max level: 3
-Weight: 4
-
 Name: L1_Read_books_128x64
 Min butthurt: 0
 Max butthurt: 8

.vscode/example/launch.json

@@ -11,9 +11,10 @@
             "args": {
                 "useSingleResult": true,
                 "env": {
-                    "PATH": "${workspaceFolder};${env:PATH}"
+                    "PATH": "${workspaceFolder};${env:PATH}",
+                    "FBT_QUIET": 1
                 },
-                "command": "./fbt get_blackmagic",
+                "command": "fbt get_blackmagic",
                 "description": "Get Blackmagic device",
             }
         }

CHANGELOG.md

@@ -1,12 +1,19 @@
 ### New changes
-* SubGHz: **Nice ON2E (Nice One)** support (by @assasinfil | PR #335)
-* SubGHz: Remove 467.75 From freq analyzer since it has too much noise (Frequency is still can be used, just excluded from FA to avoid false detections)
-* Archive and FileBrowser: **Fixed more navigation issues** (by @Willy-JL | PR #334)
-* Plugins -> SubGHz Bruteforcer: Fix Linear Delta 3 repeats (now its more stable and we will be sure signal is received correctly)
-* Plugins: Updated TOTP (Authenticator) [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
-* OFW: **Fix Cyfral & Metakom emulation (My temp fix removed and proper fix from OFW applied)**
-* OFW: BadUSB: disable CDC mode, USB mode switch fix
-* OFW: Updater visual fixes
+* Desktop: Autolock with PIN Code (by @Willy-JL | PR #338) - **Desktop settings (pin code, favourite app, autolock time) will be resetted!!! Only one time after installing - due to changes in settings structure, after installing of this release desktop settings will not be reset with next release**
+* Desktop: Faster back button hold time for power off, was 2 seconds, now 1.3sec
+* GUI: Fix keyboard capitalization bug (by @Willy-JL | PR #362) (fixes #361)
+* Plugins: Added **SWD Probe** [(by g3gg0)](https://github.com/g3gg0/flipper-swd_probe) (moved from extra pack into main FW)
+* Plugins: Show RSSI in Weather Station app and in POCSAG Pager app
+* Plugins: Improve Tetris fall speed algorithm (by @p3ngu19z | PR #343)
+* Plugins: Add missing buttons into HID app, remove old keyboard app, move Bluetooth remote to Misc
+* Infrared: Assets update (by @amec0e | PR #340 / #357 / #358)
+* Misc: Typo combing (by @Round-Pi | PR #352)
+* OFW: Dolphin: drop holiday animation
+* OFW: fbt: FBT_QUIET option; docs on environment
+* OFW: Delete rwfiletest.bin on exit SDcard benchmark
+* OFW: Re-init NFC when starting the worker 
+* OFW: Up toolchain version to 21
+* OFW: Display Mifare Classic data in NFC app
 
 #### [🎲 Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
 

ReadMe.md

@@ -12,8 +12,6 @@
 
 Our goal is to make all features possible on this device without any limitations! 
 
-Please help us implement emulation for all Sub-GHz dynamic (rolling code) protocols!
-
 <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. 
@@ -56,7 +54,7 @@ Our Discord Community:
 Also check the changelog in releases for latest updates!
 
 ### Current modified and new Sub-GHz protocols list:
-Thanks to Official team (to thier SubGHz Developer, Skorp) for implementing decoders for these protocols.
+Thanks to Official team (to their SubGHz Developer, Skorp) for implementing decoders for these protocols.
 
 Encoders/sending made by Eng1n33r & @xMasterX:
 
@@ -118,7 +116,6 @@ You can support us by using links or addresses below:
 - ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
 - WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
 - MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
-- USB Keyboard plugin [(by huuck)](https://github.com/huuck/FlipperZeroUSBKeyboard)
 - WAV Player [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) - Fixed and improved by [LTVA1](https://github.com/LTVA1/wav_player)
 - Barcode generator plugin [(original by McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator) - [EAN-8 and refactoring](https://github.com/DarkFlippers/unleashed-firmware/pull/154) by @msvsergey
 - GPIO: Sentry Safe plugin [(by H4ckd4ddy)](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
@@ -142,6 +139,7 @@ You can support us by using links or addresses below:
 - Text Viewer [(by kowalski7cc & kyhwana)](https://github.com/kowalski7cc/flipper-zero-text-viewer/tree/refactor-text-app)
 - **UART Terminal** [(by cool4uma)](https://github.com/cool4uma/UART_Terminal/tree/main)
 - **ProtoView** [(by antirez)](https://github.com/antirez/protoview)
+- **SWD Probe** [(by g3gg0)](https://github.com/g3gg0/flipper-swd_probe)
 
 Games:
 - DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
@@ -230,8 +228,6 @@ Games:
 # Where I can find IR, Sub-GHz, ... files, DBs, and other stuff?
 ## [UberGuidoZ Playground - Large collection of files - Github](https://github.com/UberGuidoZ/Flipper)
 ## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero)
-## [CAME-12bit, NICE-12bit, Linear-10bit, PT-2240 - Sub-GHz fixed code bruteforce](https://github.com/tobiabocchi/flipperzero-bruteforce)
-## [SMC5326, UNILARM - Sub-GHz fixed code bruteforce](https://github.com/Hong5489/flipperzero-gate-bruteforce)
 
 <br>
 <br>
@@ -239,6 +235,9 @@ Games:
 # Links
 
 * Unofficial Discord: [discord.unleashedflip.com](https://discord.unleashedflip.com)
+* Hello world - plugin tutorial (English): [https://github.com/DroomOne/Flipper-Plugin-Tutorial](https://github.com/DroomOne/Flipper-Plugin-Tutorial)
+* Hello world - plugin tutorial (in Russian): [https://yakovlev.me/hello-flipper-zero/](https://yakovlev.me/hello-flipper-zero/)
+* CLion IDE - How to setup workspace for flipper firmware development: [https://krasovs.ky/2022/11/01/flipper-zero-clion.html](https://krasovs.ky/2022/11/01/flipper-zero-clion.html)
 * Docs by atmanos / How to write your own app (outdated API): [https://flipper.atmanos.com/docs/overview/intro](https://flipper.atmanos.com/docs/overview/intro)
 
 * Official Docs: [http://docs.flipperzero.one](http://docs.flipperzero.one)

SConstruct

@@ -139,7 +139,7 @@ if GetOption("fullenv") or any(
 basic_dist = distenv.DistCommand("fw_dist", distenv["DIST_DEPENDS"])
 distenv.Default(basic_dist)
 
-dist_dir = distenv.GetProjetDirName()
+dist_dir = distenv.GetProjectDirName()
 fap_dist = [
     distenv.Install(
         distenv.Dir(f"#/dist/{dist_dir}/apps/debug_elf"),

applications/main/infrared/views/infrared_progress_view.h

@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-/** Anonumous instance */
+/** Anonymous instance */
 typedef struct InfraredProgressView InfraredProgressView;
 
 /** Callback for back button handling */

applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c

@@ -14,7 +14,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     T55xxTiming* t55xxtiming = malloc(sizeof(T55xxTiming));
     Popup* popup = app->popup;
     char curr_buf[32] = {};
-    //TODO: use .txt file in resourses for passwords.
+    //TODO: use .txt file in resources for passwords.
     const uint32_t default_passwords[] = {
         0x51243648, 0x000D8787, 0x19920427, 0x50524F58, 0xF9DCEBA0, 0x65857569, 0x05D73B9F,
         0x89A69E60, 0x314159E0, 0xAA55BBBB, 0xA5B4C3D2, 0x1C0B5848, 0x00434343, 0x444E4752,

applications/main/nfc/helpers/nfc_emv_parser.h

@@ -9,7 +9,7 @@
  * @param aid - AID number array
  * @param aid_len - AID length
  * @param aid_name - string to keep AID name
- * @return - true if AID found, false otherwies
+ * @return - true if AID found, false otherwise
  */
 bool nfc_emv_parser_get_aid_name(
     Storage* storage,
@@ -21,7 +21,7 @@ bool nfc_emv_parser_get_aid_name(
  * @param storage Storage instance
  * @param country_code - ISO 3166 country code
  * @param country_name - string to keep country name
- * @return - true if country found, false otherwies
+ * @return - true if country found, false otherwise
  */
 bool nfc_emv_parser_get_country_name(
     Storage* storage,
@@ -32,7 +32,7 @@ bool nfc_emv_parser_get_country_name(
  * @param storage Storage instance
  * @param currency_code - ISO 3166 currency code
  * @param currency_name - string to keep currency name
- * @return - true if currency found, false otherwies
+ * @return - true if currency found, false otherwise
  */
 bool nfc_emv_parser_get_currency_name(
     Storage* storage,

applications/main/nfc/nfc_cli.c

@@ -32,7 +32,7 @@ static void nfc_cli_detect(Cli* cli, FuriString* args) {
     while(!cmd_exit) {
         cmd_exit |= cli_cmd_interrupt_received(cli);
         if(furi_hal_nfc_detect(&dev_data, 400)) {
-            printf("found: %s ", nfc_get_dev_type(dev_data.type));
+            printf("Found: %s ", nfc_get_dev_type(dev_data.type));
             printf("UID length: %d, UID:", dev_data.uid_len);
             for(size_t i = 0; i < dev_data.uid_len; i++) {
                 printf("%02X", dev_data.uid[i]);

applications/main/nfc/scenes/nfc_scene_config.h

@@ -29,6 +29,7 @@ ADD_SCENE(nfc, mf_desfire_menu, MfDesfireMenu)
 ADD_SCENE(nfc, mf_desfire_data, MfDesfireData)
 ADD_SCENE(nfc, mf_desfire_app, MfDesfireApp)
 ADD_SCENE(nfc, mf_classic_read_success, MfClassicReadSuccess)
+ADD_SCENE(nfc, mf_classic_data, MfClassicData)
 ADD_SCENE(nfc, mf_classic_menu, MfClassicMenu)
 ADD_SCENE(nfc, mf_classic_emulate, MfClassicEmulate)
 ADD_SCENE(nfc, mf_classic_keys, MfClassicKeys)

applications/main/nfc/scenes/nfc_scene_mf_classic_data.c

@@ -0,0 +1,106 @@
+#include "../nfc_i.h"
+
+void nfc_scene_mf_classic_data_on_enter(void* context) {
+    Nfc* nfc = context;
+    MfClassicType type = nfc->dev->dev_data.mf_classic_data.type;
+    MfClassicData* data = &nfc->dev->dev_data.mf_classic_data;
+    TextBox* text_box = nfc->text_box;
+
+    text_box_set_font(text_box, TextBoxFontHex);
+
+    int card_blocks = 0;
+    if(type == MfClassicType1k) {
+        card_blocks = MF_CLASSIC_1K_TOTAL_SECTORS_NUM * 4;
+    } else if(type == MfClassicType4k) {
+        // 16 sectors of 4 blocks each plus 8 sectors of 16 blocks each
+        card_blocks = MF_CLASSIC_1K_TOTAL_SECTORS_NUM * 4 + 8 * 16;
+    } else if(type == MfClassicTypeMini) {
+        card_blocks = MF_MINI_TOTAL_SECTORS_NUM * 4;
+    }
+
+    int bytes_written = 0;
+    for(int block_num = 0; block_num < card_blocks; block_num++) {
+        bool is_sec_trailer = mf_classic_is_sector_trailer(block_num);
+        if(is_sec_trailer) {
+            uint8_t sector_num = mf_classic_get_sector_by_block(block_num);
+            MfClassicSectorTrailer* sec_tr =
+                mf_classic_get_sector_trailer_by_sector(data, sector_num);
+            // Key A
+            for(size_t i = 0; i < sizeof(sec_tr->key_a); i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_key_found(data, sector_num, MfClassicKeyA)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store, "%02X%02X ", sec_tr->key_a[i], sec_tr->key_a[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+            // Access bytes
+            for(size_t i = 0; i < MF_CLASSIC_ACCESS_BYTES_SIZE; i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_block_read(data, block_num)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store,
+                        "%02X%02X ",
+                        sec_tr->access_bits[i],
+                        sec_tr->access_bits[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+            // Key B
+            for(size_t i = 0; i < sizeof(sec_tr->key_b); i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_key_found(data, sector_num, MfClassicKeyB)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store, "%02X%02X ", sec_tr->key_b[i], sec_tr->key_b[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+        } else {
+            // Write data block
+            for(size_t i = 0; i < MF_CLASSIC_BLOCK_SIZE; i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_block_read(data, block_num)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store,
+                        "%02X%02X ",
+                        data->block[block_num].value[i],
+                        data->block[block_num].value[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+        }
+    }
+    text_box_set_text(text_box, furi_string_get_cstr(nfc->text_box_store));
+
+    view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextBox);
+}
+
+bool nfc_scene_mf_classic_data_on_event(void* context, SceneManagerEvent event) {
+    UNUSED(context);
+    UNUSED(event);
+    return false;
+}
+
+void nfc_scene_mf_classic_data_on_exit(void* context) {
+    Nfc* nfc = context;
+
+    // Clean view
+    text_box_reset(nfc->text_box);
+    furi_string_reset(nfc->text_box_store);
+}

applications/main/nfc/scenes/nfc_scene_nfc_data_info.c

@@ -14,7 +14,8 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
     NfcDeviceData* dev_data = &nfc->dev->dev_data;
     NfcProtocol protocol = dev_data->protocol;
     uint8_t text_scroll_height = 0;
-    if((protocol == NfcDeviceProtocolMifareDesfire) || (protocol == NfcDeviceProtocolMifareUl)) {
+    if((protocol == NfcDeviceProtocolMifareDesfire) || (protocol == NfcDeviceProtocolMifareUl) ||
+       (protocol == NfcDeviceProtocolMifareClassic)) {
         widget_add_button_element(
             widget, GuiButtonTypeRight, "More", nfc_scene_nfc_data_info_widget_callback, nfc);
         text_scroll_height = 52;
@@ -136,6 +137,9 @@ bool nfc_scene_nfc_data_info_on_event(void* context, SceneManagerEvent event) {
             } else if(protocol == NfcDeviceProtocolMifareUl) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightData);
                 consumed = true;
+            } else if(protocol == NfcDeviceProtocolMifareClassic) {
+                scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicData);
+                consumed = true;
             }
         }
     }

applications/main/nfc/scenes/nfc_scene_saved_menu.c

@@ -151,6 +151,8 @@ bool nfc_scene_saved_menu_on_event(void* context, SceneManagerEvent event) {
                 application_info_present = nfc_supported_card_verify_and_parse(dev_data);
             }
 
+            FURI_LOG_I("nfc", "application_info_present: %d", application_info_present);
+
             if(application_info_present) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneDeviceInfo);
             } else {

applications/main/subghz/helpers/subghz_chat.c

@@ -9,7 +9,7 @@ struct SubGhzChatWorker {
     SubGhzTxRxWorker* subghz_txrx;
 
     volatile bool worker_running;
-    volatile bool worker_stoping;
+    volatile bool worker_stopping;
     FuriMessageQueue* event_queue;
     uint32_t last_time_rx_data;
 

applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -117,15 +117,15 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
 
         // First stage: coarse scan
         for(size_t i = 0; i < subghz_setting_get_frequency_count(instance->setting); i++) {
-            uint32_t current_frequnecy = subghz_setting_get_frequency(instance->setting, i);
-            if(furi_hal_subghz_is_frequency_valid(current_frequnecy) &&
-               (current_frequnecy != 467750000) &&
+            uint32_t current_frequency = subghz_setting_get_frequency(instance->setting, i);
+            if(furi_hal_subghz_is_frequency_valid(current_frequency) &&
+               (current_frequency != 467750000) &&
                !((furi_hal_subghz.radio_type == SubGhzRadioExternal) &&
-                 (current_frequnecy >= 311900000 && current_frequnecy <= 312200000))) {
+                 (current_frequency >= 311900000 && current_frequency <= 312200000))) {
                 furi_hal_spi_acquire(furi_hal_subghz.spi_bus_handle);
                 cc1101_switch_to_idle(furi_hal_subghz.spi_bus_handle);
                 frequency =
-                    cc1101_set_frequency(furi_hal_subghz.spi_bus_handle, current_frequnecy);
+                    cc1101_set_frequency(furi_hal_subghz.spi_bus_handle, current_frequency);
 
                 cc1101_calibrate(furi_hal_subghz.spi_bus_handle);
                 do {

applications/main/subghz/helpers/subghz_types.h

@@ -23,7 +23,7 @@ typedef enum {
 /** SubGhzHopperState state */
 typedef enum {
     SubGhzHopperStateOFF,
-    SubGhzHopperStateRunnig,
+    SubGhzHopperStateRunning,
     SubGhzHopperStatePause,
     SubGhzHopperStateRSSITimeOut,
 } SubGhzHopperState;

applications/main/subghz/scenes/subghz_scene_read_raw.c

@@ -368,7 +368,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
 
             float rssi = furi_hal_subghz_get_rssi();
 
-            if(float_is_equal(subghz->txrx->raw_threshold_rssi, SUBGHZ_RAW_TRESHOLD_MIN)) {
+            if(float_is_equal(subghz->txrx->raw_threshold_rssi, SUBGHZ_RAW_THRESHOLD_MIN)) {
                 subghz_read_raw_add_data_rssi(subghz->subghz_read_raw, rssi, true);
                 subghz_protocol_raw_save_to_file_pause(
                     (SubGhzProtocolDecoderRAW*)subghz->txrx->decoder_result, false);

applications/main/subghz/scenes/subghz_scene_receiver_config.c

@@ -8,11 +8,11 @@ enum SubGhzSettingIndex {
     SubGhzSettingIndexBinRAW,
     SubGhzSettingIndexSound,
     SubGhzSettingIndexLock,
-    SubGhzSettingIndexRAWThesholdRSSI,
+    SubGhzSettingIndexRAWThresholdRSSI,
 };
 
 #define RAW_THRESHOLD_RSSI_COUNT 11
-const char* const raw_theshold_rssi_text[RAW_THRESHOLD_RSSI_COUNT] = {
+const char* const raw_threshold_rssi_text[RAW_THRESHOLD_RSSI_COUNT] = {
     "-----",
     "-85.0",
     "-80.0",
@@ -26,7 +26,7 @@ const char* const raw_theshold_rssi_text[RAW_THRESHOLD_RSSI_COUNT] = {
     "-40.0",
 
 };
-const float raw_theshold_rssi_value[RAW_THRESHOLD_RSSI_COUNT] = {
+const float raw_threshold_rssi_value[RAW_THRESHOLD_RSSI_COUNT] = {
     -90.0f,
     -85.0f,
     -80.0f,
@@ -47,7 +47,7 @@ const char* const hopping_text[HOPPING_COUNT] = {
 };
 const uint32_t hopping_value[HOPPING_COUNT] = {
     SubGhzHopperStateOFF,
-    SubGhzHopperStateRunnig,
+    SubGhzHopperStateRunning,
 };
 
 #define SPEAKER_COUNT 2
@@ -213,8 +213,8 @@ static void subghz_scene_receiver_config_set_raw_threshold_rssi(VariableItem* it
     SubGhz* subghz = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
-    variable_item_set_current_value_text(item, raw_theshold_rssi_text[index]);
-    subghz->txrx->raw_threshold_rssi = raw_theshold_rssi_value[index];
+    variable_item_set_current_value_text(item, raw_threshold_rssi_text[index]);
+    subghz->txrx->raw_threshold_rssi = raw_threshold_rssi_value[index];
 }
 
 static void subghz_scene_receiver_config_var_list_enter_callback(void* context, uint32_t index) {
@@ -320,9 +320,9 @@ void subghz_scene_receiver_config_on_enter(void* context) {
             subghz_scene_receiver_config_set_raw_threshold_rssi,
             subghz);
         value_index = value_index_float(
-            subghz->txrx->raw_threshold_rssi, raw_theshold_rssi_value, RAW_THRESHOLD_RSSI_COUNT);
+            subghz->txrx->raw_threshold_rssi, raw_threshold_rssi_value, RAW_THRESHOLD_RSSI_COUNT);
         variable_item_set_current_value_index(item, value_index);
-        variable_item_set_current_value_text(item, raw_theshold_rssi_text[value_index]);
+        variable_item_set_current_value_text(item, raw_threshold_rssi_text[value_index]);
     }
     view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdVariableItemList);
 }

applications/main/subghz/scenes/subghz_scene_receiver_info.c

@@ -148,7 +148,7 @@ bool subghz_scene_receiver_info_on_event(void* context, SceneManagerEvent event)
                         subghz_rx(subghz, subghz->txrx->preset->frequency);
                     }
                     if(subghz->txrx->hopper_state == SubGhzHopperStatePause) {
-                        subghz->txrx->hopper_state = SubGhzHopperStateRunnig;
+                        subghz->txrx->hopper_state = SubGhzHopperStateRunning;
                     }
                     subghz->state_notifications = SubGhzNotificationStateRx;
                 } else {
@@ -175,7 +175,7 @@ bool subghz_scene_receiver_info_on_event(void* context, SceneManagerEvent event)
                     subghz_rx(subghz, subghz->txrx->preset->frequency);
                 }
                 if(subghz->txrx->hopper_state == SubGhzHopperStatePause) {
-                    subghz->txrx->hopper_state = SubGhzHopperStateRunnig;
+                    subghz->txrx->hopper_state = SubGhzHopperStateRunning;
                 }
                 subghz->state_notifications = SubGhzNotificationStateRx;
             }

applications/main/subghz/scenes/subghz_scene_set_seed_bft.c

@@ -14,7 +14,7 @@ void subghz_scene_set_seed_bft_on_enter(void* context) {
     SubGhz* subghz = context;
 
     // Setup view
-    // roguemaster don't steal!!!
+    // RogueMaster don't steal!!!
     ByteInput* byte_input = subghz->byte_input;
     byte_input_set_header_text(byte_input, "Enter SEED in hex");
     byte_input_set_result_callback(

applications/main/subghz/scenes/subghz_scene_set_seed_faac.c

@@ -65,7 +65,7 @@ bool subghz_scene_set_seed_faac_on_event(void* context, SceneManagerEvent event)
                     seed,
                     "FAAC_SLH",
                     subghz->txrx->preset);
-                // rogueemaster dont steal!
+                // RogueMaster dont steal!
                 uint8_t seed_data[sizeof(uint32_t)] = {0};
                 for(size_t i = 0; i < sizeof(uint32_t); i++) {
                     seed_data[sizeof(uint32_t) - i - 1] = (seed >> i * 8) & 0xFF;

applications/main/subghz/subghz.c

@@ -275,7 +275,7 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
         subghz->txrx->history = subghz_history_alloc();
     }
 
-    subghz->txrx->raw_threshold_rssi = SUBGHZ_RAW_TRESHOLD_MIN;
+    subghz->txrx->raw_threshold_rssi = SUBGHZ_RAW_THRESHOLD_MIN;
     subghz->txrx->worker = subghz_worker_alloc();
 
     subghz->txrx->fff_data = flipper_format_string_alloc();

applications/main/subghz/subghz_history.h

@@ -80,7 +80,7 @@ void subghz_history_get_text_item_menu(SubGhzHistory* instance, FuriString* outp
  * 
  * @param instance  - SubGhzHistory instance
  * @param output    - FuriString* output
- * @return bool - is FUUL
+ * @return bool - is FULL
  */
 bool subghz_history_get_text_space_left(SubGhzHistory* instance, FuriString* output);
 

applications/main/subghz/subghz_history_private.h

@@ -92,7 +92,7 @@ uint32_t subghz_history_rand_range(uint32_t min, uint32_t max);
  * 
  * @param file - Stream*
  * @param is_negative_start - first value is negative or positive?
- * @param current_position - 0 if started from begining
+ * @param current_position - 0 if started from beginning
  * @param empty_line - add RAW_Data to this line
  * @return true 
  * @return false 

applications/main/subghz/subghz_i.c

@@ -575,7 +575,7 @@ void subghz_hopper_update(SubGhz* subghz) {
             return;
         }
     } else {
-        subghz->txrx->hopper_state = SubGhzHopperStateRunnig;
+        subghz->txrx->hopper_state = SubGhzHopperStateRunning;
     }
     // Select next frequency
     if(subghz->txrx->hopper_idx_frequency <

applications/main/subghz/views/receiver.c

@@ -12,7 +12,7 @@
 #define MENU_ITEMS 4u
 #define UNLOCK_CNT 3
 
-#define SUBGHZ_RAW_TRESHOLD_MIN -90.0f
+#define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
 
 typedef struct {
     FuriString* item_str;
@@ -80,10 +80,10 @@ void subghz_receiver_rssi(SubGhzViewReceiver* instance, float rssi) {
         instance->view,
         SubGhzViewReceiverModel * model,
         {
-            if(rssi < SUBGHZ_RAW_TRESHOLD_MIN) {
+            if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
                 model->u_rssi = 0;
             } else {
-                model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_TRESHOLD_MIN);
+                model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_THRESHOLD_MIN);
             }
         },
         true);

applications/main/subghz/views/subghz_read_raw.c

@@ -23,7 +23,7 @@ typedef struct {
     FuriString* sample_write;
     FuriString* file_name;
     uint8_t* rssi_history;
-    uint8_t rssi_curret;
+    uint8_t rssi_current;
     bool rssi_history_end;
     uint8_t ind_write;
     uint8_t ind_sin;
@@ -62,17 +62,17 @@ void subghz_read_raw_add_data_rssi(SubGhzReadRAW* instance, float rssi, bool tra
     furi_assert(instance);
     uint8_t u_rssi = 0;
 
-    if(rssi < SUBGHZ_RAW_TRESHOLD_MIN) {
+    if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
         u_rssi = 0;
     } else {
-        u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_TRESHOLD_MIN) / 2.7);
+        u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
     }
 
     with_view_model(
         instance->view,
         SubGhzReadRAWModel * model,
         {
-            model->rssi_curret = u_rssi;
+            model->rssi_current = u_rssi;
             if(trace) {
                 model->rssi_history[model->ind_write++] = u_rssi;
             } else {
@@ -206,10 +206,10 @@ void subghz_read_raw_draw_rssi(Canvas* canvas, SubGhzReadRAWModel* model) {
             canvas_draw_line(canvas, i, 47, i, 47 - model->rssi_history[i]);
         }
         canvas_draw_line(
-            canvas, model->ind_write + 1, 47, model->ind_write + 1, 47 - model->rssi_curret);
+            canvas, model->ind_write + 1, 47, model->ind_write + 1, 47 - model->rssi_current);
         if(model->ind_write > 3) {
             canvas_draw_line(
-                canvas, model->ind_write - 1, 47, model->ind_write - 1, 47 - model->rssi_curret);
+                canvas, model->ind_write - 1, 47, model->ind_write - 1, 47 - model->rssi_current);
 
             for(uint8_t i = 13; i < 47; i += width * 2) {
                 canvas_draw_line(canvas, model->ind_write, i, model->ind_write, i + width);
@@ -231,13 +231,13 @@ void subghz_read_raw_draw_rssi(Canvas* canvas, SubGhzReadRAWModel* model) {
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE - 1,
             47,
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE - 1,
-            47 - model->rssi_curret);
+            47 - model->rssi_current);
         canvas_draw_line(
             canvas,
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE + 1,
             47,
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE + 1,
-            47 - model->rssi_curret);
+            47 - model->rssi_current);
 
         for(uint8_t i = 13; i < 47; i += width * 2) {
             canvas_draw_line(
@@ -266,9 +266,9 @@ void subghz_read_raw_draw_threshold_rssi(Canvas* canvas, SubGhzReadRAWModel* mod
     uint8_t x = 118;
     uint8_t y = 48;
 
-    if(model->raw_threshold_rssi > SUBGHZ_RAW_TRESHOLD_MIN) {
+    if(model->raw_threshold_rssi > SUBGHZ_RAW_THRESHOLD_MIN) {
         uint8_t x = 118;
-        y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_TRESHOLD_MIN) / 2.7);
+        y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
 
         uint8_t width = 3;
         for(uint8_t i = 0; i < x; i += width * 2) {

applications/main/subghz/views/subghz_read_raw.h

@@ -3,7 +3,7 @@
 #include <gui/view.h>
 #include "../helpers/subghz_custom_event.h"
 
-#define SUBGHZ_RAW_TRESHOLD_MIN -90.0f
+#define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
 
 typedef struct SubGhzReadRAW SubGhzReadRAW;
 

applications/main/u2f/u2f_data.c

@@ -178,7 +178,7 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
     uint8_t key_slot = 0;
     uint32_t version = 0;
 
-    // Check if unique key exists in secure eclave and generate it if missing
+    // Check if unique key exists in secure eclave(typo?) and generate it if missing
     if(!furi_hal_crypto_verify_key(U2F_DATA_FILE_ENCRYPTION_KEY_SLOT_UNIQUE)) return false;
 
     FuriString* filetype;

applications/main/unirfremix/unirfremix_app.c

@@ -640,7 +640,7 @@ static void render_callback(Canvas* canvas, void* ctx) {
         //canvas_draw_str(canvas, 0, 40, "D: ");
         //canvas_draw_str(canvas, 0, 50, "Ok: ");
 
-        //PNGs are located in assets/icons/UniRFRemix before compiliation
+        //PNGs are located in assets/icons/UniRFRemix before compilation
 
         //Icons for Labels
         //canvas_draw_icon(canvas, 0, 0, &I_UniRFRemix_LeftAlignedButtons_9x64);

applications/plugins/hid_app/application.fam

@@ -1,14 +1,14 @@
-#App(
-#    appid="hid_usb",
-#    name="USB Remote",
-#    apptype=FlipperAppType.PLUGIN,
-#    entry_point="hid_usb_app",
-#    stack_size=1 * 1024,
-#    fap_category="Tools",
-#    fap_icon="hid_usb_10px.png",
-#    fap_icon_assets="assets",
-#    fap_icon_assets_symbol="hid",
-#)
+App(
+    appid="hid_usb",
+    name="USB Keyboard & Mouse",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="hid_usb_app",
+    stack_size=1 * 1024,
+    fap_category="Misc",
+    fap_icon="hid_usb_10px.png",
+    fap_icon_assets="assets",
+    fap_icon_assets_symbol="hid",
+)
 
 
 App(
@@ -17,7 +17,7 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="hid_ble_app",
     stack_size=1 * 1024,
-    fap_category="Tools",
+    fap_category="Misc",
     fap_icon="hid_ble_10px.png",
     fap_icon_assets="assets",
     fap_icon_assets_symbol="hid",

applications/plugins/hid_app/views/hid_keyboard.c

@@ -140,18 +140,18 @@ const HidKeyboardKey hid_keyboard_keyset[ROW_COUNT][COLUMN_COUNT] = {
         {.width = 1, .icon = &I_ButtonRight_4x7, .value = HID_KEYBOARD_RIGHT_ARROW},
     },
     {
-        {.width = 3, .icon = NULL, .key = "Ctrl", .value = HID_KEYBOARD_L_CTRL},
+        {.width = 2, .icon = NULL, .key = "Ctl", .value = HID_KEYBOARD_L_CTRL},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 3, .icon = NULL, .key = "Alt", .value = HID_KEYBOARD_L_ALT},
+        {.width = 2, .icon = NULL, .key = "Alt", .value = HID_KEYBOARD_L_ALT},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 3, .icon = NULL, .key = "Cmd", .value = HID_KEYBOARD_L_GUI},
+        {.width = 2, .icon = NULL, .key = "Cmd", .value = HID_KEYBOARD_L_GUI},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 3, .icon = NULL, .key = "Tab", .value = HID_KEYBOARD_TAB},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
+        {.width = 2, .icon = NULL, .key = "Tab", .value = HID_KEYBOARD_TAB},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
+        {.width = 2, .icon = NULL, .key = "Esc", .value = HID_KEYBOARD_ESCAPE},
+        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_ESCAPE},
+        {.width = 2, .icon = NULL, .key = "Del", .value = HID_KEYBOARD_DELETE_FORWARD},
+        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_DELETE_FORWARD},
     },
 };
 

applications/plugins/swd_probe/.gitignore

@@ -0,0 +1,52 @@
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf

applications/plugins/swd_probe/LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

applications/plugins/swd_probe/adi.h

@@ -0,0 +1,34 @@
+
+#ifndef __ADI_H__
+#define __ADI_H__
+
+#include "swd_probe_app.h"
+
+#define ARM_ID 0x23B
+
+#define ARCH_ID(architect, archid) ((architect) << 21) | (archid)
+
+#define BIT(nr) (1UL << (nr))
+#define ARM_CS_C9_DEVARCH_PRESENT BIT(20)
+#define ARM_CS_C9_DEVARCH_ARCHITECT_MASK (0xFFE00000)
+#define ARM_CS_C9_DEVARCH_ARCHID_MASK (0x0000FFFF)
+#define DEVARCH_ID_MASK (ARM_CS_C9_DEVARCH_ARCHITECT_MASK | ARM_CS_C9_DEVARCH_ARCHID_MASK)
+
+typedef struct {
+    uint16_t designer;
+    uint16_t part;
+    uint8_t revision;
+    uint8_t cmod;
+    uint8_t revand;
+    uint8_t size;
+} pidr_data_t;
+
+typedef enum { CIDR_CLASS_ROMTABLE = 0x01, CIDR_CLASS_CORESIGHT = 0x09 } cidr_classes_t;
+
+uint32_t adi_romtable_entry_count(AppFSM* const ctx, uint32_t base);
+uint32_t adi_romtable_get(AppFSM* const ctx, uint32_t base, uint32_t pos);
+bool adi_is_romtable(AppFSM* const ctx, uint32_t base);
+const char* adi_romtable_type(AppFSM* const ctx, uint32_t base);
+const char* adi_romtable_full(AppFSM* const ctx, uint32_t base);
+
+#endif

applications/plugins/swd_probe/application.fam

@@ -0,0 +1,13 @@
+App(
+    appid="swd_probe",
+    name="SWD Probe",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="swd_probe_app_main",
+    cdefines=["APP_SWD_PROBE"],
+    requires=["notification", "gui", "storage", "dialogs", "cli"],
+    stack_size=2 * 1024,
+    order=10,
+    fap_icon="icons/app.png",
+    fap_category="Tools",
+    fap_icon_assets="icons"
+)

applications/plugins/swd_probe/jep106.c

@@ -0,0 +1,26 @@
+/* https://github.com/openocd-org/openocd/blob/master/src/helper/ */
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/***************************************************************************
+ *   Copyright (C) 2015 Andreas Fritiofson                                 *
+ *   andreas.fritiofson@gmail.com                                          *
+ ***************************************************************************/
+
+#include "jep106.h"
+
+static const char* const jep106[][126] = {
+#include "jep106.inc"
+};
+
+const char* jep106_table_manufacturer(unsigned int bank, unsigned int id) {
+    if(id < 1 || id > 126) {
+        return "<invalid>";
+    }
+
+    /* index is zero based */
+    id--;
+
+    if(bank >= 14 || jep106[bank][id] == 0) return "<unknown>";
+
+    return jep106[bank][id];
+}

applications/plugins/swd_probe/jep106.h

@@ -0,0 +1,26 @@
+/* https://github.com/openocd-org/openocd/blob/master/src/helper/ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+/***************************************************************************
+ *   Copyright (C) 2015 Andreas Fritiofson                                 *
+ *   andreas.fritiofson@gmail.com                                          *
+ ***************************************************************************/
+
+#ifndef OPENOCD_HELPER_JEP106_H
+#define OPENOCD_HELPER_JEP106_H
+
+/**
+ * Get the manufacturer name associated with a JEP106 ID.
+ * @param bank The bank (number of continuation codes) of the manufacturer ID.
+ * @param id The 7-bit manufacturer ID (i.e. with parity stripped).
+ * @return A pointer to static const storage containing the name of the
+ *         manufacturer associated with bank and id, or one of the strings
+ *         "<invalid>" and "<unknown>".
+ */
+const char* jep106_table_manufacturer(unsigned int bank, unsigned int id);
+
+static inline const char* jep106_manufacturer(unsigned int manufacturer) {
+    return jep106_table_manufacturer(manufacturer >> 7, manufacturer & 0x7f);
+}
+
+#endif /* OPENOCD_HELPER_JEP106_H */

applications/plugins/swd_probe/model/chip.ply

@@ -0,0 +1,216 @@
+ply
+format ascii 1.0
+comment Created by Blender 3.3.1 - www.blender.org
+element vertex 136
+property float x
+property float y
+property float z
+element face 70
+property list uchar uint vertex_indices
+end_header
+1.000000 1.000000 0.152153
+-1.000000 1.000000 0.152153
+-1.000000 -1.000000 0.152153
+1.000000 -1.000000 0.152153
+1.000000 -1.000000 -0.185787
+-1.000000 -1.000000 -0.185787
+-1.000000 1.000000 -0.185787
+1.000000 1.000000 -0.185787
+-1.000043 -0.785071 -0.015780
+-1.155724 -0.785071 -0.015780
+-1.155724 -0.918718 -0.015780
+-1.000043 -0.918718 -0.015780
+-1.155724 -0.785071 0.127052
+-1.000043 -0.785071 0.127052
+-1.000043 -0.918718 0.127052
+-1.155724 -0.918718 0.127052
+-1.234192 -0.918846 -0.087021
+-1.234397 -0.785201 -0.086336
+-1.235319 -0.784943 -0.229143
+-1.235114 -0.918588 -0.229828
+-1.388133 -0.919573 -0.078673
+-1.389056 -0.919314 -0.221479
+-1.389261 -0.785669 -0.220795
+-1.388338 -0.785927 -0.077988
+-1.000043 -0.219627 -0.015780
+-1.155724 -0.219627 -0.015780
+-1.155724 -0.353273 -0.015780
+-1.000043 -0.353273 -0.015780
+-1.155724 -0.219627 0.127052
+-1.000043 -0.219627 0.127052
+-1.000043 -0.353273 0.127052
+-1.155724 -0.353273 0.127052
+-1.234192 -0.353402 -0.087021
+-1.234397 -0.219756 -0.086336
+-1.235319 -0.219498 -0.229143
+-1.235114 -0.353143 -0.229828
+-1.388133 -0.354128 -0.078673
+-1.389056 -0.353870 -0.221479
+-1.389261 -0.220224 -0.220795
+-1.388338 -0.220482 -0.077988
+-1.000043 0.345818 -0.015780
+-1.155724 0.345818 -0.015780
+-1.155724 0.212172 -0.015780
+-1.000043 0.212172 -0.015780
+-1.155724 0.345818 0.127052
+-1.000043 0.345818 0.127052
+-1.000043 0.212172 0.127052
+-1.155724 0.212172 0.127052
+-1.234192 0.212043 -0.087021
+-1.234397 0.345689 -0.086336
+-1.235319 0.345947 -0.229143
+-1.235114 0.212301 -0.229828
+-1.388133 0.211317 -0.078673
+-1.389056 0.211575 -0.221479
+-1.389261 0.345221 -0.220795
+-1.388338 0.344962 -0.077988
+-1.000043 0.911263 -0.015780
+-1.155724 0.911263 -0.015780
+-1.155724 0.777617 -0.015780
+-1.000043 0.777617 -0.015780
+-1.155724 0.911263 0.127052
+-1.000043 0.911263 0.127052
+-1.000043 0.777617 0.127052
+-1.155724 0.777617 0.127052
+-1.234192 0.777488 -0.087021
+-1.234397 0.911133 -0.086336
+-1.235319 0.911392 -0.229143
+-1.235114 0.777746 -0.229828
+-1.388133 0.776762 -0.078673
+-1.389056 0.777020 -0.221479
+-1.389261 0.910665 -0.220795
+-1.388338 0.910407 -0.077988
+1.000043 -0.785071 -0.015780
+1.000043 -0.918718 -0.015780
+1.155723 -0.918718 -0.015780
+1.155723 -0.785071 -0.015780
+1.155723 -0.785071 0.127052
+1.155723 -0.918718 0.127052
+1.000043 -0.918718 0.127052
+1.000043 -0.785071 0.127052
+1.234397 -0.785201 -0.086336
+1.234192 -0.918846 -0.087021
+1.235114 -0.918588 -0.229828
+1.235319 -0.784943 -0.229143
+1.388133 -0.919573 -0.078673
+1.388338 -0.785927 -0.077988
+1.389260 -0.785669 -0.220795
+1.389056 -0.919314 -0.221479
+1.000043 -0.219627 -0.015780
+1.000043 -0.353273 -0.015780
+1.155723 -0.353273 -0.015780
+1.155723 -0.219627 -0.015780
+1.155723 -0.219627 0.127052
+1.155723 -0.353273 0.127052
+1.000043 -0.353273 0.127052
+1.000043 -0.219627 0.127052
+1.234397 -0.219756 -0.086336
+1.234192 -0.353402 -0.087021
+1.235114 -0.353143 -0.229828
+1.235319 -0.219498 -0.229143
+1.388133 -0.354128 -0.078673
+1.388338 -0.220482 -0.077988
+1.389260 -0.220224 -0.220795
+1.389056 -0.353870 -0.221479
+1.000043 0.345818 -0.015780
+1.000043 0.212172 -0.015780
+1.155723 0.212172 -0.015780
+1.155723 0.345818 -0.015780
+1.155723 0.345818 0.127052
+1.155723 0.212172 0.127052
+1.000043 0.212172 0.127052
+1.000043 0.345818 0.127052
+1.234397 0.345689 -0.086336
+1.234192 0.212043 -0.087021
+1.235114 0.212301 -0.229828
+1.235319 0.345947 -0.229143
+1.388133 0.211317 -0.078673
+1.388338 0.344962 -0.077988
+1.389260 0.345221 -0.220795
+1.389056 0.211575 -0.221479
+1.000043 0.911263 -0.015780
+1.000043 0.777616 -0.015780
+1.155723 0.777616 -0.015780
+1.155723 0.911263 -0.015780
+1.155723 0.911263 0.127052
+1.155723 0.777616 0.127052
+1.000043 0.777616 0.127052
+1.000043 0.911263 0.127052
+1.234397 0.911133 -0.086336
+1.234192 0.777488 -0.087021
+1.235114 0.777746 -0.229828
+1.235319 0.911392 -0.229143
+1.388133 0.776762 -0.078673
+1.388338 0.910407 -0.077988
+1.389260 0.910665 -0.220795
+1.389056 0.777020 -0.221479
+4 0 1 2 3
+4 4 3 2 5
+4 5 2 1 6
+4 6 7 4 5
+4 7 0 3 4
+4 6 1 0 7
+4 8 9 10 11
+4 12 13 14 15
+4 13 8 11 14
+4 12 15 16 17
+4 10 9 18 19
+4 20 21 22 23
+4 17 16 20 23
+4 19 18 22 21
+4 24 25 26 27
+4 28 29 30 31
+4 29 24 27 30
+4 28 31 32 33
+4 26 25 34 35
+4 36 37 38 39
+4 33 32 36 39
+4 35 34 38 37
+4 40 41 42 43
+4 44 45 46 47
+4 45 40 43 46
+4 44 47 48 49
+4 42 41 50 51
+4 52 53 54 55
+4 49 48 52 55
+4 51 50 54 53
+4 56 57 58 59
+4 60 61 62 63
+4 61 56 59 62
+4 60 63 64 65
+4 58 57 66 67
+4 68 69 70 71
+4 65 64 68 71
+4 67 66 70 69
+4 72 73 74 75
+4 76 77 78 79
+4 79 78 73 72
+4 76 80 81 77
+4 74 82 83 75
+4 84 85 86 87
+4 80 85 84 81
+4 82 87 86 83
+4 88 89 90 91
+4 92 93 94 95
+4 95 94 89 88
+4 92 96 97 93
+4 90 98 99 91
+4 100 101 102 103
+4 96 101 100 97
+4 98 103 102 99
+4 104 105 106 107
+4 108 109 110 111
+4 111 110 105 104
+4 108 112 113 109
+4 106 114 115 107
+4 116 117 118 119
+4 112 117 116 113
+4 114 119 118 115
+4 120 121 122 123
+4 124 125 126 127
+4 127 126 121 120
+4 124 128 129 125
+4 122 130 131 123
+4 132 133 134 135
+4 128 133 132 129
+4 130 135 134 131

applications/plugins/swd_probe/model/convert.py

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+import plyfile
+import argparse
+
+parser = argparse.ArgumentParser(description='Convert a PLY file to C arrays.')
+parser.add_argument('input_file', help='the input PLY file')
+parser.add_argument('output_file', help='the output C file')
+args = parser.parse_args()
+
+# Open the PLY file
+plydata = plyfile.PlyData.read(args.input_file)
+
+# Extract the vertices
+vertices = plydata['vertex'].data
+num_vertices = len(vertices)
+
+with open(args.output_file, 'w') as f:
+    f.write('#define NUM_VERTICES %d\n' % num_vertices)
+    f.write('float vertexCoords[NUM_VERTICES][3] = {\n')
+    for i in range(num_vertices):
+        x, y, z = vertices[i][0], vertices[i][1], vertices[i][2]
+        f.write('  {%f, %f, %f},\n' % (x, y, z))
+    f.write('};')
+
+    # Extract the faces
+    faces = plydata['face'].data
+    num_faces = len(faces)
+    f.write('int edgeIndices[][3] = {\n')
+    for i in range(num_faces):
+        face = faces[i][0]
+        if len(face) == 3:
+            f.write('  {%d, %d, %d},\n' % (face[0], face[1], face[2]))
+        elif len(face) == 4:
+            # Convert 4-index face to 2-index edges
+            edges = [(face[0], face[1]), (face[1], face[2]), (face[2], face[3]), (face[3], face[0])]
+            for edge in edges:
+                f.write('  {%d, %d},\n' % (edge[0], edge[1]))
+    f.write('};\n')

applications/plugins/swd_probe/model/model_chip.h

@@ -0,0 +1,420 @@
+#define NUM_VERTICES 136
+float vertexCoords[NUM_VERTICES][3] = {
+  {1.000000, 1.000000, 0.152153},
+  {-1.000000, 1.000000, 0.152153},
+  {-1.000000, -1.000000, 0.152153},
+  {1.000000, -1.000000, 0.152153},
+  {1.000000, -1.000000, -0.185787},
+  {-1.000000, -1.000000, -0.185787},
+  {-1.000000, 1.000000, -0.185787},
+  {1.000000, 1.000000, -0.185787},
+  {-1.000043, -0.785071, -0.015780},
+  {-1.155724, -0.785071, -0.015780},
+  {-1.155724, -0.918718, -0.015780},
+  {-1.000043, -0.918718, -0.015780},
+  {-1.155724, -0.785071, 0.127052},
+  {-1.000043, -0.785071, 0.127052},
+  {-1.000043, -0.918718, 0.127052},
+  {-1.155724, -0.918718, 0.127052},
+  {-1.234192, -0.918846, -0.087021},
+  {-1.234397, -0.785201, -0.086336},
+  {-1.235319, -0.784943, -0.229143},
+  {-1.235114, -0.918588, -0.229828},
+  {-1.388133, -0.919573, -0.078673},
+  {-1.389056, -0.919314, -0.221479},
+  {-1.389261, -0.785669, -0.220795},
+  {-1.388338, -0.785927, -0.077988},
+  {-1.000043, -0.219627, -0.015780},
+  {-1.155724, -0.219627, -0.015780},
+  {-1.155724, -0.353273, -0.015780},
+  {-1.000043, -0.353273, -0.015780},
+  {-1.155724, -0.219627, 0.127052},
+  {-1.000043, -0.219627, 0.127052},
+  {-1.000043, -0.353273, 0.127052},
+  {-1.155724, -0.353273, 0.127052},
+  {-1.234192, -0.353402, -0.087021},
+  {-1.234397, -0.219756, -0.086336},
+  {-1.235319, -0.219498, -0.229143},
+  {-1.235114, -0.353143, -0.229828},
+  {-1.388133, -0.354128, -0.078673},
+  {-1.389056, -0.353870, -0.221479},
+  {-1.389261, -0.220224, -0.220795},
+  {-1.388338, -0.220482, -0.077988},
+  {-1.000043, 0.345818, -0.015780},
+  {-1.155724, 0.345818, -0.015780},
+  {-1.155724, 0.212172, -0.015780},
+  {-1.000043, 0.212172, -0.015780},
+  {-1.155724, 0.345818, 0.127052},
+  {-1.000043, 0.345818, 0.127052},
+  {-1.000043, 0.212172, 0.127052},
+  {-1.155724, 0.212172, 0.127052},
+  {-1.234192, 0.212043, -0.087021},
+  {-1.234397, 0.345689, -0.086336},
+  {-1.235319, 0.345947, -0.229143},
+  {-1.235114, 0.212301, -0.229828},
+  {-1.388133, 0.211317, -0.078673},
+  {-1.389056, 0.211575, -0.221479},
+  {-1.389261, 0.345221, -0.220795},
+  {-1.388338, 0.344962, -0.077988},
+  {-1.000043, 0.911263, -0.015780},
+  {-1.155724, 0.911263, -0.015780},
+  {-1.155724, 0.777617, -0.015780},
+  {-1.000043, 0.777617, -0.015780},
+  {-1.155724, 0.911263, 0.127052},
+  {-1.000043, 0.911263, 0.127052},
+  {-1.000043, 0.777617, 0.127052},
+  {-1.155724, 0.777617, 0.127052},
+  {-1.234192, 0.777488, -0.087021},
+  {-1.234397, 0.911133, -0.086336},
+  {-1.235319, 0.911392, -0.229143},
+  {-1.235114, 0.777746, -0.229828},
+  {-1.388133, 0.776762, -0.078673},
+  {-1.389056, 0.777020, -0.221479},
+  {-1.389261, 0.910665, -0.220795},
+  {-1.388338, 0.910407, -0.077988},
+  {1.000043, -0.785071, -0.015780},
+  {1.000043, -0.918718, -0.015780},
+  {1.155723, -0.918718, -0.015780},
+  {1.155723, -0.785071, -0.015780},
+  {1.155723, -0.785071, 0.127052},
+  {1.155723, -0.918718, 0.127052},
+  {1.000043, -0.918718, 0.127052},
+  {1.000043, -0.785071, 0.127052},
+  {1.234397, -0.785201, -0.086336},
+  {1.234192, -0.918846, -0.087021},
+  {1.235114, -0.918588, -0.229828},
+  {1.235319, -0.784943, -0.229143},
+  {1.388133, -0.919573, -0.078673},
+  {1.388338, -0.785927, -0.077988},
+  {1.389260, -0.785669, -0.220795},
+  {1.389056, -0.919314, -0.221479},
+  {1.000043, -0.219627, -0.015780},
+  {1.000043, -0.353273, -0.015780},
+  {1.155723, -0.353273, -0.015780},
+  {1.155723, -0.219627, -0.015780},
+  {1.155723, -0.219627, 0.127052},
+  {1.155723, -0.353273, 0.127052},
+  {1.000043, -0.353273, 0.127052},
+  {1.000043, -0.219627, 0.127052},
+  {1.234397, -0.219756, -0.086336},
+  {1.234192, -0.353402, -0.087021},
+  {1.235114, -0.353143, -0.229828},
+  {1.235319, -0.219498, -0.229143},
+  {1.388133, -0.354128, -0.078673},
+  {1.388338, -0.220482, -0.077988},
+  {1.389260, -0.220224, -0.220795},
+  {1.389056, -0.353870, -0.221479},
+  {1.000043, 0.345818, -0.015780},
+  {1.000043, 0.212172, -0.015780},
+  {1.155723, 0.212172, -0.015780},
+  {1.155723, 0.345818, -0.015780},
+  {1.155723, 0.345818, 0.127052},
+  {1.155723, 0.212172, 0.127052},
+  {1.000043, 0.212172, 0.127052},
+  {1.000043, 0.345818, 0.127052},
+  {1.234397, 0.345689, -0.086336},
+  {1.234192, 0.212043, -0.087021},
+  {1.235114, 0.212301, -0.229828},
+  {1.235319, 0.345947, -0.229143},
+  {1.388133, 0.211317, -0.078673},
+  {1.388338, 0.344962, -0.077988},
+  {1.389260, 0.345221, -0.220795},
+  {1.389056, 0.211575, -0.221479},
+  {1.000043, 0.911263, -0.015780},
+  {1.000043, 0.777616, -0.015780},
+  {1.155723, 0.777616, -0.015780},
+  {1.155723, 0.911263, -0.015780},
+  {1.155723, 0.911263, 0.127052},
+  {1.155723, 0.777616, 0.127052},
+  {1.000043, 0.777616, 0.127052},
+  {1.000043, 0.911263, 0.127052},
+  {1.234397, 0.911133, -0.086336},
+  {1.234192, 0.777488, -0.087021},
+  {1.235114, 0.777746, -0.229828},
+  {1.235319, 0.911392, -0.229143},
+  {1.388133, 0.776762, -0.078673},
+  {1.388338, 0.910407, -0.077988},
+  {1.389260, 0.910665, -0.220795},
+  {1.389056, 0.777020, -0.221479},
+};int edgeIndices[][3] = {
+  {0, 1},
+  {1, 2},
+  {2, 3},
+  {3, 0},
+  {4, 3},
+  {3, 2},
+  {2, 5},
+  {5, 4},
+  {5, 2},
+  {2, 1},
+  {1, 6},
+  {6, 5},
+  {6, 7},
+  {7, 4},
+  {4, 5},
+  {5, 6},
+  {7, 0},
+  {0, 3},
+  {3, 4},
+  {4, 7},
+  {6, 1},
+  {1, 0},
+  {0, 7},
+  {7, 6},
+  {8, 9},
+  {9, 10},
+  {10, 11},
+  {11, 8},
+  {12, 13},
+  {13, 14},
+  {14, 15},
+  {15, 12},
+  {13, 8},
+  {8, 11},
+  {11, 14},
+  {14, 13},
+  {12, 15},
+  {15, 16},
+  {16, 17},
+  {17, 12},
+  {10, 9},
+  {9, 18},
+  {18, 19},
+  {19, 10},
+  {20, 21},
+  {21, 22},
+  {22, 23},
+  {23, 20},
+  {17, 16},
+  {16, 20},
+  {20, 23},
+  {23, 17},
+  {19, 18},
+  {18, 22},
+  {22, 21},
+  {21, 19},
+  {24, 25},
+  {25, 26},
+  {26, 27},
+  {27, 24},
+  {28, 29},
+  {29, 30},
+  {30, 31},
+  {31, 28},
+  {29, 24},
+  {24, 27},
+  {27, 30},
+  {30, 29},
+  {28, 31},
+  {31, 32},
+  {32, 33},
+  {33, 28},
+  {26, 25},
+  {25, 34},
+  {34, 35},
+  {35, 26},
+  {36, 37},
+  {37, 38},
+  {38, 39},
+  {39, 36},
+  {33, 32},
+  {32, 36},
+  {36, 39},
+  {39, 33},
+  {35, 34},
+  {34, 38},
+  {38, 37},
+  {37, 35},
+  {40, 41},
+  {41, 42},
+  {42, 43},
+  {43, 40},
+  {44, 45},
+  {45, 46},
+  {46, 47},
+  {47, 44},
+  {45, 40},
+  {40, 43},
+  {43, 46},
+  {46, 45},
+  {44, 47},
+  {47, 48},
+  {48, 49},
+  {49, 44},
+  {42, 41},
+  {41, 50},
+  {50, 51},
+  {51, 42},
+  {52, 53},
+  {53, 54},
+  {54, 55},
+  {55, 52},
+  {49, 48},
+  {48, 52},
+  {52, 55},
+  {55, 49},
+  {51, 50},
+  {50, 54},
+  {54, 53},
+  {53, 51},
+  {56, 57},
+  {57, 58},
+  {58, 59},
+  {59, 56},
+  {60, 61},
+  {61, 62},
+  {62, 63},
+  {63, 60},
+  {61, 56},
+  {56, 59},
+  {59, 62},
+  {62, 61},
+  {60, 63},
+  {63, 64},
+  {64, 65},
+  {65, 60},
+  {58, 57},
+  {57, 66},
+  {66, 67},
+  {67, 58},
+  {68, 69},
+  {69, 70},
+  {70, 71},
+  {71, 68},
+  {65, 64},
+  {64, 68},
+  {68, 71},
+  {71, 65},
+  {67, 66},
+  {66, 70},
+  {70, 69},
+  {69, 67},
+  {72, 73},
+  {73, 74},
+  {74, 75},
+  {75, 72},
+  {76, 77},
+  {77, 78},
+  {78, 79},
+  {79, 76},
+  {79, 78},
+  {78, 73},
+  {73, 72},
+  {72, 79},
+  {76, 80},
+  {80, 81},
+  {81, 77},
+  {77, 76},
+  {74, 82},
+  {82, 83},
+  {83, 75},
+  {75, 74},
+  {84, 85},
+  {85, 86},
+  {86, 87},
+  {87, 84},
+  {80, 85},
+  {85, 84},
+  {84, 81},
+  {81, 80},
+  {82, 87},
+  {87, 86},
+  {86, 83},
+  {83, 82},
+  {88, 89},
+  {89, 90},
+  {90, 91},
+  {91, 88},
+  {92, 93},
+  {93, 94},
+  {94, 95},
+  {95, 92},
+  {95, 94},
+  {94, 89},
+  {89, 88},
+  {88, 95},
+  {92, 96},
+  {96, 97},
+  {97, 93},
+  {93, 92},
+  {90, 98},
+  {98, 99},
+  {99, 91},
+  {91, 90},
+  {100, 101},
+  {101, 102},
+  {102, 103},
+  {103, 100},
+  {96, 101},
+  {101, 100},
+  {100, 97},
+  {97, 96},
+  {98, 103},
+  {103, 102},
+  {102, 99},
+  {99, 98},
+  {104, 105},
+  {105, 106},
+  {106, 107},
+  {107, 104},
+  {108, 109},
+  {109, 110},
+  {110, 111},
+  {111, 108},
+  {111, 110},
+  {110, 105},
+  {105, 104},
+  {104, 111},
+  {108, 112},
+  {112, 113},
+  {113, 109},
+  {109, 108},
+  {106, 114},
+  {114, 115},
+  {115, 107},
+  {107, 106},
+  {116, 117},
+  {117, 118},
+  {118, 119},
+  {119, 116},
+  {112, 117},
+  {117, 116},
+  {116, 113},
+  {113, 112},
+  {114, 119},
+  {119, 118},
+  {118, 115},
+  {115, 114},
+  {120, 121},
+  {121, 122},
+  {122, 123},
+  {123, 120},
+  {124, 125},
+  {125, 126},
+  {126, 127},
+  {127, 124},
+  {127, 126},
+  {126, 121},
+  {121, 120},
+  {120, 127},
+  {124, 128},
+  {128, 129},
+  {129, 125},
+  {125, 124},
+  {122, 130},
+  {130, 131},
+  {131, 123},
+  {123, 122},
+  {132, 133},
+  {133, 134},
+  {134, 135},
+  {135, 132},
+  {128, 133},
+  {133, 132},
+  {132, 129},
+  {129, 128},
+  {130, 135},
+  {135, 134},
+  {134, 131},
+  {131, 130},
+};

applications/plugins/swd_probe/swd_probe_app.h

@@ -0,0 +1,233 @@
+#ifndef __ARHA_FLIPPERAPP_DEMO
+#define __ARHA_FLIPPERAPP_DEMO
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <furi.h>
+#include <furi_hal.h>
+#include <furi_hal_speaker.h>
+#include <gui/gui.h>
+#include <gui/elements.h>
+#include <dialogs/dialogs.h>
+#include <input/input.h>
+#include <storage/storage.h>
+#include <dolphin/dolphin.h>
+#include <notification/notification.h>
+#include <notification/notification_messages.h>
+#include <lib/subghz/receiver.h>
+#include <lib/subghz/transmitter.h>
+#include <lib/subghz/subghz_file_encoder_worker.h>
+#include <notification/notification.h>
+
+#include "usb_uart.h"
+
+#define TAG "SWD"
+
+/* short debug message */
+#define DBGS(format) furi_log_print_format(FuriLogLevelDebug, TAG, "%s: " format, __FUNCTION__)
+/* formatted debug message */
+#define DBG(format, ...) \
+    furi_log_print_format(FuriLogLevelDebug, TAG, "%s: " format, __FUNCTION__, __VA_ARGS__)
+/* log message*/
+#define LOG(...) furi_log_print_format(FuriLogLevelDefault, TAG, __VA_ARGS__)
+
+#define COUNT(x) ((size_t)(sizeof(x) / sizeof((x)[0])))
+#define ARRAY_SIZE(x) COUNT(x)
+
+#define SWD_DELAY_US 0
+#define TIMER_HZ 25
+#define TIMEOUT 3
+#define QUEUE_SIZE 8
+#define IDLE_BITS 8
+#define CLOCK_DELAY 0
+
+#define MAX_FILE_LENGTH 128
+#define SCRIPT_MAX_LINES 1000
+
+typedef enum {
+    ModePageScan = 0,
+    ModePageFound = 1,
+    ModePageDPRegs = 2,
+    ModePageDPID = 3,
+    ModePageAPID = 4,
+    ModePageCount = 5,
+    ModePageHexDump = 0x100,
+    ModePageScript = 0x101,
+    ModePageCoresight = 0x102,
+} ModePages;
+
+#define CDBGPWRUPREQ (1 << 28)
+#define CDBGPWRUPACK (1 << 29)
+#define CSYSPWRUPREQ (1 << 30)
+#define CSYSPWRUPACK (1 << 31)
+#define WDATAERR (1 << 7)
+#define STICKYERR (1 << 5)
+#define STAT_ERROR_FLAGS (WDATAERR | STICKYERR)
+
+#define REG_IDCODE 0x00
+#define REG_CTRLSTAT 0x01
+#define REG_CTRLSTAT_BANK 0x00
+#define REG_DLCR 0x01
+#define REG_DLCR_BANK 0x01
+#define REG_TARGETID 0x01
+#define REG_TARGETID_BANK 0x02
+#define REG_DLPIDR 0x01
+#define REG_DLPIDR_BANK 0x03
+#define REG_EVENTSTAT 0x01
+#define REG_EVENTSTAT_BANK 0x04
+
+#define REG_SELECT 0x02
+
+#define MEMAP_CSW 0x00
+#define MEMAP_TAR 0x04
+#define MEMAP_DRW 0x0C
+#define AP_IDR 0xFC
+#define AP_BASE 0xF8
+
+typedef enum { KeyNone, KeyUp, KeyRight, KeyDown, KeyLeft, KeyOK } KeyCode;
+
+typedef enum {
+    EventTimerTick,
+    EventKeyPress,
+} EventType;
+
+typedef struct {
+    EventType type;
+    InputEvent input;
+} AppEvent;
+
+typedef struct {
+    uint32_t ctrlstat;
+    bool ctrlstat_ok;
+    uint32_t dlcr;
+    bool dlcr_ok;
+    uint32_t dlpidr;
+    bool dlpidr_ok;
+    uint32_t dpidr;
+    bool dpidr_ok;
+    uint32_t eventstat;
+    bool eventstat_ok;
+    uint32_t select;
+    bool select_ok;
+    uint32_t targetid;
+    bool targetid_ok;
+} swd_dpreg_t;
+
+typedef struct {
+    bool ok;
+    bool tested;
+    uint8_t revision;
+    uint16_t designer;
+    uint8_t class;
+    uint8_t variant;
+    uint8_t type;
+    uint32_t base;
+} swd_apidr_info_t;
+
+typedef struct {
+    uint8_t revision;
+    uint8_t partno;
+    uint8_t version;
+    uint16_t designer;
+} swd_dpidr_info_t;
+
+typedef struct {
+    uint8_t revision;
+    uint16_t partno;
+    uint16_t designer;
+} swd_targetid_info_t;
+
+typedef struct sScriptContext ScriptContext;
+
+typedef struct {
+    Storage* storage;
+    Gui* gui;
+    DialogsApp* dialogs;
+    NotificationApp* notification;
+
+    FuriTimer* timer;
+    UsbUart* uart;
+    ViewPort* view_port;
+
+    FuriMessageQueue* event_queue;
+    FuriMutex* swd_mutex;
+    FuriMutex* gui_mutex;
+
+    swd_targetid_info_t targetid_info;
+    swd_dpidr_info_t dpidr_info;
+    swd_dpreg_t dp_regs;
+    swd_apidr_info_t apidr_info[256];
+
+    ScriptContext* script;
+    ScriptContext* commandline;
+
+    uint8_t timeout_overdue;
+    uint32_t loop_count;
+    uint8_t current_mask_id;
+    uint32_t current_mask;
+    uint8_t io_swc;
+    uint8_t io_swd;
+    uint8_t io_num_swc;
+    uint8_t io_num_swd;
+    int32_t detected_timeout;
+    uint32_t swd_clock_delay;
+    uint32_t swd_idle_bits;
+    bool detected;
+    bool detected_device;
+    bool detected_notified;
+    uint32_t mode_page;
+    uint8_t ap_pos;
+    uint8_t ap_scanned;
+
+    uint32_t coresight_pos[16];
+    uint32_t coresight_count[16];
+    uint8_t coresight_level;
+    uint32_t coresight_bases[16];
+
+    uint32_t hex_addr;
+    uint8_t hex_select;
+    uint8_t hex_buffer[32];
+    uint8_t hex_buffer_valid[8];
+
+    char state_string[64];
+    char script_detected[MAX_FILE_LENGTH];
+    bool script_detected_executed;
+} AppFSM;
+
+struct sScriptContext {
+    AppFSM* app;
+    ScriptContext* parent;
+    char filename[MAX_FILE_LENGTH];
+
+    /* when used with string input */
+    char line_data[128];
+    uint64_t line_pos;
+
+    /* when used with file input */
+    File* script_file;
+
+    uint64_t position;
+    uint32_t selected_ap;
+    uint32_t max_tries;
+    uint32_t block_size;
+
+    bool abort;
+    bool restart;
+    bool errors_ignore;
+    bool status_ignore;
+    bool goto_active;
+    char goto_label[64];
+};
+
+typedef struct {
+    const char* prefix;
+    bool (*func)(ScriptContext* ctx);
+} ScriptFunctionInfo;
+
+uint8_t swd_read_memory(AppFSM* const ctx, uint8_t ap, uint32_t address, uint32_t* data);
+
+#endif

applications/plugins/swd_probe/usb_uart.c

@@ -0,0 +1,223 @@
+
+#include <stdlib.h>
+
+#include "usb_uart.h"
+#include "furi_hal.h"
+#include <furi_hal_usb_cdc.h>
+#include "usb_cdc.h"
+#include "cli/cli_vcp.h"
+#include <toolbox/api_lock.h>
+#include "cli/cli.h"
+
+#define USB_CDC_PKT_LEN CDC_DATA_SZ
+#define USB_UART_RX_BUF_SIZE (USB_CDC_PKT_LEN * 5)
+
+#define USB_CDC_BIT_DTR (1 << 0)
+#define USB_CDC_BIT_RTS (1 << 1)
+
+typedef enum {
+    WorkerEvtStop = (1 << 0),
+    WorkerEvtCdcRx = (1 << 1),
+    WorkerEvtCfgChange = (1 << 2)
+
+} WorkerEvtFlags;
+
+#define WORKER_ALL_EVENTS (WorkerEvtStop | WorkerEvtCfgChange | WorkerEvtCdcRx)
+
+struct UsbUart {
+    UsbUartConfig cfg;
+    UsbUartConfig cfg_new;
+
+    FuriThread* thread;
+    FuriMutex* usb_mutex;
+    FuriSemaphore* tx_sem;
+    UsbUartState st;
+    FuriApiLock cfg_lock;
+
+    uint8_t rx_buf[USB_CDC_PKT_LEN];
+};
+
+static void vcp_on_cdc_tx_complete(void* context);
+static void vcp_on_cdc_rx(void* context);
+static void vcp_state_callback(void* context, uint8_t state);
+static void vcp_on_cdc_control_line(void* context, uint8_t state);
+static void vcp_on_line_config(void* context, struct usb_cdc_line_coding* config);
+
+static const CdcCallbacks cdc_cb = {
+    .tx_ep_callback = &vcp_on_cdc_tx_complete,
+    .rx_ep_callback = &vcp_on_cdc_rx,
+    .state_callback = &vcp_state_callback,
+    .ctrl_line_callback = &vcp_on_cdc_control_line,
+    .config_callback = &vcp_on_line_config};
+
+static void usb_uart_vcp_init(UsbUart* usb_uart, uint8_t vcp_ch) {
+    furi_hal_usb_unlock();
+
+    Cli* cli = furi_record_open(RECORD_CLI);
+    cli_session_close(cli);
+
+    if(vcp_ch == 0) {
+        furi_check(furi_hal_usb_set_config(&usb_cdc_single, NULL) == true);
+    } else {
+        furi_check(furi_hal_usb_set_config(&usb_cdc_dual, NULL) == true);
+        cli_session_open(cli, &cli_vcp);
+    }
+    furi_record_close(RECORD_CLI);
+    furi_hal_cdc_set_callbacks(vcp_ch, (CdcCallbacks*)&cdc_cb, usb_uart);
+}
+
+static void usb_uart_vcp_deinit(UsbUart* usb_uart, uint8_t vcp_ch) {
+    UNUSED(usb_uart);
+    furi_hal_cdc_set_callbacks(vcp_ch, NULL, NULL);
+    if(vcp_ch != 0) {
+        Cli* cli = furi_record_open(RECORD_CLI);
+        cli_session_close(cli);
+        furi_record_close(RECORD_CLI);
+    }
+}
+
+void usb_uart_tx_data(UsbUart* usb_uart, uint8_t* data, size_t length) {
+    uint32_t pos = 0;
+    while(pos < length) {
+        size_t pkt_size = length - pos;
+
+        if(pkt_size > USB_CDC_PKT_LEN) {
+            pkt_size = USB_CDC_PKT_LEN;
+        }
+
+        if(furi_semaphore_acquire(usb_uart->tx_sem, 100) == FuriStatusOk) {
+            furi_check(furi_mutex_acquire(usb_uart->usb_mutex, FuriWaitForever) == FuriStatusOk);
+            furi_hal_cdc_send(usb_uart->cfg.vcp_ch, &data[pos], pkt_size);
+            furi_check(furi_mutex_release(usb_uart->usb_mutex) == FuriStatusOk);
+            usb_uart->st.tx_cnt += pkt_size;
+            pos += pkt_size;
+        }
+    }
+}
+
+static int32_t usb_uart_worker(void* context) {
+    UsbUart* usb_uart = (UsbUart*)context;
+
+    memcpy(&usb_uart->cfg, &usb_uart->cfg_new, sizeof(UsbUartConfig));
+
+    usb_uart->tx_sem = furi_semaphore_alloc(1, 1);
+    usb_uart->usb_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+
+    usb_uart_vcp_init(usb_uart, usb_uart->cfg.vcp_ch);
+
+    uint8_t data[2 * USB_CDC_PKT_LEN];
+    size_t remain = 0;
+
+    while(1) {
+        uint32_t events =
+            furi_thread_flags_wait(WORKER_ALL_EVENTS, FuriFlagWaitAny, FuriWaitForever);
+        furi_check(!(events & FuriFlagError));
+
+        if(events & WorkerEvtStop) {
+            break;
+        }
+
+        if(events & WorkerEvtCdcRx) {
+            furi_check(furi_mutex_acquire(usb_uart->usb_mutex, FuriWaitForever) == FuriStatusOk);
+            size_t len =
+                furi_hal_cdc_receive(usb_uart->cfg.vcp_ch, &data[remain], USB_CDC_PKT_LEN);
+            furi_check(furi_mutex_release(usb_uart->usb_mutex) == FuriStatusOk);
+
+            if(len > 0) {
+                usb_uart->st.rx_cnt += len;
+                remain += len;
+
+                size_t handled = usb_uart->cfg.rx_data(usb_uart->cfg.rx_data_ctx, data, remain);
+
+                memcpy(data, &data[handled], remain - handled);
+                remain -= handled;
+            }
+        }
+
+        if(events & WorkerEvtCfgChange) {
+            if(usb_uart->cfg.vcp_ch != usb_uart->cfg_new.vcp_ch) {
+                usb_uart_vcp_deinit(usb_uart, usb_uart->cfg.vcp_ch);
+                usb_uart_vcp_init(usb_uart, usb_uart->cfg_new.vcp_ch);
+
+                usb_uart->cfg.vcp_ch = usb_uart->cfg_new.vcp_ch;
+            }
+            api_lock_unlock(usb_uart->cfg_lock);
+        }
+    }
+    usb_uart_vcp_deinit(usb_uart, usb_uart->cfg.vcp_ch);
+
+    furi_mutex_free(usb_uart->usb_mutex);
+    furi_semaphore_free(usb_uart->tx_sem);
+
+    furi_hal_usb_unlock();
+    furi_check(furi_hal_usb_set_config(&usb_cdc_single, NULL) == true);
+    Cli* cli = furi_record_open(RECORD_CLI);
+    cli_session_open(cli, &cli_vcp);
+    furi_record_close(RECORD_CLI);
+
+    return 0;
+}
+
+/* VCP callbacks */
+static void vcp_on_cdc_tx_complete(void* context) {
+    UsbUart* usb_uart = (UsbUart*)context;
+    furi_semaphore_release(usb_uart->tx_sem);
+}
+
+static void vcp_on_cdc_rx(void* context) {
+    UsbUart* usb_uart = (UsbUart*)context;
+    furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtCdcRx);
+}
+
+static void vcp_state_callback(void* context, uint8_t state) {
+    UNUSED(context);
+    UNUSED(state);
+}
+
+static void vcp_on_cdc_control_line(void* context, uint8_t state) {
+    UNUSED(context);
+    UNUSED(state);
+}
+
+static void vcp_on_line_config(void* context, struct usb_cdc_line_coding* config) {
+    UNUSED(context);
+    UNUSED(config);
+}
+
+UsbUart* usb_uart_enable(UsbUartConfig* cfg) {
+    UsbUart* usb_uart = malloc(sizeof(UsbUart));
+    memcpy(&(usb_uart->cfg_new), cfg, sizeof(UsbUartConfig));
+
+    usb_uart->thread = furi_thread_alloc_ex("UsbUartWorker", 1024, usb_uart_worker, usb_uart);
+    furi_thread_start(usb_uart->thread);
+    return usb_uart;
+}
+
+void usb_uart_disable(UsbUart* usb_uart) {
+    furi_assert(usb_uart);
+    furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtStop);
+    furi_thread_join(usb_uart->thread);
+    furi_thread_free(usb_uart->thread);
+    free(usb_uart);
+}
+
+void usb_uart_set_config(UsbUart* usb_uart, UsbUartConfig* cfg) {
+    furi_assert(usb_uart);
+    furi_assert(cfg);
+    usb_uart->cfg_lock = api_lock_alloc_locked();
+    memcpy(&(usb_uart->cfg_new), cfg, sizeof(UsbUartConfig));
+    furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtCfgChange);
+    api_lock_wait_unlock_and_free(usb_uart->cfg_lock);
+}
+
+void usb_uart_get_config(UsbUart* usb_uart, UsbUartConfig* cfg) {
+    furi_assert(usb_uart);
+    furi_assert(cfg);
+    memcpy(cfg, &(usb_uart->cfg_new), sizeof(UsbUartConfig));
+}
+
+void usb_uart_get_state(UsbUart* usb_uart, UsbUartState* st) {
+    furi_assert(usb_uart);
+    furi_assert(st);
+    memcpy(st, &(usb_uart->st), sizeof(UsbUartState));
+}

applications/plugins/swd_probe/usb_uart.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct UsbUart UsbUart;
+
+typedef struct {
+    uint8_t vcp_ch;
+    size_t (*rx_data)(void* ctx, uint8_t* data, size_t length);
+    void* rx_data_ctx;
+} UsbUartConfig;
+
+typedef struct {
+    uint32_t rx_cnt;
+    uint32_t tx_cnt;
+} UsbUartState;
+
+UsbUart* usb_uart_enable(UsbUartConfig* cfg);
+
+void usb_uart_disable(UsbUart* usb_uart);
+
+void usb_uart_set_config(UsbUart* usb_uart, UsbUartConfig* cfg);
+
+void usb_uart_get_config(UsbUart* usb_uart, UsbUartConfig* cfg);
+
+void usb_uart_get_state(UsbUart* usb_uart, UsbUartState* st);
+
+void usb_uart_tx_data(UsbUart* usb_uart, uint8_t* data, size_t length);

applications/plugins/tetris_game/tetris_game.c

@@ -16,6 +16,9 @@
 #define FIELD_WIDTH 11
 #define FIELD_HEIGHT 24
 
+#define MAX_FALL_SPEED 500
+#define MIN_FALL_SPEED 100
+
 typedef struct Point {
     // Also used for offset data, which is sometimes negative
     int8_t x, y;
@@ -169,7 +172,7 @@ static void tetris_game_input_callback(InputEvent* input_event, FuriMessageQueue
 static void tetris_game_init_state(TetrisState* tetris_state) {
     tetris_state->gameState = GameStatePlaying;
     tetris_state->numLines = 0;
-    tetris_state->fallSpeed = 500;
+    tetris_state->fallSpeed = MAX_FALL_SPEED;
     memset(tetris_state->playField, 0, sizeof(tetris_state->playField));
 
     memcpy(&tetris_state->currPiece, &shapes[rand() % 7], sizeof(tetris_state->currPiece));
@@ -303,6 +306,7 @@ static void
             tetris_game_render_curr_piece(tetris_state);
             uint8_t numLines = 0;
             uint8_t lines[] = {0, 0, 0, 0};
+            uint16_t nextFallSpeed;
 
             tetris_game_check_for_lines(tetris_state, lines, &numLines);
             if(numLines > 0) {
@@ -323,7 +327,11 @@ static void
                 uint16_t oldNumLines = tetris_state->numLines;
                 tetris_state->numLines += numLines;
                 if((oldNumLines / 10) % 10 != (tetris_state->numLines / 10) % 10) {
-                    tetris_state->fallSpeed -= 50;
+                    nextFallSpeed =
+                        tetris_state->fallSpeed - (100 / (tetris_state->numLines / 10));
+                    if(nextFallSpeed >= MIN_FALL_SPEED) {
+                        tetris_state->fallSpeed = nextFallSpeed;
+                    }
                 }
             }
 

applications/plugins/usbkeyboard/LICENSE.md

@@ -1,24 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2022, Gabriel Cirlig
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

applications/plugins/usbkeyboard/application.fam

@@ -1,15 +0,0 @@
-App(
-    appid="USB_Keyboard",
-    name="USB Keyboard & Mouse",
-    apptype=FlipperAppType.EXTERNAL,
-    entry_point="usb_hid_app",
-    stack_size=1 * 1024,
-    cdefines=["APP_USB_KEYBOARD"],
-    requires=[
-        "gui",
-    ],
-    order=60,
-    fap_icon="usb_keyboard_10px.png",
-    fap_category="Misc",
-    fap_icon_assets="assets",
-)

applications/plugins/usbkeyboard/usb_hid.c

@@ -1,198 +0,0 @@
-#include "usb_hid.h"
-#include <furi.h>
-#include <furi_hal.h>
-#include <notification/notification_messages.h>
-
-#define TAG "UsbHidApp"
-
-enum UsbDebugSubmenuIndex {
-    UsbHidSubmenuIndexDirpad,
-    UsbHidSubmenuIndexKeyboard,
-    UsbHidSubmenuIndexMedia,
-    UsbHidSubmenuIndexMouse,
-    UsbHidSubmenuIndexMouseJiggler,
-};
-
-void usb_hid_submenu_callback(void* context, uint32_t index) {
-    furi_assert(context);
-    UsbHid* app = context;
-    if(index == UsbHidSubmenuIndexDirpad) {
-        app->view_id = UsbHidViewDirpad;
-        view_dispatcher_switch_to_view(app->view_dispatcher, UsbHidViewDirpad);
-    } else if(index == UsbHidSubmenuIndexKeyboard) {
-        app->view_id = UsbHidViewKeyboard;
-        view_dispatcher_switch_to_view(app->view_dispatcher, UsbHidViewKeyboard);
-    } else if(index == UsbHidSubmenuIndexMedia) {
-        app->view_id = UsbHidViewMedia;
-        view_dispatcher_switch_to_view(app->view_dispatcher, UsbHidViewMedia);
-    } else if(index == UsbHidSubmenuIndexMouse) {
-        app->view_id = UsbHidViewMouse;
-        view_dispatcher_switch_to_view(app->view_dispatcher, UsbHidViewMouse);
-    } else if(index == UsbHidSubmenuIndexMouseJiggler) {
-        app->view_id = UsbHidViewMouseJiggler;
-        view_dispatcher_switch_to_view(app->view_dispatcher, UsbHidViewMouseJiggler);
-    }
-}
-
-void usb_hid_dialog_callback(DialogExResult result, void* context) {
-    furi_assert(context);
-    UsbHid* app = context;
-    if(result == DialogExResultLeft) {
-        view_dispatcher_stop(app->view_dispatcher);
-    } else if(result == DialogExResultRight) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id); // Show last view
-    } else if(result == DialogExResultCenter) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, UsbHidViewSubmenu);
-    }
-}
-
-uint32_t usb_hid_exit_confirm_view(void* context) {
-    UNUSED(context);
-    return UsbHidViewExitConfirm;
-}
-
-uint32_t usb_hid_exit(void* context) {
-    UNUSED(context);
-    return VIEW_NONE;
-}
-
-UsbHid* usb_hid_app_alloc() {
-    UsbHid* app = malloc(sizeof(UsbHid));
-
-    // Gui
-    app->gui = furi_record_open(RECORD_GUI);
-
-    // Notifications
-    app->notifications = furi_record_open(RECORD_NOTIFICATION);
-
-    // 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);
-
-    // Submenu view
-    app->submenu = submenu_alloc();
-    submenu_add_item(
-        app->submenu, "Dirpad", UsbHidSubmenuIndexDirpad, usb_hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Keyboard", UsbHidSubmenuIndexKeyboard, usb_hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Media", UsbHidSubmenuIndexMedia, usb_hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Mouse", UsbHidSubmenuIndexMouse, usb_hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu,
-        "Mouse Jiggler",
-        UsbHidSubmenuIndexMouseJiggler,
-        usb_hid_submenu_callback,
-        app);
-    view_set_previous_callback(submenu_get_view(app->submenu), usb_hid_exit);
-    view_dispatcher_add_view(
-        app->view_dispatcher, UsbHidViewSubmenu, submenu_get_view(app->submenu));
-
-    // Dialog view
-    app->dialog = dialog_ex_alloc();
-    dialog_ex_set_result_callback(app->dialog, usb_hid_dialog_callback);
-    dialog_ex_set_context(app->dialog, app);
-    dialog_ex_set_left_button_text(app->dialog, "Exit");
-    dialog_ex_set_right_button_text(app->dialog, "Stay");
-    dialog_ex_set_center_button_text(app->dialog, "Menu");
-    dialog_ex_set_header(app->dialog, "Close Current App?", 16, 12, AlignLeft, AlignTop);
-    view_dispatcher_add_view(
-        app->view_dispatcher, UsbHidViewExitConfirm, dialog_ex_get_view(app->dialog));
-
-    // Dirpad view
-    app->usb_hid_dirpad = usb_hid_dirpad_alloc();
-    view_set_previous_callback(
-        usb_hid_dirpad_get_view(app->usb_hid_dirpad), usb_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, UsbHidViewDirpad, usb_hid_dirpad_get_view(app->usb_hid_dirpad));
-
-    // Keyboard view
-    app->usb_hid_keyboard = usb_hid_keyboard_alloc();
-    view_set_previous_callback(
-        usb_hid_keyboard_get_view(app->usb_hid_keyboard), usb_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher,
-        UsbHidViewKeyboard,
-        usb_hid_keyboard_get_view(app->usb_hid_keyboard));
-
-    // Media view
-    app->usb_hid_media = usb_hid_media_alloc();
-    view_set_previous_callback(
-        usb_hid_media_get_view(app->usb_hid_media), usb_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, UsbHidViewMedia, usb_hid_media_get_view(app->usb_hid_media));
-
-    // Mouse view
-    app->usb_hid_mouse = usb_hid_mouse_alloc();
-    view_set_previous_callback(
-        usb_hid_mouse_get_view(app->usb_hid_mouse), usb_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher, UsbHidViewMouse, usb_hid_mouse_get_view(app->usb_hid_mouse));
-
-    // Mouse jiggler view
-    app->hid_mouse_jiggler = hid_mouse_jiggler_alloc(app);
-    view_set_previous_callback(
-        hid_mouse_jiggler_get_view(app->hid_mouse_jiggler), usb_hid_exit_confirm_view);
-    view_dispatcher_add_view(
-        app->view_dispatcher,
-        UsbHidViewMouseJiggler,
-        hid_mouse_jiggler_get_view(app->hid_mouse_jiggler));
-
-    // TODO switch to menu after Media is done
-    app->view_id = UsbHidViewSubmenu;
-    view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id);
-
-    return app;
-}
-
-void usb_hid_app_free(UsbHid* app) {
-    furi_assert(app);
-
-    // Reset notification
-    notification_internal_message(app->notifications, &sequence_reset_blue);
-
-    // Free views
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewSubmenu);
-    submenu_free(app->submenu);
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewExitConfirm);
-    dialog_ex_free(app->dialog);
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewDirpad);
-    usb_hid_dirpad_free(app->usb_hid_dirpad);
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewKeyboard);
-    usb_hid_keyboard_free(app->usb_hid_keyboard);
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewMedia);
-    usb_hid_media_free(app->usb_hid_media);
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewMouse);
-    usb_hid_mouse_free(app->usb_hid_mouse);
-    view_dispatcher_remove_view(app->view_dispatcher, UsbHidViewMouseJiggler);
-    hid_mouse_jiggler_free(app->hid_mouse_jiggler);
-    view_dispatcher_free(app->view_dispatcher);
-    // Close records
-    furi_record_close(RECORD_GUI);
-    app->gui = NULL;
-    furi_record_close(RECORD_NOTIFICATION);
-    app->notifications = NULL;
-
-    // Free rest
-    free(app);
-}
-
-int32_t usb_hid_app(void* p) {
-    UNUSED(p);
-    // Switch profile to Hid
-    UsbHid* app = usb_hid_app_alloc();
-
-    FuriHalUsbInterface* usb_mode_prev = furi_hal_usb_get_config();
-    furi_hal_usb_unlock();
-    furi_check(furi_hal_usb_set_config(&usb_hid, NULL) == true);
-
-    view_dispatcher_run(app->view_dispatcher);
-
-    // Change back profile
-    furi_hal_usb_set_config(usb_mode_prev, NULL);
-    usb_hid_app_free(app);
-
-    return 0;
-}

applications/plugins/usbkeyboard/usb_hid.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <furi.h>
-#include <gui/gui.h>
-#include <gui/view.h>
-#include <gui/view_dispatcher.h>
-#include <notification/notification.h>
-
-#include <gui/modules/submenu.h>
-#include <gui/modules/dialog_ex.h>
-#include "views/usb_hid_dirpad.h"
-#include "views/usb_hid_keyboard.h"
-#include "views/usb_hid_media.h"
-#include "views/usb_hid_mouse.h"
-#include "views/usb_hid_mouse_jiggler.h"
-
-typedef struct {
-    Gui* gui;
-    NotificationApp* notifications;
-    ViewDispatcher* view_dispatcher;
-    Submenu* submenu;
-    DialogEx* dialog;
-    UsbHidDirpad* usb_hid_dirpad;
-    UsbHidKeyboard* usb_hid_keyboard;
-    UsbHidMedia* usb_hid_media;
-    UsbHidMouse* usb_hid_mouse;
-    HidMouseJiggler* hid_mouse_jiggler;
-    uint32_t view_id;
-} UsbHid;
-
-typedef enum {
-    UsbHidViewSubmenu,
-    UsbHidViewDirpad,
-    UsbHidViewKeyboard,
-    UsbHidViewMedia,
-    UsbHidViewMouse,
-    UsbHidViewMouseJiggler,
-    UsbHidViewExitConfirm,
-} UsbHidView;

applications/plugins/usbkeyboard/views/usb_hid_dirpad.c

@@ -1,197 +0,0 @@
-#include "usb_hid_dirpad.h"
-#include <furi.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-#include <USB_Keyboard_icons.h>
-
-struct UsbHidDirpad {
-    View* view;
-};
-
-typedef struct {
-    bool left_pressed;
-    bool up_pressed;
-    bool right_pressed;
-    bool down_pressed;
-    bool ok_pressed;
-    bool back_pressed;
-    bool connected;
-} UsbHidDirpadModel;
-
-static void usb_hid_dirpad_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
-    canvas_draw_triangle(canvas, x, y, 5, 3, dir);
-    if(dir == CanvasDirectionBottomToTop) {
-        canvas_draw_line(canvas, x, y + 6, x, y - 1);
-    } else if(dir == CanvasDirectionTopToBottom) {
-        canvas_draw_line(canvas, x, y - 6, x, y + 1);
-    } else if(dir == CanvasDirectionRightToLeft) {
-        canvas_draw_line(canvas, x + 6, y, x - 1, y);
-    } else if(dir == CanvasDirectionLeftToRight) {
-        canvas_draw_line(canvas, x - 6, y, x + 1, y);
-    }
-}
-
-static void usb_hid_dirpad_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    UsbHidDirpadModel* model = context;
-
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Dirpad");
-
-    canvas_draw_icon(canvas, 68, 2, &I_Pin_back_arrow_10x8);
-    canvas_set_font(canvas, FontSecondary);
-    elements_multiline_text_aligned(canvas, 127, 3, AlignRight, AlignTop, "Hold to exit");
-
-    // Up
-    canvas_draw_icon(canvas, 21, 24, &I_Button_18x18);
-    if(model->up_pressed) {
-        elements_slightly_rounded_box(canvas, 24, 26, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_dirpad_draw_arrow(canvas, 30, 30, CanvasDirectionBottomToTop);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Down
-    canvas_draw_icon(canvas, 21, 45, &I_Button_18x18);
-    if(model->down_pressed) {
-        elements_slightly_rounded_box(canvas, 24, 47, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_dirpad_draw_arrow(canvas, 30, 55, CanvasDirectionTopToBottom);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Left
-    canvas_draw_icon(canvas, 0, 45, &I_Button_18x18);
-    if(model->left_pressed) {
-        elements_slightly_rounded_box(canvas, 3, 47, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_dirpad_draw_arrow(canvas, 7, 53, CanvasDirectionRightToLeft);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Right
-    canvas_draw_icon(canvas, 42, 45, &I_Button_18x18);
-    if(model->right_pressed) {
-        elements_slightly_rounded_box(canvas, 45, 47, 13, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_dirpad_draw_arrow(canvas, 53, 53, CanvasDirectionLeftToRight);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Ok
-    canvas_draw_icon(canvas, 63, 25, &I_Space_65x18);
-    if(model->ok_pressed) {
-        elements_slightly_rounded_box(canvas, 66, 27, 60, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
-    elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Space");
-    canvas_set_color(canvas, ColorBlack);
-
-    // Back
-    canvas_draw_icon(canvas, 63, 45, &I_Space_65x18);
-    if(model->back_pressed) {
-        elements_slightly_rounded_box(canvas, 66, 47, 60, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 74, 49, &I_Pin_back_arrow_10x8);
-    elements_multiline_text_aligned(canvas, 91, 57, AlignLeft, AlignBottom, "Back");
-}
-
-static void usb_hid_dirpad_process(UsbHidDirpad* usb_hid_dirpad, InputEvent* event) {
-    with_view_model(
-        usb_hid_dirpad->view,
-        UsbHidDirpadModel * model,
-        {
-            if(event->type == InputTypePress) {
-                if(event->key == InputKeyUp) {
-                    model->up_pressed = true;
-                    furi_hal_hid_kb_press(HID_KEYBOARD_UP_ARROW);
-                } else if(event->key == InputKeyDown) {
-                    model->down_pressed = true;
-                    furi_hal_hid_kb_press(HID_KEYBOARD_DOWN_ARROW);
-                } else if(event->key == InputKeyLeft) {
-                    model->left_pressed = true;
-                    furi_hal_hid_kb_press(HID_KEYBOARD_LEFT_ARROW);
-                } else if(event->key == InputKeyRight) {
-                    model->right_pressed = true;
-                    furi_hal_hid_kb_press(HID_KEYBOARD_RIGHT_ARROW);
-                } else if(event->key == InputKeyOk) {
-                    model->ok_pressed = true;
-                    furi_hal_hid_kb_press(HID_KEYBOARD_SPACEBAR);
-                } else if(event->key == InputKeyBack) {
-                    model->back_pressed = true;
-                }
-            } else if(event->type == InputTypeRelease) {
-                if(event->key == InputKeyUp) {
-                    model->up_pressed = false;
-                    furi_hal_hid_kb_release(HID_KEYBOARD_UP_ARROW);
-                } else if(event->key == InputKeyDown) {
-                    model->down_pressed = false;
-                    furi_hal_hid_kb_release(HID_KEYBOARD_DOWN_ARROW);
-                } else if(event->key == InputKeyLeft) {
-                    model->left_pressed = false;
-                    furi_hal_hid_kb_release(HID_KEYBOARD_LEFT_ARROW);
-                } else if(event->key == InputKeyRight) {
-                    model->right_pressed = false;
-                    furi_hal_hid_kb_release(HID_KEYBOARD_RIGHT_ARROW);
-                } else if(event->key == InputKeyOk) {
-                    model->ok_pressed = false;
-                    furi_hal_hid_kb_release(HID_KEYBOARD_SPACEBAR);
-                } else if(event->key == InputKeyBack) {
-                    model->back_pressed = false;
-                }
-            } else if(event->type == InputTypeShort) {
-                if(event->key == InputKeyBack) {
-                    furi_hal_hid_kb_press(HID_KEYBOARD_DELETE);
-                    furi_hal_hid_kb_release(HID_KEYBOARD_DELETE);
-                    furi_hal_hid_consumer_key_press(HID_CONSUMER_AC_BACK);
-                    furi_hal_hid_consumer_key_release(HID_CONSUMER_AC_BACK);
-                }
-            }
-        },
-        true);
-}
-
-static bool usb_hid_dirpad_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    UsbHidDirpad* usb_hid_dirpad = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeLong && event->key == InputKeyBack) {
-        furi_hal_hid_kb_release_all();
-    } else {
-        usb_hid_dirpad_process(usb_hid_dirpad, event);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-UsbHidDirpad* usb_hid_dirpad_alloc() {
-    UsbHidDirpad* usb_hid_dirpad = malloc(sizeof(UsbHidDirpad));
-    usb_hid_dirpad->view = view_alloc();
-    view_set_context(usb_hid_dirpad->view, usb_hid_dirpad);
-    view_allocate_model(usb_hid_dirpad->view, ViewModelTypeLocking, sizeof(UsbHidDirpadModel));
-    view_set_draw_callback(usb_hid_dirpad->view, usb_hid_dirpad_draw_callback);
-    view_set_input_callback(usb_hid_dirpad->view, usb_hid_dirpad_input_callback);
-
-    return usb_hid_dirpad;
-}
-
-void usb_hid_dirpad_free(UsbHidDirpad* usb_hid_dirpad) {
-    furi_assert(usb_hid_dirpad);
-    view_free(usb_hid_dirpad->view);
-    free(usb_hid_dirpad);
-}
-
-View* usb_hid_dirpad_get_view(UsbHidDirpad* usb_hid_dirpad) {
-    furi_assert(usb_hid_dirpad);
-    return usb_hid_dirpad->view;
-}
-
-void usb_hid_dirpad_set_connected_status(UsbHidDirpad* usb_hid_dirpad, bool connected) {
-    furi_assert(usb_hid_dirpad);
-    with_view_model(
-        usb_hid_dirpad->view, UsbHidDirpadModel * model, { model->connected = connected; }, true);
-}

applications/plugins/usbkeyboard/views/usb_hid_dirpad.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct UsbHidDirpad UsbHidDirpad;
-
-UsbHidDirpad* usb_hid_dirpad_alloc();
-
-void usb_hid_dirpad_free(UsbHidDirpad* usb_hid_dirpad);
-
-View* usb_hid_dirpad_get_view(UsbHidDirpad* usb_hid_dirpad);
-
-void usb_hid_dirpad_set_connected_status(UsbHidDirpad* usb_hid_dirpad, bool connected);

applications/plugins/usbkeyboard/views/usb_hid_keyboard.c

@@ -1,387 +0,0 @@
-#include "usb_hid_keyboard.h"
-#include <furi.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-#include <gui/icon_i.h>
-#include <USB_Keyboard_icons.h>
-
-struct UsbHidKeyboard {
-    View* view;
-};
-
-typedef struct {
-    bool shift;
-    bool alt;
-    bool ctrl;
-    bool gui;
-    uint8_t x;
-    uint8_t y;
-    uint8_t last_key_code;
-    uint16_t modifier_code;
-    bool ok_pressed;
-    bool back_pressed;
-    bool connected;
-    char key_string[5];
-} UsbHidKeyboardModel;
-
-typedef struct {
-    uint8_t width;
-    char* key;
-    const Icon* icon;
-    char* shift_key;
-    uint8_t value;
-} UsbHidKeyboardKey;
-
-typedef struct {
-    int8_t x;
-    int8_t y;
-} UsbHidKeyboardPoint;
-
-// 4 BY 12
-#define MARGIN_TOP 0
-#define MARGIN_LEFT 4
-#define KEY_WIDTH 9
-#define KEY_HEIGHT 12
-#define KEY_PADDING 1
-#define ROW_COUNT 7
-#define COLUMN_COUNT 12
-
-// 0 width items are not drawn, but there value is used
-const UsbHidKeyboardKey usb_hid_keyboard_keyset[ROW_COUNT][COLUMN_COUNT] = {
-    {
-        {.width = 1, .icon = NULL, .key = "1", .shift_key = "!", .value = HID_KEYBOARD_1},
-        {.width = 1, .icon = NULL, .key = "2", .shift_key = "@", .value = HID_KEYBOARD_2},
-        {.width = 1, .icon = NULL, .key = "3", .shift_key = "#", .value = HID_KEYBOARD_3},
-        {.width = 1, .icon = NULL, .key = "4", .shift_key = "$", .value = HID_KEYBOARD_4},
-        {.width = 1, .icon = NULL, .key = "5", .shift_key = "%", .value = HID_KEYBOARD_5},
-        {.width = 1, .icon = NULL, .key = "6", .shift_key = "^", .value = HID_KEYBOARD_6},
-        {.width = 1, .icon = NULL, .key = "7", .shift_key = "&", .value = HID_KEYBOARD_7},
-        {.width = 1, .icon = NULL, .key = "8", .shift_key = "*", .value = HID_KEYBOARD_8},
-        {.width = 1, .icon = NULL, .key = "9", .shift_key = "(", .value = HID_KEYBOARD_9},
-        {.width = 1, .icon = NULL, .key = "0", .shift_key = ")", .value = HID_KEYBOARD_0},
-        {.width = 2, .icon = &I_Pin_arrow_left_9x7, .value = HID_KEYBOARD_DELETE},
-        {.width = 0, .value = HID_KEYBOARD_DELETE},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "q", .shift_key = "Q", .value = HID_KEYBOARD_Q},
-        {.width = 1, .icon = NULL, .key = "w", .shift_key = "W", .value = HID_KEYBOARD_W},
-        {.width = 1, .icon = NULL, .key = "e", .shift_key = "E", .value = HID_KEYBOARD_E},
-        {.width = 1, .icon = NULL, .key = "r", .shift_key = "R", .value = HID_KEYBOARD_R},
-        {.width = 1, .icon = NULL, .key = "t", .shift_key = "T", .value = HID_KEYBOARD_T},
-        {.width = 1, .icon = NULL, .key = "y", .shift_key = "Y", .value = HID_KEYBOARD_Y},
-        {.width = 1, .icon = NULL, .key = "u", .shift_key = "U", .value = HID_KEYBOARD_U},
-        {.width = 1, .icon = NULL, .key = "i", .shift_key = "I", .value = HID_KEYBOARD_I},
-        {.width = 1, .icon = NULL, .key = "o", .shift_key = "O", .value = HID_KEYBOARD_O},
-        {.width = 1, .icon = NULL, .key = "p", .shift_key = "P", .value = HID_KEYBOARD_P},
-        {.width = 1, .icon = NULL, .key = "[", .shift_key = "{", .value = HID_KEYBOARD_OPEN_BRACKET},
-        {.width = 1,
-         .icon = NULL,
-         .key = "]",
-         .shift_key = "}",
-         .value = HID_KEYBOARD_CLOSE_BRACKET},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "a", .shift_key = "A", .value = HID_KEYBOARD_A},
-        {.width = 1, .icon = NULL, .key = "s", .shift_key = "S", .value = HID_KEYBOARD_S},
-        {.width = 1, .icon = NULL, .key = "d", .shift_key = "D", .value = HID_KEYBOARD_D},
-        {.width = 1, .icon = NULL, .key = "f", .shift_key = "F", .value = HID_KEYBOARD_F},
-        {.width = 1, .icon = NULL, .key = "g", .shift_key = "G", .value = HID_KEYBOARD_G},
-        {.width = 1, .icon = NULL, .key = "h", .shift_key = "H", .value = HID_KEYBOARD_H},
-        {.width = 1, .icon = NULL, .key = "j", .shift_key = "J", .value = HID_KEYBOARD_J},
-        {.width = 1, .icon = NULL, .key = "k", .shift_key = "K", .value = HID_KEYBOARD_K},
-        {.width = 1, .icon = NULL, .key = "l", .shift_key = "L", .value = HID_KEYBOARD_L},
-        {.width = 1, .icon = NULL, .key = ";", .shift_key = ":", .value = HID_KEYBOARD_SEMICOLON},
-        {.width = 2, .icon = &I_Pin_arrow_right_9x7, .value = HID_KEYBOARD_RETURN},
-        {.width = 0, .value = HID_KEYBOARD_RETURN},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "z", .shift_key = "Z", .value = HID_KEYBOARD_Z},
-        {.width = 1, .icon = NULL, .key = "x", .shift_key = "X", .value = HID_KEYBOARD_X},
-        {.width = 1, .icon = NULL, .key = "c", .shift_key = "C", .value = HID_KEYBOARD_C},
-        {.width = 1, .icon = NULL, .key = "v", .shift_key = "V", .value = HID_KEYBOARD_V},
-        {.width = 1, .icon = NULL, .key = "b", .shift_key = "B", .value = HID_KEYBOARD_B},
-        {.width = 1, .icon = NULL, .key = "n", .shift_key = "N", .value = HID_KEYBOARD_N},
-        {.width = 1, .icon = NULL, .key = "m", .shift_key = "M", .value = HID_KEYBOARD_M},
-        {.width = 1, .icon = NULL, .key = "/", .shift_key = "?", .value = HID_KEYBOARD_SLASH},
-        {.width = 1, .icon = NULL, .key = "\\", .shift_key = "|", .value = HID_KEYBOARD_BACKSLASH},
-        {.width = 1, .icon = NULL, .key = "`", .shift_key = "~", .value = HID_KEYBOARD_GRAVE_ACCENT},
-        {.width = 1, .icon = &I_ButtonUp_7x4, .value = HID_KEYBOARD_UP_ARROW},
-        {.width = 1, .icon = NULL, .key = "-", .shift_key = "_", .value = HID_KEYBOARD_MINUS},
-    },
-    {
-        {.width = 1, .icon = &I_Pin_arrow_up_7x9, .value = HID_KEYBOARD_L_SHIFT},
-        {.width = 1, .icon = NULL, .key = ",", .shift_key = "<", .value = HID_KEYPAD_COMMA},
-        {.width = 1, .icon = NULL, .key = ".", .shift_key = ">", .value = HID_KEYBOARD_DOT},
-        {.width = 4, .icon = NULL, .key = " ", .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 0, .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 0, .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 0, .value = HID_KEYBOARD_SPACEBAR},
-        {.width = 1, .icon = NULL, .key = "'", .shift_key = "\"", .value = HID_KEYBOARD_APOSTROPHE},
-        {.width = 1, .icon = NULL, .key = "=", .shift_key = "+", .value = HID_KEYBOARD_EQUAL_SIGN},
-        {.width = 1, .icon = &I_ButtonLeft_4x7, .value = HID_KEYBOARD_LEFT_ARROW},
-        {.width = 1, .icon = &I_ButtonDown_7x4, .value = HID_KEYBOARD_DOWN_ARROW},
-        {.width = 1, .icon = &I_ButtonRight_4x7, .value = HID_KEYBOARD_RIGHT_ARROW},
-    },
-    {
-        {.width = 2, .icon = NULL, .key = "Ctl", .value = HID_KEYBOARD_L_CTRL},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 2, .icon = NULL, .key = "Alt", .value = HID_KEYBOARD_L_ALT},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 2, .icon = NULL, .key = "Cmd", .value = HID_KEYBOARD_L_GUI},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 2, .icon = NULL, .key = "Tab", .value = HID_KEYBOARD_TAB},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
-        {.width = 2, .icon = NULL, .key = "Esc", .value = HID_KEYBOARD_ESCAPE},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_ESCAPE},
-        {.width = 2, .icon = NULL, .key = "Del", .value = HID_KEYBOARD_DELETE_FORWARD},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_DELETE_FORWARD},
-    },
-    {
-        {.width = 1, .icon = NULL, .key = "1", .shift_key = "1", .value = HID_KEYBOARD_F1},
-        {.width = 1, .icon = NULL, .key = "2", .shift_key = "2", .value = HID_KEYBOARD_F2},
-        {.width = 1, .icon = NULL, .key = "3", .shift_key = "3", .value = HID_KEYBOARD_F3},
-        {.width = 1, .icon = NULL, .key = "4", .shift_key = "4", .value = HID_KEYBOARD_F4},
-        {.width = 1, .icon = NULL, .key = "5", .shift_key = "5", .value = HID_KEYBOARD_F5},
-        {.width = 1, .icon = NULL, .key = "6", .shift_key = "6", .value = HID_KEYBOARD_F6},
-        {.width = 1, .icon = NULL, .key = "7", .shift_key = "7", .value = HID_KEYBOARD_F7},
-        {.width = 1, .icon = NULL, .key = "8", .shift_key = "8", .value = HID_KEYBOARD_F8},
-        {.width = 1, .icon = NULL, .key = "9", .shift_key = "9", .value = HID_KEYBOARD_F9},
-        {.width = 1, .icon = NULL, .key = "0", .shift_key = "0", .value = HID_KEYBOARD_F10},
-        {.width = 1, .icon = NULL, .key = "1", .shift_key = "1", .value = HID_KEYBOARD_F11},
-        {.width = 1, .icon = NULL, .key = "2", .shift_key = "2", .value = HID_KEYBOARD_F12},
-    }};
-
-static void usb_hid_keyboard_to_upper(char* str) {
-    while(*str) {
-        *str = toupper((unsigned char)*str);
-        str++;
-    }
-}
-
-static void usb_hid_keyboard_draw_key(
-    Canvas* canvas,
-    UsbHidKeyboardModel* model,
-    uint8_t x,
-    uint8_t y,
-    UsbHidKeyboardKey key,
-    bool selected) {
-    if(!key.width) return;
-
-    canvas_set_color(canvas, ColorBlack);
-    uint8_t keyWidth = KEY_WIDTH * key.width + KEY_PADDING * (key.width - 1);
-    if(selected) {
-        // Draw a filled box
-        elements_slightly_rounded_box(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING),
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING),
-            keyWidth,
-            KEY_HEIGHT);
-        canvas_set_color(canvas, ColorWhite);
-    } else {
-        // Draw a framed box
-        elements_slightly_rounded_frame(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING),
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING),
-            keyWidth,
-            KEY_HEIGHT);
-    }
-    if(key.icon != NULL) {
-        // Draw the icon centered on the button
-        canvas_draw_icon(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING) + keyWidth / 2 - key.icon->width / 2,
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING) + KEY_HEIGHT / 2 - key.icon->height / 2,
-            key.icon);
-    } else {
-        // If shift is toggled use the shift key when available
-        strcpy(model->key_string, (model->shift && key.shift_key != 0) ? key.shift_key : key.key);
-        // Upper case if ctrl or alt was toggled true
-        if((model->ctrl && key.value == HID_KEYBOARD_L_CTRL) ||
-           (model->alt && key.value == HID_KEYBOARD_L_ALT) ||
-           (model->gui && key.value == HID_KEYBOARD_L_GUI)) {
-            usb_hid_keyboard_to_upper(model->key_string);
-        }
-        canvas_draw_str_aligned(
-            canvas,
-            MARGIN_LEFT + x * (KEY_WIDTH + KEY_PADDING) + keyWidth / 2 + 1,
-            MARGIN_TOP + y * (KEY_HEIGHT + KEY_PADDING) + KEY_HEIGHT / 2,
-            AlignCenter,
-            AlignCenter,
-            model->key_string);
-    }
-}
-
-static void usb_hid_keyboard_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    UsbHidKeyboardModel* model = context;
-
-    canvas_set_font(canvas, FontKeyboard);
-    // Start shifting the all keys up if on the next row (Scrolling)
-    uint8_t initY = model->y - 4 > 0 ? model->y - 4 : 0;
-    for(uint8_t y = initY; y < ROW_COUNT; y++) {
-        const UsbHidKeyboardKey* keyboardKeyRow = usb_hid_keyboard_keyset[y];
-        uint8_t x = 0;
-        for(uint8_t i = 0; i < COLUMN_COUNT; i++) {
-            UsbHidKeyboardKey key = keyboardKeyRow[i];
-            // Select when the button is hovered
-            // Select if the button is hovered within its width
-            // Select if back is clicked and its the backspace key
-            // Deselect when the button clicked or not hovered
-            bool keySelected = (x <= model->x && model->x < (x + key.width)) && y == model->y;
-            // Revert selection for function keys
-            keySelected = y == ROW_COUNT - 1 ? !keySelected : keySelected;
-            bool backSelected = model->back_pressed && key.value == HID_KEYBOARD_DELETE;
-            usb_hid_keyboard_draw_key(
-                canvas,
-                model,
-                x,
-                y - initY,
-                key,
-                (!model->ok_pressed && keySelected) || backSelected);
-            x += key.width;
-        }
-    }
-}
-
-static uint8_t usb_hid_keyboard_get_selected_key(UsbHidKeyboardModel* model) {
-    UsbHidKeyboardKey key = usb_hid_keyboard_keyset[model->y][model->x];
-    // Use upper case if shift is toggled
-    bool useUppercase = model->shift;
-    // Check if the key has an upper case version
-    bool hasUppercase = key.shift_key != 0;
-    if(useUppercase && hasUppercase)
-        return key.value;
-    else
-        return key.value;
-}
-
-static void
-    usb_hid_keyboard_get_select_key(UsbHidKeyboardModel* model, UsbHidKeyboardPoint delta) {
-    // Keep going until a valid spot is found, this allows for nulls and zero width keys in the map
-    do {
-        if(((int8_t)model->y) + delta.y < 0)
-            model->y = ROW_COUNT - 1;
-        else
-            model->y = (model->y + delta.y) % ROW_COUNT;
-    } while(delta.y != 0 && usb_hid_keyboard_keyset[model->y][model->x].value == 0);
-
-    do {
-        if(((int8_t)model->x) + delta.x < 0)
-            model->x = COLUMN_COUNT - 1;
-        else
-            model->x = (model->x + delta.x) % COLUMN_COUNT;
-    } while(delta.x != 0 && usb_hid_keyboard_keyset[model->y][model->x].width ==
-                                0); // Skip zero width keys, pretend they are one key
-}
-
-static void usb_hid_keyboard_process(UsbHidKeyboard* usb_hid_keyboard, InputEvent* event) {
-    with_view_model(
-        usb_hid_keyboard->view,
-        UsbHidKeyboardModel * model,
-        {
-            if(event->key == InputKeyOk) {
-                if(event->type == InputTypePress) {
-                    model->ok_pressed = true;
-                } else if(event->type == InputTypeLong || event->type == InputTypeShort) {
-                    model->last_key_code = usb_hid_keyboard_get_selected_key(model);
-
-                    // Toggle the modifier key when clicked, and click the key
-                    if(model->last_key_code == HID_KEYBOARD_L_SHIFT) {
-                        model->shift = !model->shift;
-                        if(model->shift)
-                            model->modifier_code |= KEY_MOD_LEFT_SHIFT;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_SHIFT;
-                    } else if(model->last_key_code == HID_KEYBOARD_L_ALT) {
-                        model->alt = !model->alt;
-                        if(model->alt)
-                            model->modifier_code |= KEY_MOD_LEFT_ALT;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_ALT;
-                    } else if(model->last_key_code == HID_KEYBOARD_L_CTRL) {
-                        model->ctrl = !model->ctrl;
-                        if(model->ctrl)
-                            model->modifier_code |= KEY_MOD_LEFT_CTRL;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_CTRL;
-                    } else if(model->last_key_code == HID_KEYBOARD_L_GUI) {
-                        model->gui = !model->gui;
-                        if(model->gui)
-                            model->modifier_code |= KEY_MOD_LEFT_GUI;
-                        else
-                            model->modifier_code &= ~KEY_MOD_LEFT_GUI;
-                    }
-                    furi_hal_hid_kb_press(model->modifier_code | model->last_key_code);
-                } else if(event->type == InputTypeRelease) {
-                    // Release happens after short and long presses
-                    furi_hal_hid_kb_release(model->modifier_code | model->last_key_code);
-                    model->ok_pressed = false;
-                }
-            } else if(event->key == InputKeyBack) {
-                // If back is pressed for a short time, backspace
-                if(event->type == InputTypePress) {
-                    model->back_pressed = true;
-                } else if(event->type == InputTypeShort) {
-                    furi_hal_hid_kb_press(HID_KEYBOARD_DELETE);
-                    furi_hal_hid_kb_release(HID_KEYBOARD_DELETE);
-                } else if(event->type == InputTypeRelease) {
-                    model->back_pressed = false;
-                }
-            } else if(event->type == InputTypePress || event->type == InputTypeRepeat) {
-                // Cycle the selected keys
-                if(event->key == InputKeyUp) {
-                    usb_hid_keyboard_get_select_key(model, (UsbHidKeyboardPoint){.x = 0, .y = -1});
-                } else if(event->key == InputKeyDown) {
-                    usb_hid_keyboard_get_select_key(model, (UsbHidKeyboardPoint){.x = 0, .y = 1});
-                } else if(event->key == InputKeyLeft) {
-                    usb_hid_keyboard_get_select_key(model, (UsbHidKeyboardPoint){.x = -1, .y = 0});
-                } else if(event->key == InputKeyRight) {
-                    usb_hid_keyboard_get_select_key(model, (UsbHidKeyboardPoint){.x = 1, .y = 0});
-                }
-            }
-        },
-        true);
-}
-
-static bool usb_hid_keyboard_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    UsbHidKeyboard* usb_hid_keyboard = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeLong && event->key == InputKeyBack) {
-        furi_hal_hid_kb_release_all();
-    } else {
-        usb_hid_keyboard_process(usb_hid_keyboard, event);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-UsbHidKeyboard* usb_hid_keyboard_alloc() {
-    UsbHidKeyboard* usb_hid_keyboard = malloc(sizeof(UsbHidKeyboard));
-
-    usb_hid_keyboard->view = view_alloc();
-    view_set_context(usb_hid_keyboard->view, usb_hid_keyboard);
-    view_allocate_model(usb_hid_keyboard->view, ViewModelTypeLocking, sizeof(UsbHidKeyboardModel));
-    view_set_draw_callback(usb_hid_keyboard->view, usb_hid_keyboard_draw_callback);
-    view_set_input_callback(usb_hid_keyboard->view, usb_hid_keyboard_input_callback);
-
-    with_view_model(
-        usb_hid_keyboard->view, UsbHidKeyboardModel * model, { model->connected = true; }, true);
-
-    return usb_hid_keyboard;
-}
-
-void usb_hid_keyboard_free(UsbHidKeyboard* usb_hid_keyboard) {
-    furi_assert(usb_hid_keyboard);
-    view_free(usb_hid_keyboard->view);
-    free(usb_hid_keyboard);
-}
-
-View* usb_hid_keyboard_get_view(UsbHidKeyboard* usb_hid_keyboard) {
-    furi_assert(usb_hid_keyboard);
-    return usb_hid_keyboard->view;
-}

applications/plugins/usbkeyboard/views/usb_hid_keyboard.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct UsbHidKeyboard UsbHidKeyboard;
-
-UsbHidKeyboard* usb_hid_keyboard_alloc();
-
-void usb_hid_keyboard_free(UsbHidKeyboard* usb_hid_keyboard);
-
-View* usb_hid_keyboard_get_view(UsbHidKeyboard* usb_hid_keyboard);
-
-void usb_hid_keyboard_set_connected_status(UsbHidKeyboard* usb_hid_keyboard, bool connected);

applications/plugins/usbkeyboard/views/usb_hid_media.c

@@ -1,201 +0,0 @@
-#include "usb_hid_media.h"
-#include <furi.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-#include <USB_Keyboard_icons.h>
-
-struct UsbHidMedia {
-    View* view;
-};
-
-typedef struct {
-    bool left_pressed;
-    bool up_pressed;
-    bool right_pressed;
-    bool down_pressed;
-    bool ok_pressed;
-    bool connected;
-} UsbHidMediaModel;
-
-static void usb_hid_media_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) {
-    canvas_draw_triangle(canvas, x, y, 5, 3, dir);
-    if(dir == CanvasDirectionBottomToTop) {
-        canvas_draw_dot(canvas, x, y - 1);
-    } else if(dir == CanvasDirectionTopToBottom) {
-        canvas_draw_dot(canvas, x, y + 1);
-    } else if(dir == CanvasDirectionRightToLeft) {
-        canvas_draw_dot(canvas, x - 1, y);
-    } else if(dir == CanvasDirectionLeftToRight) {
-        canvas_draw_dot(canvas, x + 1, y);
-    }
-}
-
-static void usb_hid_media_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    UsbHidMediaModel* model = context;
-
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Media");
-    canvas_set_font(canvas, FontSecondary);
-
-    // Keypad circles
-    canvas_draw_icon(canvas, 76, 8, &I_Circles_47x47);
-
-    // Up
-    if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 93, 9, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 96, 12, &I_Volup_8x6);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Down
-    if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 93, 41, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 96, 45, &I_Voldwn_6x6);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Left
-    if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 77, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_media_draw_arrow(canvas, 82, 31, CanvasDirectionRightToLeft);
-    usb_hid_media_draw_arrow(canvas, 86, 31, CanvasDirectionRightToLeft);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Right
-    if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 109, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_media_draw_arrow(canvas, 112, 31, CanvasDirectionLeftToRight);
-    usb_hid_media_draw_arrow(canvas, 116, 31, CanvasDirectionLeftToRight);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Ok
-    if(model->ok_pressed) {
-        canvas_draw_icon(canvas, 93, 25, &I_Pressed_Button_13x13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    usb_hid_media_draw_arrow(canvas, 96, 31, CanvasDirectionLeftToRight);
-    canvas_draw_line(canvas, 100, 29, 100, 33);
-    canvas_draw_line(canvas, 102, 29, 102, 33);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Exit
-    canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
-    canvas_set_font(canvas, FontSecondary);
-    elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
-}
-
-static void usb_hid_media_process_press(UsbHidMedia* usb_hid_media, InputEvent* event) {
-    with_view_model(
-        usb_hid_media->view,
-        UsbHidMediaModel * model,
-        {
-            if(event->key == InputKeyUp) {
-                model->up_pressed = true;
-                furi_hal_hid_consumer_key_press(HID_CONSUMER_VOLUME_INCREMENT);
-            } else if(event->key == InputKeyDown) {
-                model->down_pressed = true;
-                furi_hal_hid_consumer_key_press(HID_CONSUMER_VOLUME_DECREMENT);
-            } else if(event->key == InputKeyLeft) {
-                model->left_pressed = true;
-                furi_hal_hid_consumer_key_press(HID_CONSUMER_SCAN_PREVIOUS_TRACK);
-            } else if(event->key == InputKeyRight) {
-                model->right_pressed = true;
-                furi_hal_hid_consumer_key_press(HID_CONSUMER_SCAN_NEXT_TRACK);
-            } else if(event->key == InputKeyOk) {
-                model->ok_pressed = true;
-                furi_hal_hid_consumer_key_press(HID_CONSUMER_PLAY_PAUSE);
-            }
-        },
-        true);
-}
-
-static void hid_media_process_release(UsbHidMedia* usb_hid_media, InputEvent* event) {
-    with_view_model(
-        usb_hid_media->view,
-        UsbHidMediaModel * model,
-        {
-            if(event->key == InputKeyUp) {
-                model->up_pressed = false;
-                furi_hal_hid_consumer_key_release(HID_CONSUMER_VOLUME_INCREMENT);
-            } else if(event->key == InputKeyDown) {
-                model->down_pressed = false;
-                furi_hal_hid_consumer_key_release(HID_CONSUMER_VOLUME_DECREMENT);
-            } else if(event->key == InputKeyLeft) {
-                model->left_pressed = false;
-                furi_hal_hid_consumer_key_release(HID_CONSUMER_SCAN_PREVIOUS_TRACK);
-            } else if(event->key == InputKeyRight) {
-                model->right_pressed = false;
-                furi_hal_hid_consumer_key_release(HID_CONSUMER_SCAN_NEXT_TRACK);
-            } else if(event->key == InputKeyOk) {
-                model->ok_pressed = false;
-                furi_hal_hid_consumer_key_release(HID_CONSUMER_PLAY_PAUSE);
-            }
-        },
-        true);
-}
-
-static bool usb_hid_media_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    UsbHidMedia* usb_hid_media = context;
-    bool consumed = false;
-
-    if(event->type == InputTypePress) {
-        usb_hid_media_process_press(usb_hid_media, event);
-        consumed = true;
-    } else if(event->type == InputTypeRelease) {
-        hid_media_process_release(usb_hid_media, event);
-        consumed = true;
-    } else if(event->type == InputTypeShort) {
-        if(event->key == InputKeyBack) {
-            furi_hal_hid_kb_release_all();
-        }
-    }
-
-    return consumed;
-}
-
-UsbHidMedia* usb_hid_media_alloc() {
-    UsbHidMedia* usb_hid_media = malloc(sizeof(UsbHidMedia));
-    usb_hid_media->view = view_alloc();
-    view_set_context(usb_hid_media->view, usb_hid_media);
-    view_allocate_model(usb_hid_media->view, ViewModelTypeLocking, sizeof(UsbHidMediaModel));
-    view_set_draw_callback(usb_hid_media->view, usb_hid_media_draw_callback);
-    view_set_input_callback(usb_hid_media->view, usb_hid_media_input_callback);
-
-    with_view_model(
-        usb_hid_media->view, UsbHidMediaModel * model, { model->connected = true; }, true);
-
-    return usb_hid_media;
-}
-
-void usb_hid_media_free(UsbHidMedia* usb_hid_media) {
-    furi_assert(usb_hid_media);
-    view_free(usb_hid_media->view);
-    free(usb_hid_media);
-}
-
-View* usb_hid_media_get_view(UsbHidMedia* usb_hid_media) {
-    furi_assert(usb_hid_media);
-    return usb_hid_media->view;
-}
-
-void usb_hid_media_set_connected_status(UsbHidMedia* usb_hid_media, bool connected) {
-    furi_assert(usb_hid_media);
-    with_view_model(
-        usb_hid_media->view, UsbHidMediaModel * model, { model->connected = connected; }, true);
-}

applications/plugins/usbkeyboard/views/usb_hid_media.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct UsbHidMedia UsbHidMedia;
-
-UsbHidMedia* usb_hid_media_alloc();
-
-void usb_hid_media_free(UsbHidMedia* usb_hid_media);
-
-View* usb_hid_media_get_view(UsbHidMedia* usb_hid_media);
-
-void usb_hid_media_set_connected_status(UsbHidMedia* usb_hid_media, bool connected);

applications/plugins/usbkeyboard/views/usb_hid_mouse.c

@@ -1,215 +0,0 @@
-#include "usb_hid_mouse.h"
-#include <furi.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-#include <USB_Keyboard_icons.h>
-
-struct UsbHidMouse {
-    View* view;
-};
-#define MOUSE_MOVE_SHORT 5
-#define MOUSE_MOVE_LONG 20
-
-typedef struct {
-    bool left_pressed;
-    bool up_pressed;
-    bool right_pressed;
-    bool down_pressed;
-    bool left_mouse_pressed;
-    bool left_mouse_held;
-    bool right_mouse_pressed;
-    bool connected;
-} UsbHidMouseModel;
-
-static void usb_hid_mouse_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    UsbHidMouseModel* model = context;
-
-    // Header
-    /*if(model->connected) {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
-    } else {
-        canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
-    }*/
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse");
-    canvas_set_font(canvas, FontSecondary);
-
-    if(model->left_mouse_held == true) {
-        elements_multiline_text_aligned(canvas, 0, 62, AlignLeft, AlignBottom, "Selecting...");
-    } else {
-        canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
-        canvas_set_font(canvas, FontSecondary);
-        elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit");
-    }
-
-    // Keypad circles
-    canvas_draw_icon(canvas, 64, 8, &I_Circles_47x47);
-
-    // Up
-    if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 81, 9, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 84, 10, &I_Pin_arrow_up_7x9);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Down
-    if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 81, 41, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 84, 43, &I_Pin_arrow_down_7x9);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Left
-    if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 65, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 67, 28, &I_Pin_arrow_left_9x7);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Right
-    if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
-        canvas_draw_icon(canvas, 97, 25, &I_Pressed_Button_13x13);
-        canvas_set_bitmap_mode(canvas, 0);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 99, 28, &I_Pin_arrow_right_9x7);
-    canvas_set_color(canvas, ColorBlack);
-
-    // Ok
-    if(model->left_mouse_pressed) {
-        canvas_draw_icon(canvas, 81, 25, &I_Ok_btn_pressed_13x13);
-    } else {
-        canvas_draw_icon(canvas, 83, 27, &I_Left_mouse_icon_9x9);
-    }
-
-    // Back
-    if(model->right_mouse_pressed) {
-        canvas_draw_icon(canvas, 108, 48, &I_Ok_btn_pressed_13x13);
-    } else {
-        canvas_draw_icon(canvas, 110, 50, &I_Right_mouse_icon_9x9);
-    }
-}
-
-static void usb_hid_mouse_process(UsbHidMouse* usb_hid_mouse, InputEvent* event) {
-    with_view_model(
-        usb_hid_mouse->view,
-        UsbHidMouseModel * model,
-        {
-            if(event->key == InputKeyBack) {
-                if(event->type == InputTypeShort) {
-                    furi_hal_hid_mouse_press(HID_MOUSE_BTN_RIGHT);
-                    furi_hal_hid_mouse_release(HID_MOUSE_BTN_RIGHT);
-                } else if(event->type == InputTypePress) {
-                    model->right_mouse_pressed = true;
-                } else if(event->type == InputTypeRelease) {
-                    model->right_mouse_pressed = false;
-                }
-            } else if(event->key == InputKeyOk) {
-                if(event->type == InputTypeShort) {
-                    // Just release if it was being held before
-                    if(!model->left_mouse_held) furi_hal_hid_mouse_press(HID_MOUSE_BTN_LEFT);
-                    furi_hal_hid_mouse_release(HID_MOUSE_BTN_LEFT);
-                    model->left_mouse_held = false;
-                } else if(event->type == InputTypeLong) {
-                    furi_hal_hid_mouse_press(HID_MOUSE_BTN_LEFT);
-                    model->left_mouse_held = true;
-                    model->left_mouse_pressed = true;
-                } else if(event->type == InputTypePress) {
-                    model->left_mouse_pressed = true;
-                } else if(event->type == InputTypeRelease) {
-                    // Only release if it wasn't a long press
-                    if(!model->left_mouse_held) model->left_mouse_pressed = false;
-                }
-
-            } else if(event->key == InputKeyRight) {
-                if(event->type == InputTypePress) {
-                    model->right_pressed = true;
-                    furi_hal_hid_mouse_move(MOUSE_MOVE_SHORT, 0);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_hid_mouse_move(MOUSE_MOVE_LONG, 0);
-                } else if(event->type == InputTypeRelease) {
-                    model->right_pressed = false;
-                }
-            } else if(event->key == InputKeyLeft) {
-                if(event->type == InputTypePress) {
-                    model->left_pressed = true;
-                    furi_hal_hid_mouse_move(-MOUSE_MOVE_SHORT, 0);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_hid_mouse_move(-MOUSE_MOVE_LONG, 0);
-                } else if(event->type == InputTypeRelease) {
-                    model->left_pressed = false;
-                }
-            } else if(event->key == InputKeyDown) {
-                if(event->type == InputTypePress) {
-                    model->down_pressed = true;
-                    furi_hal_hid_mouse_move(0, MOUSE_MOVE_SHORT);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_hid_mouse_move(0, MOUSE_MOVE_LONG);
-                } else if(event->type == InputTypeRelease) {
-                    model->down_pressed = false;
-                }
-            } else if(event->key == InputKeyUp) {
-                if(event->type == InputTypePress) {
-                    model->up_pressed = true;
-                    furi_hal_hid_mouse_move(0, -MOUSE_MOVE_SHORT);
-                } else if(event->type == InputTypeRepeat) {
-                    furi_hal_hid_mouse_move(0, -MOUSE_MOVE_LONG);
-                } else if(event->type == InputTypeRelease) {
-                    model->up_pressed = false;
-                }
-            }
-        },
-        true);
-}
-
-static bool usb_hid_mouse_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    UsbHidMouse* usb_hid_mouse = context;
-    bool consumed = false;
-
-    if(event->type == InputTypeLong && event->key == InputKeyBack) {
-        furi_hal_hid_mouse_release(HID_MOUSE_BTN_LEFT);
-        furi_hal_hid_mouse_release(HID_MOUSE_BTN_RIGHT);
-    } else {
-        usb_hid_mouse_process(usb_hid_mouse, event);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-UsbHidMouse* usb_hid_mouse_alloc() {
-    UsbHidMouse* usb_hid_mouse = malloc(sizeof(UsbHidMouse));
-    usb_hid_mouse->view = view_alloc();
-    view_set_context(usb_hid_mouse->view, usb_hid_mouse);
-    view_allocate_model(usb_hid_mouse->view, ViewModelTypeLocking, sizeof(UsbHidMouseModel));
-    view_set_draw_callback(usb_hid_mouse->view, usb_hid_mouse_draw_callback);
-    view_set_input_callback(usb_hid_mouse->view, usb_hid_mouse_input_callback);
-
-    with_view_model(
-        usb_hid_mouse->view, UsbHidMouseModel * model, { model->connected = true; }, true);
-
-    return usb_hid_mouse;
-}
-
-void usb_hid_mouse_free(UsbHidMouse* usb_hid_mouse) {
-    furi_assert(usb_hid_mouse);
-    view_free(usb_hid_mouse->view);
-    free(usb_hid_mouse);
-}
-
-View* usb_hid_mouse_get_view(UsbHidMouse* usb_hid_mouse) {
-    furi_assert(usb_hid_mouse);
-    return usb_hid_mouse->view;
-}

applications/plugins/usbkeyboard/views/usb_hid_mouse.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-typedef struct UsbHidMouse UsbHidMouse;
-
-UsbHidMouse* usb_hid_mouse_alloc();
-
-void usb_hid_mouse_free(UsbHidMouse* usb_hid_mouse);
-
-View* usb_hid_mouse_get_view(UsbHidMouse* usb_hid_mouse);
-
-void usb_hid_mouse_set_connected_status(UsbHidMouse* usb_hid_mouse, bool connected);

applications/plugins/usbkeyboard/views/usb_hid_mouse_jiggler.c

@@ -1,156 +0,0 @@
-#include "usb_hid_mouse_jiggler.h"
-#include <furi.h>
-#include <furi_hal_usb_hid.h>
-#include <gui/elements.h>
-
-#include <USB_Keyboard_icons.h>
-
-#define TAG "HidMouseJiggler"
-
-#define LENGTH(x) (int)(sizeof(x) / sizeof((x)[0]))
-
-struct HidMouseJiggler {
-    View* view;
-    FuriTimer* timer;
-};
-
-typedef struct {
-    bool running;
-    int interval_idx;
-    uint8_t counter;
-} HidMouseJigglerModel;
-
-const int intervals[6] = {500, 2000, 5000, 10000, 30000, 60000};
-
-static void hid_mouse_jiggler_draw_callback(Canvas* canvas, void* context) {
-    furi_assert(context);
-    HidMouseJigglerModel* model = context;
-
-    // Header
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 17, 2, AlignLeft, AlignTop, "Mouse Jiggler");
-
-    // Timeout
-    elements_multiline_text(canvas, AlignLeft, 26, "Interval (ms):");
-    canvas_set_font(canvas, FontSecondary);
-    if(model->interval_idx != 0) canvas_draw_icon(canvas, 74, 19, &I_ButtonLeft_4x7);
-    if(model->interval_idx != LENGTH(intervals) - 1)
-        canvas_draw_icon(canvas, 80, 19, &I_ButtonRight_4x7);
-    FuriString* interval_str = furi_string_alloc_printf("%d", intervals[model->interval_idx]);
-    elements_multiline_text(canvas, 91, 26, furi_string_get_cstr(interval_str));
-    furi_string_free(interval_str);
-
-    canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text(canvas, AlignLeft, 40, "Press Start\nto jiggle");
-    canvas_set_font(canvas, FontSecondary);
-
-    // Ok
-    canvas_draw_icon(canvas, 63, 30, &I_Space_65x18);
-    if(model->running) {
-        elements_slightly_rounded_box(canvas, 66, 32, 60, 13);
-        canvas_set_color(canvas, ColorWhite);
-    }
-    canvas_draw_icon(canvas, 74, 34, &I_Ok_btn_9x9);
-    if(model->running) {
-        elements_multiline_text_aligned(canvas, 91, 41, AlignLeft, AlignBottom, "Stop");
-    } else {
-        elements_multiline_text_aligned(canvas, 91, 41, AlignLeft, AlignBottom, "Start");
-    }
-    canvas_set_color(canvas, ColorBlack);
-
-    // Back
-    canvas_draw_icon(canvas, 74, 54, &I_Pin_back_arrow_10x8);
-    elements_multiline_text_aligned(canvas, 91, 62, AlignLeft, AlignBottom, "Quit");
-}
-
-static void hid_mouse_jiggler_timer_callback(void* context) {
-    furi_assert(context);
-    HidMouseJiggler* hid_mouse_jiggler = context;
-    with_view_model(
-        hid_mouse_jiggler->view,
-        HidMouseJigglerModel * model,
-        {
-            if(model->running) {
-                model->counter++;
-                furi_hal_hid_mouse_move(
-                    (model->counter % 2 == 0) ? MOUSE_MOVE_SHORT : -MOUSE_MOVE_SHORT, 0);
-            }
-        },
-        false);
-}
-
-static void hid_mouse_jiggler_exit_callback(void* context) {
-    furi_assert(context);
-    HidMouseJiggler* hid_mouse_jiggler = context;
-    furi_timer_stop(hid_mouse_jiggler->timer);
-}
-
-static bool hid_mouse_jiggler_input_callback(InputEvent* event, void* context) {
-    furi_assert(context);
-    HidMouseJiggler* hid_mouse_jiggler = context;
-
-    bool consumed = false;
-
-    with_view_model(
-        hid_mouse_jiggler->view,
-        HidMouseJigglerModel * model,
-        {
-            if(event->type == InputTypePress && event->key == InputKeyOk) {
-                model->running = !model->running;
-                if(model->running) {
-                    furi_timer_stop(hid_mouse_jiggler->timer);
-                    furi_timer_start(hid_mouse_jiggler->timer, intervals[model->interval_idx]);
-                };
-                consumed = true;
-            }
-            if(event->type == InputTypePress && event->key == InputKeyRight && !model->running &&
-               model->interval_idx < LENGTH(intervals) - 1) {
-                model->interval_idx++;
-                consumed = true;
-            }
-            if(event->type == InputTypePress && event->key == InputKeyLeft && !model->running &&
-               model->interval_idx > 0) {
-                model->interval_idx--;
-                consumed = true;
-            }
-        },
-        true);
-
-    return consumed;
-}
-
-HidMouseJiggler* hid_mouse_jiggler_alloc() {
-    HidMouseJiggler* hid_mouse_jiggler = malloc(sizeof(HidMouseJiggler));
-
-    hid_mouse_jiggler->view = view_alloc();
-    view_set_context(hid_mouse_jiggler->view, hid_mouse_jiggler);
-    view_allocate_model(
-        hid_mouse_jiggler->view, ViewModelTypeLocking, sizeof(HidMouseJigglerModel));
-    view_set_draw_callback(hid_mouse_jiggler->view, hid_mouse_jiggler_draw_callback);
-    view_set_input_callback(hid_mouse_jiggler->view, hid_mouse_jiggler_input_callback);
-    view_set_exit_callback(hid_mouse_jiggler->view, hid_mouse_jiggler_exit_callback);
-
-    hid_mouse_jiggler->timer = furi_timer_alloc(
-        hid_mouse_jiggler_timer_callback, FuriTimerTypePeriodic, hid_mouse_jiggler);
-
-    with_view_model(
-        hid_mouse_jiggler->view, HidMouseJigglerModel * model, { model->interval_idx = 2; }, true);
-
-    return hid_mouse_jiggler;
-}
-
-void hid_mouse_jiggler_free(HidMouseJiggler* hid_mouse_jiggler) {
-    furi_assert(hid_mouse_jiggler);
-
-    furi_timer_stop(hid_mouse_jiggler->timer);
-    furi_timer_free(hid_mouse_jiggler->timer);
-
-    view_free(hid_mouse_jiggler->view);
-
-    free(hid_mouse_jiggler);
-}
-
-View* hid_mouse_jiggler_get_view(HidMouseJiggler* hid_mouse_jiggler) {
-    furi_assert(hid_mouse_jiggler);
-    return hid_mouse_jiggler->view;
-}

applications/plugins/usbkeyboard/views/usb_hid_mouse_jiggler.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-
-#define MOUSE_MOVE_SHORT 5
-#define MOUSE_MOVE_LONG 20
-
-typedef struct HidMouseJiggler HidMouseJiggler;
-
-HidMouseJiggler* hid_mouse_jiggler_alloc();
-
-void hid_mouse_jiggler_free(HidMouseJiggler* hid_mouse_jiggler);
-
-View* hid_mouse_jiggler_get_view(HidMouseJiggler* hid_mouse_jiggler);

applications/plugins/weather_station/scenes/weather_station_receiver.c

@@ -197,7 +197,7 @@ bool weather_station_scene_receiver_on_event(void* context, SceneManagerEvent ev
         }
         // Get current RSSI
         float rssi = furi_hal_subghz_get_rssi();
-        ws_receiver_rssi(app->ws_receiver, rssi);
+        ws_view_receiver_set_rssi(app->ws_receiver, rssi);
 
         if(app->txrx->txrx_state == WSTxRxStateRx) {
             notification_message(app->notifications, &sequence_blink_cyan_10);

applications/plugins/weather_station/views/weather_station_receiver.c

@@ -63,7 +63,7 @@ typedef struct {
     uint8_t u_rssi;
 } WSReceiverModel;
 
-void ws_receiver_rssi(WSReceiver* instance, float rssi) {
+void ws_view_receiver_set_rssi(WSReceiver* instance, float rssi) {
     furi_assert(instance);
     with_view_model(
         instance->view,
@@ -197,7 +197,6 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
     canvas_set_font(canvas, FontSecondary);
 
     elements_button_left(canvas, "Config");
-    //canvas_draw_line(canvas, 46, 51, 125, 51);
 
     bool scrollbar = model->history_item > 4;
     FuriString* str_buff;
@@ -230,7 +229,6 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
         canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52);
         canvas_set_font(canvas, FontPrimary);
         canvas_draw_str(canvas, 63, 46, "Scanning...");
-        //canvas_draw_line(canvas, 46, 51, 125, 51);
         canvas_set_font(canvas, FontSecondary);
     }
 

applications/plugins/weather_station/views/weather_station_receiver.h

@@ -8,7 +8,7 @@ typedef struct WSReceiver WSReceiver;
 
 typedef void (*WSReceiverCallback)(WSCustomEvent event, void* context);
 
-void ws_receiver_rssi(WSReceiver* instance, float rssi);
+void ws_view_receiver_set_rssi(WSReceiver* instance, float rssi);
 
 void ws_view_receiver_set_lock(WSReceiver* ws_receiver, WSLock keyboard);
 

applications/services/cli/cli_commands.c

@@ -137,7 +137,7 @@ void cli_command_date(Cli* cli, FuriString* args, void* context) {
 }
 
 void cli_command_src(Cli* cli, FuriString* args, void* context) {
-    // Quality of life feaature for people exploring CLI on lab.flipper.net/cli
+    // Quality of life feature for people exploring CLI on lab.flipper.net/cli
     // By Yousef AK
     UNUSED(cli);
     UNUSED(args);

applications/services/crypto/crypto_cli.c

@@ -14,7 +14,7 @@ void crypto_cli_print_usage() {
         "\tdecrypt <key_slot:int> <iv:hex>\t - Using key from secure enclave and IV decrypt hex encoded encrypted with AES256CBC data to plain text\r\n");
     printf("\thas_key <key_slot:int>\t - Check if secure enclave has key in slot\r\n");
     printf(
-        "\tstore_key <key_slot:int> <key_type:str> <key_size:int> <key_data:hex>\t - Store key in secure enclave. !!! NON-REVERSABLE OPERATION - READ MANUAL FIRST !!!\r\n");
+        "\tstore_key <key_slot:int> <key_type:str> <key_size:int> <key_data:hex>\t - Store key in secure enclave. !!! NON-REVERSIBLE OPERATION - READ MANUAL FIRST !!!\r\n");
 };
 
 void crypto_cli_encrypt(Cli* cli, FuriString* args) {

applications/services/desktop/animations/animation_manager.h

@@ -152,7 +152,7 @@ bool animation_manager_is_animation_loaded(AnimationManager* animation_manager);
 void animation_manager_unload_and_stall_animation(AnimationManager* animation_manager);
 
 /**
- * Load and Contunue execution of animation manager.
+ * Load and Continue execution of animation manager.
  *
  * @animation_manager   instance
  */

applications/services/desktop/desktop.c

@@ -62,6 +62,9 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         return true;
     case DesktopGlobalAutoLock:
         if(!loader_is_locked(desktop->loader)) {
+            if(desktop->settings.auto_lock_with_pin && desktop->settings.pin_code.length > 0) {
+                desktop_pin_lock(&desktop->settings);
+            }
             desktop_lock(desktop);
         }
         return true;

applications/services/desktop/desktop_settings.h

@@ -8,7 +8,7 @@
 #include <toolbox/saved_struct.h>
 #include <storage/storage.h>
 
-#define DESKTOP_SETTINGS_VER (6)
+#define DESKTOP_SETTINGS_VER (7)
 
 #define DESKTOP_SETTINGS_PATH INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
 #define DESKTOP_SETTINGS_MAGIC (0x17)
@@ -63,4 +63,5 @@ typedef struct {
     uint32_t auto_lock_delay_ms;
     uint8_t displayBatteryPercentage;
     uint8_t dummy_mode;
+    bool auto_lock_with_pin;
 } DesktopSettings;

applications/services/desktop/views/desktop_view_main.c

@@ -17,7 +17,7 @@ struct DesktopMainView {
     bool dummy_mode;
 };
 
-#define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 2000
+#define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 1300
 
 static void desktop_main_poweroff_timer_callback(TimerHandle_t timer) {
     DesktopMainView* main_view = pvTimerGetTimerID(timer);

applications/services/gui/canvas.h

@@ -363,7 +363,7 @@ void canvas_draw_rframe(
     uint8_t height,
     uint8_t radius);
 
-/** Draw rounded-corner box of width, height at x,y, with round value raduis
+/** Draw rounded-corner box of width, height at x,y, with round value radius
  *
  * @param      canvas  Canvas instance
  * @param      x       x coordinate