Merge nfc_magic from https://github.com/flipperdevices/flipperzero-good-faps

nfc_magic/.catalog/changelog.md

@@ -1,3 +1,10 @@
+## 1.4 
+
+ - Auth with password option moved into new submenu "Gen4 actions"
+ - New function: Get gen4 card revision
+ - New function: Get gen4 card config (shows only when debug ON)
+ - New function: Set default config: for 06 A0 gen4 cards "revival". This revision of the cards may "fall into a coma" when interacting with it. In this state, she does not respond to any commands. This problem is solved by writing a standard config to the card
+
 ## 1.3
  - Fix incorrect gen4 password usage
 

nfc_magic/scenes/nfc_magic_scene_gen4_actions_menu.c

@@ -4,8 +4,8 @@
 enum SubmenuIndex {
     SubmenuIndexAuthenticate,
     SubmenuIndexSetStandartConfig,
-    SubmenuIndexGetRevision,
-    SubmenuIndexGetConfig
+    SubmenuIndexGetConfig,
+    SubmenuIndexGetRevision
 };
 
 void nfc_magic_scene_gen4_actions_menu_submenu_callback(void* context, uint32_t index) {
@@ -26,14 +26,14 @@ void nfc_magic_scene_gen4_actions_menu_on_enter(void* context) {
         instance);
     submenu_add_item(
         submenu,
-        "Set Standart Config",
-        SubmenuIndexSetStandartConfig,
+        "Get Revision",
+        SubmenuIndexGetRevision,
         nfc_magic_scene_gen4_actions_menu_submenu_callback,
         instance);
     submenu_add_item(
         submenu,
-        "Get Revision",
-        SubmenuIndexGetRevision,
+        "Set Standart Config",
+        SubmenuIndexSetStandartConfig,
         nfc_magic_scene_gen4_actions_menu_submenu_callback,
         instance);
     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
@@ -62,12 +62,12 @@ bool nfc_magic_scene_gen4_actions_menu_on_event(void* context, SceneManagerEvent
         } else if(event.event == SubmenuIndexSetStandartConfig) {
             scene_manager_next_scene(instance->scene_manager, NfcMagicSceneGen4SetCFG);
             consumed = true;
-        } else if(event.event == SubmenuIndexGetRevision) {
-            scene_manager_next_scene(instance->scene_manager, NfcMagicSceneGen4Revision);
-            consumed = true;
         } else if(event.event == SubmenuIndexGetConfig) {
             scene_manager_next_scene(instance->scene_manager, NfcMagicSceneGen4GetCFG);
             consumed = true;
+        } else if(event.event == SubmenuIndexGetRevision) {
+            scene_manager_next_scene(instance->scene_manager, NfcMagicSceneGen4Revision);
+            consumed = true;
         }
         scene_manager_set_scene_state(
             instance->scene_manager, NfcMagicSceneGen4ActionsMenu, event.event);