Commit Graph

7878 Commits

Author SHA1 Message Date
MX e87356af72 Merge remote-tracking branch 'OFW/portasynthinca3/3922-gpio-crash' into dev [ci skip] 2024-10-28 23:20:13 +03:00
MX e7b64c843c upd manifest 2024-10-28 22:50:07 +03:00
MX 3d52187aa9 ndef parser updates
by luu176 and Willy-JL
2024-10-28 22:45:02 +03:00
MX e630f44afd merge p2 2024-10-28 22:22:21 +03:00
MX 6b6d98da2a merge js changes
changes by Willy-JL
spi module by jamisonderek
2024-10-28 22:21:42 +03:00
noproto 6dbb46a81d Fix issue with resume logic 2024-10-25 18:38:11 -04:00
MX e7239f6e8b Merge remote-tracking branch 'noproto/nestednonces' into dev 2024-10-26 01:37:44 +03:00
Anna Antonenko 91fcddc205 Merge branch 'dev' into portasynthinca3/3922-gpio-crash 2024-10-24 12:56:54 +03:00
Anna Antonenko d0214c7b27 fix: incorrect usage of mjs_own 2024-10-23 20:07:03 +03:00
noproto bf7b91f45f Fix typo 2024-10-23 05:21:43 -04:00
MX cf0a6ae2d0 Merge remote-tracking branch noproto-nestednonces into dev 2024-10-22 17:10:08 +03:00
Nathan N 47637621a7 Merge branch 'dev' into nestednonces 2024-10-22 09:52:25 -04:00
noproto 92aa70ba9d Larger data type for 4K support 2024-10-22 09:54:46 -04:00
MX 3374ed1dad upd changelog 2024-10-22 03:49:34 +03:00
MX b0e591601c upd ndef parser
by jaylikesbunda and Willy-JL
2024-10-22 02:37:04 +03:00
MX fc16978be5 Merge remote-tracking branch 'OFW/dev' into dev [ci skip] 2024-10-22 02:28:24 +03:00
Zinong Li f8fa71c575 NFC TRT Parser: Additional checks to prevent false positives (#3966)
* additional checks to prevent false positives
* Update trt.c

Co-authored-by: あく <alleteam@gmail.com>
2024-10-20 16:58:33 +01:00
Ruslan Nadyrshin 1822221c69 Minor change in the dev docs (#3962)
- The main page title of the Dev docs has been changed

Co-authored-by: あく <alleteam@gmail.com>
2024-10-20 16:40:20 +01:00
Kris Bahnsen ea2757908b lib: digital_signal: digital_sequence: add furi_hal.h wrapped in ifdefs (#3964)
Per the comment at the top of the file, defining DIGITAL_SIGNAL_DEBUG_OUTPUT_PIN
to be a GpioPin variable name should allow additional debug output on
that pin. However, this would not work without modifying the file as
well to add the furi_hal.h header. Wrap including that header in the
same macro define to automatically include it when used.

Fixes: d92b0a82cc ("NFC refactoring (#3050)")

Signed-off-by: Kris Bahnsen <Kris@KBEmbedded.com>
Co-authored-by: hedger <hedger@users.noreply.github.com>
2024-10-20 16:31:40 +01:00
MX 75625ffd5e merge mjs 2024-10-20 16:02:15 +03:00
MX 48acd9f075 merge examples 2024-10-20 16:01:21 +03:00
MX 8c960a990c merge js upds
by jamisonderek & Willy-JL
2024-10-20 16:00:10 +03:00
MX 2441643ac6 subghz monarch add manually 2024-10-19 15:40:35 +03:00
MX 8cdb5619f5 keeloq add key 2024-10-19 15:19:57 +03:00
MX 0b7f174162 fix icon 2024-10-19 12:33:57 +03:00
MX 8ed1dc2289 merge p3 2024-10-18 20:23:05 +03:00
MX fe3228b63e merge p2 2024-10-18 20:22:21 +03:00
MX bc73b13b1b merge js stuff
https://github.com/Next-Flip/Momentum-Firmware/commits/js-backport-of-backport/
2024-10-18 20:21:09 +03:00
MX 3ba530555d Merge remote-tracking branch 'noproto/nestednonces' into dev 2024-10-18 14:30:43 +03:00
MX 37f76374a2 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-18 14:30:37 +03:00
noproto db26c85b23 Backdoor known key logic still needs the current key 2024-10-18 00:46:24 -04:00
noproto 897817a829 Fix inconsistent assignment of known key and known key type/sector 2024-10-18 00:33:49 -04:00
Nathan N 2be0cfb04b Merge branch 'dev' into nestednonces 2024-10-17 19:16:17 -04:00
noproto 1101748a21 Merge branch 'nestednonces' of https://github.com/noproto/flipperzero-firmware into nestednonces 2024-10-17 19:17:39 -04:00
noproto 4be9e79342 Fix multiple crashes and state machine logic 2024-10-17 19:16:30 -04:00
porta b723d463af Revert "[FL-3909] CLI improvements, part I (#3928)" (#3955)
This reverts commit 0f831412fa.

Co-authored-by: あく <alleteam@gmail.com>
2024-10-17 17:12:27 +01:00
Ivan Barsukov ca68c953c0 Add warning about stealth mode in vibro CLI (#3957) 2024-10-17 16:57:10 +01:00
MX e2d0a86d3e merge js stuff
by Willy-JL
2024-10-17 17:06:51 +03:00
MX f305f6efa9 upd changelog 2024-10-17 13:26:20 +03:00
MMX c4d997084a Merge pull request #826 from mishamyte/bug/incorrect-ul-read
Fixed bug with UL reading
2024-10-17 13:25:42 +03:00
Mykhailo Shevchuk c39edce7c6 Fixed bug with UL reading 2024-10-17 01:41:27 +03:00
あく 2bc02c0962 Merge branch 'dev' into nestednonces 2024-10-16 18:07:13 +01:00
MX 9c20bdc287 upd changelog 2024-10-16 19:55:25 +03:00
MMX d72fad45e0 Merge pull request #825 from mishamyte/fix-read-pwd-protected-ul
Read Ultralight block by block
2024-10-16 19:48:04 +03:00
MX 5434405c34 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 19:46:06 +03:00
MX 4e5abdadff fix cli breaking web flipper lab, remove color tags 2024-10-16 19:35:52 +03:00
Zinong Li 1dd7ebd059 NFC Parser for Tianjin Railway Transit (#3954) 2024-10-16 16:38:07 +01:00
MX 1df18417fa upd changelog 2024-10-16 18:23:54 +03:00
MX 8d2476733e Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 18:21:22 +03:00
porta c2c288b9ad [FL-3916] Require PIN on boot (#3952)
Co-authored-by: hedger <hedger@users.noreply.github.com>
2024-10-16 16:12:58 +01:00