Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-09 05:49:09 -07:00
Code Issues Packages Projects Releases Wiki Activity
10,670 Commits 12 Branches 12 Tags
4eaad9fd5613a999a106a86232e068145e386f9a
Commit Graph

10670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Willy-JL
4eaad9fd56 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-08 13:32:25 +00:00
Willy-JL
fe3f0c08e2 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-08 13:29:47 +00:00
MX
ee9092c8e5 Merge branch 'nfc-parsers' into dev 2023-12-08 00:18:23 +03:00
Methodius
2e7bb26eef Merge branch 'dev' into nfc-parsers 2023-12-07 22:22:29 +09:00
Methodius
5d28939c28 social_moscow parser verification collisions fix 2023-12-07 21:59:27 +09:00
MX
15a29e1483 format 2023-12-07 08:21:32 +03:00
MX
c22b3b57bd Merge branch 'nfc-parsers' into dev 2023-12-07 08:03:43 +03:00
MX
1daa2fa377 Merge branch 'ofw_dev' into dev 2023-12-07 08:03:18 +03:00
Methodius
1b45b8a17d Kazan parser: adult social tariff added 2023-12-06 18:25:47 +09:00
Methodius
e94beff204 Kazan parser: basic tariffs parsing added 2023-12-06 18:08:20 +09:00
gornekich
82baf1e923 [FL-3701] NFC fixes (#3264) 
* nfc app: fix unlock with manual password crash
* nfc app: preserve card detected state
* nfc app: fix mf keys scene switch
* nfc app: fix multiple protocol tag detect notification
* nfc plugin: fix retrun in function body in aime parser
* iso14443-3b poller: rework ATTRIB response check
* nfc app: fix navigation after file load failur
* iso14443-3b poller: fix PVS warning
* mfc listener: add crutch in mfc emulation
 2023-12-05 22:40:06 +09:00
Willy-JL
d8b43ffc6b Format --nobuild 2023-12-05 08:56:24 +00:00
Willy-JL
399f35dc8a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-05 08:53:38 +00:00
Willy-JL
fd5fc5338e Experimental PCAP on main USART support --nobuild 2023-12-05 08:50:31 +00:00
MX
c416041379 Fix secplus v1 key display issue 2023-12-05 03:40:12 +03:00
MX
10444b943e Fix keeloq decode logic 2023-12-05 03:34:31 +03:00
MMX
2308a54ada Merge pull request #662 from noproto/dev 
Add Saflok and MyKey KDFs
 2023-12-05 03:33:37 +03:00
MMX
0ed6738a5b Merge pull request #660 from hnlcory/dev 
Add keys to mf_classic_dict.nfc
 2023-12-05 03:33:03 +03:00
WillyJL
524eb45482 Update mf_classic_dict.nfc - Bubble Land Play Card MF keys (#477) --nobuild 2023-12-04 23:04:35 +00:00
noproto
dc25bfb831 Add Saflok and MyKey KDFs 2023-12-04 16:03:32 -05:00
CaitSith2
41bfa2979c Update mf_classic_dict.nfc 
Add keys for Bubble Land Play Card
 2023-12-04 11:01:00 -08:00
Willy-JL
1726ad4b94 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev 2023-12-04 17:48:40 +00:00
WillyJL
82d157ceb1 Add Saflok and MyKey KDFs (#476) 2023-12-04 17:44:12 +00:00
Willy-JL
4c401cacc4 Format 2023-12-04 17:34:09 +00:00
Willy-JL
26f9476ce3 Revert "Added mykey (#467)" 
This reverts commit 3ae1eee4c8, reversing
changes made to 4f8e80b0a4.
 2023-12-04 17:30:47 +00:00
noproto
c3e52ad4bd Add Saflok and MyKey KDFs 2023-12-04 12:07:58 -05:00
MX
d6fcb04aa8 Merge branch 'ofw_dev' into dev 2023-12-03 18:42:11 +03:00
MX
9bf8f1015d fix keeloq null pointer if unknown 2023-12-03 18:41:28 +03:00
Honghao Zeng
c477d1321a nfc: m1k-based Aime (non-AIC) card support (#3241) 
Co-authored-by: gornekich <n.gorbadey@gmail.com>
 2023-12-03 20:00:46 +09:00
MX
ec99b70b38 upd changelog 2023-12-02 23:55:05 +03:00
MX
06a58ebd53 Merge branch 'ofw_dev' into dev [ci skip] 2023-12-02 23:19:43 +03:00
Skorpionm
eb6fe0a4db SubGhz: fix count bit for detect gate_tx protocol (#3253) 
Co-authored-by: あく <alleteam@gmail.com>
 2023-12-02 16:34:02 +09:00
pborsutzki
c6a14e1a67 Fixed a zero allocation error when reading an iso15693 nfc tag with no additional blocks. (#3229) 
Co-authored-by: gornekich <n.gorbadey@gmail.com>
 2023-12-02 16:27:58 +09:00
Willy-JL
d034d72f7b Fix some subghz playlist memory leaks 2023-12-02 06:49:24 +00:00
Willy-JL
0702188504 Format 2023-12-02 06:33:02 +00:00
Willy-JL
0a55300926 Fix xtreme lib import 2023-12-02 06:32:04 +00:00
Willy-JL
f4d58c286b Fix mbedtls api leaks 2023-12-02 06:30:37 +00:00
Willy-JL
93994af815 Fix submodule merge 2023-12-02 06:29:38 +00:00
Willy-JL
4bb0984b46 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev 2023-12-02 06:10:19 +00:00
Willy-JL
05ae0dbf14 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-02 06:09:01 +00:00
Willy-JL
2c6e217887 Update apps 2023-12-02 05:47:49 +00:00
Astra
04cead1fc5 [FL-3620] Add the "remove pairing" button to BLE hid (#3237) 
Co-authored-by: あく <alleteam@gmail.com>
 2023-12-02 14:03:10 +09:00
Astra
93732865ac [FL-3132] HID app: Add new function key icons (#3236) 
* Add new function key icons
* Fix graphical glitches on the buttons

Co-authored-by: あく <alleteam@gmail.com>
 2023-12-02 13:52:04 +09:00
RebornedBrain
6a5d63803a [FL-3675] Ntag21x write (#3246) 
* New scenes for ultralight poller write mode
* Added new button and transition logic for write operation
   For now write is only possible for NTAG21x cards with default password and no AUTHLIM set
* Poller states extended
* Enums and datatypes extended for new poller mode
* Added mode field to poller instance datatype
* New states for poller added in order to implement write mode
* Added new event type for locked cards in order to simplify state flow
* New logic for poller write commands
* Scenes adjustments
* Scenes renamed
* New field added to poller instance
* Now we write in 'page per call' mode
* Now function takes callback return value into account
* Callback will be called only in write mode
* Event type added
* Log adjusted and start page to write set
* Logs added and check in now false at start, then it moves to true
* Now mf_ultralight_poller_handler_request_write_data halts card in case of check failure and stops poller
* All fail events now returns NfcCommandStop callback
* In case of fail we move back properly
* Remove garbage

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
 2023-12-02 13:45:47 +09:00
Willy-JL
d61873570d Move apps module first for vscode detection --nobuild 2023-12-02 02:07:46 +00:00
Willy-JL
9bbdaf8cb2 Revert "Default to AM_Q (maybe idk, subghz code is a mess) --nobuild" 
This reverts commit 24b994102d.
 2023-12-02 01:51:30 +00:00
Willy-JL
715db83e02 Revert fake AM_Q haisenteck fraud (#472) --nobuild 
This reverts commit a188d8ecda.
 2023-12-02 01:47:15 +00:00
Willy-JL
24b994102d Default to AM_Q (maybe idk, subghz code is a mess) --nobuild 2023-12-01 23:46:06 +00:00
Willy-JL
e2df487c63 Option to disable poweroff while locked --nobuild 2023-12-01 23:02:23 +00:00
Sil333033
d16ac1f73d Merge #472 --nobuild 2023-12-01 20:57:02 +01:00