diff --git a/CHANGELOG.md b/CHANGELOG.md index cc88cf116..2f710da29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ### New changes -* Plugins: Fixed MouseJacker GUI was displaying duckyscript is running before file is selected -* OFW: NFC fixes (DESFire -> info -> More bug fixed, Mifare classic user list will display message if has more than 100keys) -* OFW: Desktop: removing slideshow file when leaving slideshow view +* OFW PR: keeloq, new option for gen manufacture code & Update keeloq_mfcodes (KGB, Teco) (OFW PR 1748 by Skorpionm) +* FAAC, BFT keys not removed, new keeloq type changed to 6, FAAC is 5 +* Some minor gui fix in nfc #### **DFU files no longer included in releases to avoid issues with wrong manual installation of assets - use .tgz file with qFlipper, or install automatically via web updater or use microSD update package** diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c index 13e3af3eb..3d5ecca24 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_menu.c @@ -20,7 +20,7 @@ void nfc_scene_mf_ultralight_unlock_menu_on_enter(void* context) { scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMfUltralightUnlockMenu); submenu_add_item( submenu, - "Enter Password Manually", + "Enter PWD Manually", SubmenuIndexMfUlUnlockMenuManual, nfc_scene_mf_ultralight_unlock_menu_submenu_callback, nfc); diff --git a/assets/resources/subghz/assets/keeloq_mfcodes_user_example b/assets/resources/subghz/assets/keeloq_mfcodes_user_example index 0c75fd9c8..38fcf72a9 100644 --- a/assets/resources/subghz/assets/keeloq_mfcodes_user_example +++ b/assets/resources/subghz/assets/keeloq_mfcodes_user_example @@ -4,7 +4,7 @@ # for adding manufacture keys # AABBCCDDEEFFAABB:X:NAME\r\n # AABBCCDDEEFFAABB - man 64 bit -# X - encryption method 1 - Simple Learning, 2 - Normal_Learning, 3 - Secure_Learning, 4 - Magic_xor_type1 Learning +# X - encryption method 1 - Simple Learning, 2 - Normal_Learning, 3 - Secure_Learning, 4 - Magic_xor_type1 Learning, 5 - FAAC, 6 - Magic Serial typ1 # 0 - iterates over both previous and man in direct and reverse byte sequence # NAME - name (string without spaces) max 64 characters long Filetype: Flipper SubGhz Keystore File diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c index a45c4eb45..818edb7e6 100644 --- a/lib/subghz/protocols/keeloq.c +++ b/lib/subghz/protocols/keeloq.c @@ -353,7 +353,7 @@ bool subghz_protocol_encoder_keeloq_deserialize(void* context, FlipperFormat* fl seed_data[sizeof(uint32_t) - i - 1] = (instance->generic.seed >> i * 8) & 0xFF; } if(!flipper_format_read_hex(flipper_format, "Seed", seed_data, sizeof(uint32_t))) { - FURI_LOG_E(TAG, "ENCODER: Missing Seed"); + FURI_LOG_D(TAG, "ENCODER: Missing Seed"); } instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 | seed_data[3];