Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ul/dev' into mntm-dev --nobuild

Browse Source
This commit is contained in:
WillyJL
2026-01-25 21:43:35 +01:00
parent 72aa0372be bb9e6bd3ca
commit e512d6ca91
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -41,6 +41,7 @@
- NFC: - NFC:
- Fix sending 32+ byte ISO 15693-3 commands (by @WillyJL) - Fix sending 32+ byte ISO 15693-3 commands (by @WillyJL)
- UL: Fix LED not blinking at SLIX unlock (by @xMasterX) - UL: Fix LED not blinking at SLIX unlock (by @xMasterX)
- UL: UI: Some small changes (by @xMasterX)
### Removed: ### Removed:
- Sub-GHz: - Sub-GHz:

4
applications/main/nfc/helpers/protocol_support/felica/felica.c
View File

@@ -105,9 +105,7 @@ static void nfc_scene_read_success_on_enter_felica(NfcApp* instance) {
if(data->workflow_type == FelicaLite) { if(data->workflow_type == FelicaLite) {
bool all_unlocked = data->blocks_read == data->blocks_total; bool all_unlocked = data->blocks_read == data->blocks_total;
furi_string_cat_printf( furi_string_cat_printf(
temp_str, temp_str, "\e#%s\n", all_unlocked ? "All Blocks Unlocked" : "Some Blocks Locked");
"\e#%s\n",
all_unlocked ? "All Blocks Are Unlocked" : "Some Blocks Are Locked");
nfc_render_felica_idm(data, NfcProtocolFormatTypeShort, temp_str); nfc_render_felica_idm(data, NfcProtocolFormatTypeShort, temp_str);
uint8_t* ck_data = instance->felica_auth->card_key.data; uint8_t* ck_data = instance->felica_auth->card_key.data;
furi_string_cat_printf(temp_str, "Key:"); furi_string_cat_printf(temp_str, "Key:");

2
applications/main/nfc/scenes/nfc_scene_slix_unlock.c
View File

@@ -35,7 +35,7 @@ void nfc_scene_slix_unlock_on_enter(void* context) {
instance->popup, "Hold card next\nto Flipper's back", 94, 27, AlignCenter, AlignTop); instance->popup, "Hold card next\nto Flipper's back", 94, 27, AlignCenter, AlignTop);
view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup); view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);
notification_message(instance->notifications, &sequence_blink_start_cyan); notification_message(instance->notifications, &sequence_blink_start_yellow);
instance->poller = nfc_poller_alloc(instance->nfc, NfcProtocolSlix); instance->poller = nfc_poller_alloc(instance->nfc, NfcProtocolSlix);
nfc_poller_start(instance->poller, nfc_scene_slix_unlock_worker_callback, instance); nfc_poller_start(instance->poller, nfc_scene_slix_unlock_worker_callback, instance);

2
documentation/SubGHzSupportedSystems.md
View File

@@ -125,7 +125,7 @@ The following manufacturers have KeeLoq support in Unleashed firmware:
- Nice Smilo - `433.92MHz` `AM650` (KeeLoq, 64 bits) (8bit serial part in Hop - simple learning) - Nice Smilo - `433.92MHz` `AM650` (KeeLoq, 64 bits) (8bit serial part in Hop - simple learning)
- Normstahl - `433.92MHz` `AM650` (KeeLoq, 64 bits) - Normstahl - `433.92MHz` `AM650` (KeeLoq, 64 bits)
- Novoferm - `433.92MHz` `AM650` (KeeLoq, 64 bits) - Novoferm - `433.92MHz` `AM650` (KeeLoq, 64 bits)
- Sommer `434.42MHz, 868.80MHz` `FSK12K (or FSK476)` (KeeLoq, 64 bits) (normal learning) (TX03-868-4, Pearl, and maybe other models are supported (SOMloq2)) - Sommer `434.42MHz, 868.80MHz` `FSK12K (or FSK476)` (KeeLoq, 64 bits) (normal learning) (TX03-868-4, Pearl, and maybe other models are supported (SOMloq))
- Steelmate - `433.92MHz` `AM650` (KeeLoq, 64 bits) (12bit serial part in Hop - normal learning) - Steelmate - `433.92MHz` `AM650` (KeeLoq, 64 bits) (12bit serial part in Hop - normal learning)
- Stilmatic - `433.92MHz` `AM650` (KeeLoq, 64 bits) (normal learning) - Stilmatic - `433.92MHz` `AM650` (KeeLoq, 64 bits) (normal learning)