From 001e00d84a826512bab69fd43a2564bec72c0316 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 26 Mar 2023 14:59:21 +0300
Subject: [PATCH] fbt format, aprimatic fixes

---
 .../external/pocsag_pager/protocols/pocsag.c  |   3 +-
 .../totp_scene_generate_token.c               |   7 +-
 applications/main/fap_loader/fap_loader_app.c |  11 +-
 assets/resources/subghz/assets/keeloq_mfcodes | 110 +++++++++---------
 .../subghz/assets/setting_user.example        |   2 +-
 .../targets/f7/furi_hal/furi_hal_subghz.c     |   4 +-
 6 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/applications/external/pocsag_pager/protocols/pocsag.c b/applications/external/pocsag_pager/protocols/pocsag.c
index cc393ac5b..0296a70a7 100644
--- a/applications/external/pocsag_pager/protocols/pocsag.c
+++ b/applications/external/pocsag_pager/protocols/pocsag.c
@@ -157,8 +157,7 @@ static bool pocsag_decode_message_word(SubGhzProtocolDecoderPocsag* instance, ui
 // Function called when current message got decoded, but other messages might follow
 static void pocsag_message_done(SubGhzProtocolDecoderPocsag* instance) {
     // append the message to the long-term storage string
-    furi_string_printf(
-        instance->generic.result_ric, "\e#RIC: %" PRIu32 "\e# | ", instance->ric);
+    furi_string_printf(instance->generic.result_ric, "\e#RIC: %" PRIu32 "\e# | ", instance->ric);
     furi_string_cat_str(instance->generic.result_ric, func_msg[instance->func]);
     if(instance->func != POCSAG_FUNC_ALERT1) {
         furi_string_cat(instance->done_msg, instance->msg);
diff --git a/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c b/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
index 9e8b21d09..a8e93bbff 100644
--- a/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
+++ b/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
@@ -373,7 +373,8 @@ bool totp_scene_generate_token_handle_event(
 
     SceneState* scene_state;
     if(event->input.type == InputTypeLong) {
-        if(event->input.key == InputKeyDown && plugin_state->automation_method & AutomationMethodBadUsb) {
+        if(event->input.key == InputKeyDown &&
+           plugin_state->automation_method & AutomationMethodBadUsb) {
             scene_state = (SceneState*)plugin_state->current_scene_state;
             totp_usb_type_code_worker_notify(
                 scene_state->usb_type_code_worker_context, TotpUsbTypeCodeWorkerEventType);
@@ -383,7 +384,9 @@ bool totp_scene_generate_token_handle_event(
             return true;
         }
 #ifdef TOTP_BADBT_TYPE_ENABLED
-        else if(event->input.key == InputKeyUp && plugin_state->automation_method & AutomationMethodBadBt) {
+        else if(
+            event->input.key == InputKeyUp &&
+            plugin_state->automation_method & AutomationMethodBadBt) {
             scene_state = (SceneState*)plugin_state->current_scene_state;
             totp_bt_type_code_worker_notify(
                 plugin_state->bt_type_code_worker_context, TotpBtTypeCodeWorkerEventType);
diff --git a/applications/main/fap_loader/fap_loader_app.c b/applications/main/fap_loader/fap_loader_app.c
index d85eb784b..f4f2550da 100644
--- a/applications/main/fap_loader/fap_loader_app.c
+++ b/applications/main/fap_loader/fap_loader_app.c
@@ -86,9 +86,16 @@ static bool fap_loader_run_selected_app(FapLoader* loader, bool ignore_mismatch)
             if(preload_res == FlipperApplicationPreloadStatusApiMismatch) {
                 if(!ignore_mismatch) {
                     DialogMessage* message = dialog_message_alloc();
-                    dialog_message_set_header(message, "API Mismatch", 64, 0, AlignCenter, AlignTop);
+                    dialog_message_set_header(
+                        message, "API Mismatch", 64, 0, AlignCenter, AlignTop);
                     dialog_message_set_buttons(message, "Cancel", NULL, "Continue");
-                    dialog_message_set_text(message, "This app might not\nwork correctly\nContinue anyways?", 64, 32, AlignCenter, AlignCenter);
+                    dialog_message_set_text(
+                        message,
+                        "This app might not\nwork correctly\nContinue anyways?",
+                        64,
+                        32,
+                        AlignCenter,
+                        AlignCenter);
                     if(dialog_message_show(loader->dialogs, message) == DialogMessageButtonRight) {
                         retry = true;
                     }
diff --git a/assets/resources/subghz/assets/keeloq_mfcodes b/assets/resources/subghz/assets/keeloq_mfcodes
index cb80c2e2e..e65eb0868 100644
--- a/assets/resources/subghz/assets/keeloq_mfcodes
+++ b/assets/resources/subghz/assets/keeloq_mfcodes
@@ -1,58 +1,58 @@
 Filetype: Flipper SubGhz Keystore File
 Version: 0
 Encryption: 1
-IV: AB 0B A1 23 45 FE E7 06 66 73 21 67 97 12 3D 61
-CA9DC3E30069ED9C257FCA6747136F617F4E390F2B8BDDFDEBEC8A398A6A0C1E
-78F18401572E33117850EA83D00C2F92376E88D7CAC0BF7CBA7037BF6755F43C
-909055FF43224057BCE5F965174AF46586EB7CA4CAE1B3EB8B66EA569047948A
-AB9B7D338457774713147BF666A5996926B90146CB698AC2F4DE63ADE89D84BB
-ED796AED9BB3185ACD94779F7CC42665D4A3B04419E4272B77DA8D94B5CF84921889CEB110AB55D7267720A7C5B290EF
-88E0CECA92549C73981F95999FA8F03B1B2EB98774134752556D7D7EFA802757
-C42CABAD74010E35726659C8E4AF4888282FBEA9703616B3403DA7C3DCA8A8ED
-6F44BC56AC2E9883A2469C1909D171A8C58A0CFE4B506CC562EB2F08A484AE1B
-65DEBEBC629FA3CE72B5028E1E385DFFEE0A9FE227FC5F6DD4368C0CB1886A7D
-EA9BDC762FCBAAA11A4BE677AE344993990153C9E7A4A89F8271F49765FC72EF
-8FAE9AC3033E637703626956F91791DAE4B3BEA9C82C065C91A314DDB647F8FE661750526E58C613000260675C2B520C
-3D853DEC62375B3201B1C2269E31794A3C29958B191953A331D39675CCB53C002EF1491B63C49E629AF5D747CC52BD11
-61A02BB85B08AA8047EAD9FB80D489AB15CBE0302C660891C4B29D2621C80DBB
-5230A9651D1A0910695593E1A5F6EA6EB21990D6465E52B325CF141C9E0C9172
-C9348D18DC019C3E364F7AD9CD5B6D77EE2D6486CFBDFAFE7042AB917E8FFE7C
-DED385BBAC8FAB5918DBDBDC8622850048A540963AF35C3DD772926927B148C2
-E1EC13990BDA8E22F2848F97069462FB46840FEA688C52EDE930CD22C4E6F445BF317A96C4A6C2DC4295B2E3E86053B9
-D5453884C337587A13117F35219C7B4356E8E63EBC4C197CC1633D444D0A6AD0
-72C3E291DA11AD3D195C6A1B65849B0C91B7D18762B515A5728389356C42B62C
-0E9EA0D97053752977D83A019A2F0393D326407AE507F5EE6E650082DBC683F81BDD71B79BE81EEB3139815377577346
-A32FF38450B3121CB01CE06AA369DC7B883CD9B1695CBADBC9609F009D6BFF7B7518D9DD690D214A1DB0D1A0C6F9FC3F
-98848EFBB09D2A3EA59EE91B1B510BA3775E36B14500DE1238317AFC9872358F
-E8B2785366399F84EADF07B0E299603BB885780E6ECA883508FFB7664C6473FE
-1F6CEA6696B2E07FEB256506609D7E11D9F09F18B9EE43DE9BC42014ABF5213F
-F2FF5045A5E90AAF92C2ECCB9FEFFBDE400A7E3E6B09CF43608896F7BC91736F
-73CC30A78808BB2B3F7F398D88C79470AF86B825DE0C2FF31442D351C2826D9C
-B68FD5017BA4809AD22DF64805DCE329A81C2CE3F7BE87FADFBD02211AB02321
-57BC2E14A724D6E2F4B0FD9401C3E6E5117D338077958648A558E40C553C787F
-882A41BC36393F06C57ED71E66D003E24B5DAE86F90D8AEDD89A2DFED6719BF1
-95EDC3C3EB639AC66656B58D8F71A5B1B329002C4CCF7666C41C717A939C0979
-494A32528A68F5B4DF45385CC7FB470224F25D8AC9C81AB0DBD291AA4764BB17
-9A6D21675317433CE6EE860C9A2713265E1DA5E8F4024690252971EA5C2A566A
-2B8379BCDDD0E6F73B1AD2D5A4D69D34D0013E98C87AD2BCE7AEED80F3BF4F69
-6E5D67B8B825943F9B9979D5E1EA9348B1DD40A5DA39B20FA96B78CAD3E03747
-27559A18DD6D52FFED8427376113C1A35840D64A53466071E1B769A28F161A99
-A2F38E38C253947816B5E629AAC02BC77EF7B56CC95FBF291C05466C56E01E47FE92053C900C0F6F98B11D7873BB9AFC
-8A7E57E1228F75F78D51C13FE79C269E43F007E55F5B87741BCADDAAA6402DF7
-E088817700DBC7D778427464368D7771E3C20194CE60D08668578CAA527258B8
-3E5AD04DE23578A3BBC5FB91608435EBA1FF1465EDCE3E064F60A2EED35C9015
-647C9BFB61C0509D152A7B6B5C548DC558052F862314B42F4D1D8B98F6BF2412
-3D659FF6999401CAB590681036C3FDABAF157C774928E0D7D76FAC08AA6CFE93
-342362E28923E64DC5047E25E5A2F3FC8A6EB63554793CB8A1C99FFE632A370508CA208CA912470DB343A1636C751B9E
-3B71D04AB09DFB44015F5553B4B76C9419C4D615F60184BA0B6A5687E47D66BA
-14CF7621A4943DE2156AB8FDE8A9E74D26776D8362D9364387626488CB3DA5DC
-2F9205BF8B310C33E38F571FFBDF6FC4BA5135457A2CF6CA9CD319F3EDF4BF6E
-785EDF05A2111B8E4A126BE274C9BD8D6C0482F4A2B716FFAE93EDB8D1634F41
-4B26880D1AE8EC1D285296F473EB5A805CF1C1EA47B899A6A3F8E9EFDB2CBCA3
-A002B3ED0D1FCBC02298BFE7F18207CD58AB21D358F20855D067939EF50DCC08
-BE82806DE526A6453C6FA309DAE0B52D67A98A194753DD4CC2C8C196A47B253F60149FAF49D0396E1F24CB1EDF1430DA
-031686817FB37936FD0313B9358FD35BAF5DEB924F7A939C4B843DD095F11806
-3A7B7A7AE8723C2A060FF368AB048A48737D4EEAD3C97BF98BC9E8CAE552431B
-357C4A1A41F43100208863F2E607AE14CC55235D757CDE5C491BE405BB72BDB4
-0C46E442B9AC3C479C18D4D94AB3E5124D4033AFD05AE00AC6881DD62F11E07F
-8705CF1D9B202056CEBD98FF25CB0B6BF40175DBDC2FE86FE2A7D2AC796F818EA71A8C1312E9C7FCE6CC3D11FBBA98E4
+IV: AF 0B A3 13 56 FA F7 46 76 78 25 28 34 16 3D 62
+77995F096640A6CA8735DE839975FA3573145DDB995E45F58AECCD6A6F2D6FCB
+A062DD58F9957EC098075344DFF69FB3B2A3C9893D4240C74BE32299F330290B
+2AD2CCC4FB760D772001A903A995435260F442152BDCD5B075FBC61015BEC7E1
+34AE78CF87A10211C8E6F6E2EE18C4F0BBE3B677094B7118E03AD9E89AF70E28
+41943E7507D37A344F56EDF4BBDCDA75FAA10A6E97DF801ACF2A0E97E41782053CA74E31E3488EA1AFE29369E7A542C7
+9FA67B118BC1FE289F38A78DA4E1FFBAEB4498404B49CBD9690B9421FC05564D
+3A872E97A668C644D3827273ADDA6B1BC689A3AD09F5980EC7461E40624653BE
+5E1F4D865E5F4176DBF7832992B60947812E05701E647CF36427C2EE04F97FE2
+7FCF6E437D0DA231A2937C46622C4939F0045AEF5CF7FCF5D97E24B67995F0D3
+D09F230FEDB9CB690B5AC7C6BCE86B0779D9C233D2823562EABE340FF06C819D
+84F0A81ABB7857438BF52BE8988C1A471EFEDFE16EC11851BFC39F34EB26236F318CFAAEC9A53AD5500D48CAE21E777A
+F3FDDDD5DB6038D0E2FC02750530325976ADA2600DE19BF736AF6CB7E810D7627B4F396963F0288F486182228B9AAE22
+87E07B23B3B2740D93C82696C020057CC7F3864ABD6E6967656F44427C529DD1
+20C35809F7F5161C21E643A606DC48A5CC85BCEB546A03023DF778C4499426E3
+81CCF1CA68E2B6663DA9D12FEE241307A2E449440901793A955CB5D5915819DD
+1B66D0664451153D0124364834E1543960A756351330523C3FFE83DA4EE7F0E6
+7025D550A40466B472BA71F3248C37E6DE1FD59ED5C11CBB26238795DD44F4B21BD447F3CA72AED6A25B977982100A1E
+99F38C3F7C89D2805FB36F931AC5D1B248A56838AC29E13B1255CAE706B68216
+D138C616E4E1F6053177118C94F65C0BA6B155286CE63E0728E3F2D2BF6C6A98
+276E646DBF54B341F93AB4E1C36525AF983879F7251D84BB02DD54F4A5E0FA85A3278891F7ADA9ADE2F8AAD010F6F6D4
+3F3598143FE40E04FE25EADE1EC2B4CDAE339AF7730AE9DC45C97C0E44B299DBCC0E9DA6F4B0EE00F25D2FDD9E1C6BF5
+20FA8F62628FEA51A584CE298F22E60FF85BFE193AF1C5DE57605FF02E90739C
+B14B4896088EF58E0CE659511C93782FB5F94BC69B64E5011EBD10DF18FFB3B1
+90BBE045FFEA06A77B55B0B6D0CFA8F12C4E1B35FB0111DD0C2CF1637AE8924A
+04B87BC1D09E8EE3C8A91CE75169546D37868B2D87BF2D712623F84937ACE974
+B8C5B04070FFB27B4686057C57F762FA3CAF2BBD3E5BEBE462C1C2FC283AE118
+A40B154CEC2F5F989CA6F30703A0133217530D41F12739B25E2C1BEF54E6AC7C
+4F5B9A68E8DEDB00410F5AD7FB7F7CA8F43B75F0457DA2AFAA8279A8C4AF34AB
+9A7B185F6A157B1886DC6AA98B1F3D6899331D8BDDBAAC9620321E16BB4CC7E8
+4A710E11F1C7A7138065801BDB4E72B07608220BBCF7455111FDD41DC0290B94
+3A5B715089F926049077172755B0C48B4A4420031787D7DB113CF402C7D3D0AE
+EE0B90EC27EC0F4A8DCD3C747E17594E0A27A92E05F2DE7B0457873C7154E075
+0B9B201C209072676A47225BE4E43B4631B080A85F9FCFAA5683A4F9A727187A
+13A15C606AA2EA40F2DCDE7F44217F02D2D9796CAC9164100B211D7A22CF333B
+DF5292BBF35AB1408956D439A81EF12F53573F985489727A10FB652B7BD8B10D
+50E59C9DD3A08EA8752656B753B8D9D2BFD674EB4C5F0DCAE9870E81D7F00F6AAC133FA7C7307FA197D551EE877F8CD7
+E173C1798596A31F697D63E0CCDDFAB14B1B1E299DD642102A7858ECC795CF1B
+92D3326A93AA6B37041F219C8035F37A057C1B69BECA7881098BED2A49C58751
+27D17F007115734FA0F55F2BDF016ECE8DFA703FA6D61729456E95B78FC8AC29
+4FF7306A426B7DE021D59968FAEF3453F555A9A952D81C4008D5000513799DEA
+660CB0D4634EABC6CAA9E321CB08FC0C8C8F6BAE0FAF0C10C1FCCBA93B68D9B4
+86D84C91BFBF0DE22088C0F5A8598A2C2807033E60BC11333E8D1A6188F043D5
+F3E0E8566E12ADBA44974A3CA1D6D60456649031DCAD4365D0AE80FEDBC80AAA106A9BAB39448CD62EF916A59ECA9579
+F4D6EB6D241B17CA0A9E73E93DA3B58B6B257CC0484FC92E285984A09FD4CEA9
+094265CB574E0C9B8954B3130A2017492B1149C3FB9239A6B690A9C7B6635E5A
+BE67B61B2F99BAA4AF94B71CB5F2386417D5F3B187899222D2671B1147BA9932
+74840B34C9F27A76FCB593629C8114BCABD1B1CE96E22CC378DC9E7BEEF263FB
+2511F44F0A13D94B55D7FF3297194E47D6987890F9170BCBC14A7607C5A38E01
+FD0CF9314CB9B949CEFE1DA3FA05A18FBEEF751B4DC900DBAE068EE211C4492C
+22ECD6934472760CF806E7C9E86885D0C0AAE501EDBF9DCB7ADC7AE53F3B73C38F2B6FB3FD0F867C5B5BFD00440CB43A
+325CA78241AE4EE784CC867815403E342F77BB428EB1FE189AD569F10170CB98
+BF065D29EC8E2BB411F0131DF3A06BDF07B1436A14004D0E11E1261F0E232CB8
+CE015802FCE9AFD9807F855D813FD06D5446A8953057A79BC4A452BDAB8E9DD7
+C6B569EB172EC4609966E2C9426BE99A86529073A57824B1752392658C4E87F08ED8675A32F44E413CD6037CA4A0DE71
diff --git a/assets/resources/subghz/assets/setting_user.example b/assets/resources/subghz/assets/setting_user.example
index e0c474a99..5034659be 100644
--- a/assets/resources/subghz/assets/setting_user.example
+++ b/assets/resources/subghz/assets/setting_user.example
@@ -1,7 +1,7 @@
 # to use manual settings and prevent them from being deleted on upgrade, rename *_user.example files to *_user
 Filetype: Flipper SubGhz Setting File
 Version: 1
-# Add Standard frequencies for your region
+# Add Standard frequencies included with firmware and place user frequencies after them
 #Add_standard_frequencies: true
 
 # Default Frequency: used as default for "Read" and "Read Raw"
diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.c b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
index 989f97698..ed9864ae9 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_subghz.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
@@ -119,7 +119,7 @@ bool furi_hal_subghz_check_radio(void) {
     if((ver != 0) && (ver != 255)) {
         FURI_LOG_D(TAG, "Radio check ok");
     } else {
-        FURI_LOG_D(TAG, "Radio check failed");
+        FURI_LOG_D(TAG, "Radio check failed, revert to default");
 
         result = false;
     }
@@ -182,7 +182,7 @@ bool furi_hal_subghz_init_check(void) {
     if(result) {
         FURI_LOG_I(TAG, "Init OK");
     } else {
-        FURI_LOG_E(TAG, "Failed to initialization");
+        FURI_LOG_E(TAG, "Selected CC1101 module init failed, revert to default");
     }
     return result;
 }