Commit Graph

2967 Commits

Author SHA1 Message Date
Willy-JL
4b8b27954b Merge remote-tracking branch 'ul/dev' into mntm-dev 2024-10-29 02:15:59 +00:00
MX
ed57ddb14b NFC: Plaintain parser fix
by mxcdoam
https://github.com/flipperdevices/flipperzero-firmware/pull/3975/files
2024-10-29 02:28:33 +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
Willy-JL
2788ae14a6 Fix typo 2024-10-27 03:59:39 +00:00
Willy-JL
ef2dd08b71 NFC: NDEF parser less RAM waste for contact vcards 2024-10-27 03:57:19 +00:00
WillyJL
a50ae0a604 NFC: NDEF Parser SLIX support (#278)
* Simpler protocol check

* Simplify header code

* Minor code fixes

* NFC: NDEF Parser SLIX support

* Parse success even without TLV terminator

* Also parse empty NDEF TLVs

* Add NDEF_PROTO_RAW to feed data manually

* Update changelog

* Ordering

* Comment changes

* Fix inefficiency in MAD checking
2024-10-26 03:48:33 +02:00
Willy-JL
7cc71b390f Merge remote-tracking branch 'xero/dev' into mntm-dev 2024-10-26 01:45:01 +01: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
WillyJL
e1fdc5e984 NFC: NDEF SmartPoster support (#275)
* NFC: NDEF SmartPoster support

* Consistent naming

* Nicer result output

* Update changelog
2024-10-25 04:20:53 +02:00
Luu
8174ffa5b3 NFC: NDEF parser Mifare Classic support, protocol-agnostic refactor and more improvements (#265)
* Update ndef.c

included mifare classic support

* Update application.fam

* Update ndef.c

* Update ndef.c

* Update ndef.c

* Update ndef.c

* Update ndef.c for better parsing

Because mifare classic 1k has a sector trailer, the ndef parser might conflict with it if the payload is long enough or if there's too many payloads. This code removes all sector trailer in a new buffer and uses that for parsing without any problems.

* Rewrite NDEF as protocol agnostic

* Move type name buffer to stack when possible

* Parse URI without heap buffer

* Reduce binary sizes by using preprocessor defines

* Parse MFC without clone buffer and support MAD2

* Keep message count between different TLVs

* Simplify macro check

* Simplify length conversion

* Improve output of unparsed types

* Add some more logging

* Fix WiFi parsing

* Check MAD key before reading

* Rename ndef_read() to ndef_get()

* Update changelog

* Wording

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
2024-10-24 07:55:47 +02:00
Nathan N
47637621a7 Merge branch 'dev' into nestednonces 2024-10-22 09:52:25 -04:00
Willy-JL
ffd1ceaab4 Merge remote-tracking branch 'ul/dev' into mntm-dev 2024-10-22 03:37:49 +01:00
Willy-JL
0afbbf2e61 Merge remote-tracking branch 'ofw/dev' into mntm-dev 2024-10-22 03:33:47 +01: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
jay candel
7ebbadfbf8 NFC: Improve URI decoding in NDEF parser (#267)
* add decode_char

* Skip double malloc(), can just tell printf() how long the string is

* Decode URI within the same buffer

* Only decode if next 2 chars are valid hex

* Update changelog

* Clearer code for hex decode

Co-authored-by: jaylikesbunda <jaylikesbunda@users.noreply.github.com>

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Co-authored-by: jaylikesbunda <jaylikesbunda@users.noreply.github.com>
2024-10-20 07:28:10 +02:00
jay candel
3e17d6588a IR: Update universal bluray remote (#264)
* update universal bluray remote

* Add files via upload

* 2 new of each button

* Update changelog

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
2024-10-20 07:27:48 +02: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
Willy-JL
9865a9367f IR: Basic script to remove dupes
had this lying around from last week PRs and could come useful again,
code is meh but works
2024-10-19 01:43:45 +01:00
MX
37f76374a2 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-18 14:30:37 +03:00
Willy-JL
ba74e953c4 JS: C define to move JS runner to flash (still external for now) 2024-10-18 02:56:06 +01:00
Nathan N
2be0cfb04b Merge branch 'dev' into nestednonces 2024-10-17 19:16:17 -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
Willy-JL
b4c035d933 Merge remote-tracking branch 'ofw/dev' into js-backport-of-backport 2024-10-16 18:26:38 +01:00
あく
2bc02c0962 Merge branch 'dev' into nestednonces 2024-10-16 18:07:13 +01:00
MX
5434405c34 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 19:46:06 +03:00
Zinong Li
1dd7ebd059 NFC Parser for Tianjin Railway Transit (#3954) 2024-10-16 16:38:07 +01:00
Willy-JL
2f6faa1b7b Merge remote-tracking branch 'ul/dev' into mntm-dev 2024-10-16 00:56:19 +01:00
Willy-JL
97d58c500f Merge remote-tracking branch 'ofw/dev' into mntm-dev 2024-10-15 23:49:41 +01:00
Willy-JL
88dfe97a89 Merge remote-tracking branch 'ofw/dev' into mntm-dev 2024-10-15 23:43:33 +01:00
MX
7415873449 add new nfc key [ci skip] 2024-10-16 01:30:19 +03:00
MX
7de26fb99b Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 01:06:19 +03:00
Kowalski Dragon
c917135c94 [BadUSB] Improve ChromeOS and GNOME demo scripts (#3948)
* [BadUSB] Gnome Demo: Support most terminals and force sh shell when not using Bash as default
* [BadUSB] ChromeOS Demo: Minor improvements, such as exit overview, select omnibox and add a page title

Signed-off-by: Kowalski Dragon (kowalski7cc) <5065094+kowalski7cc@users.noreply.github.com>
Co-authored-by: Kowalski Dragon (kowalski7cc) <5065094+kowalski7cc@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:23:49 +01:00
Zinong Li
dc9548d0dc New Static Keys for Mifare Classic Dictionary (#3947)
Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:17:33 +01:00
Astra
a34e09094b [FL-3914] BackUSB (#3951)
* Revert "[FL-3896] Split BadUSB into BadUSB and BadBLE (#3931)"
  This reverts commit 0eaad8bf64.
* Better USB-BLE switch UX
* Format sources
* Format images

Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:11:41 +01:00
MX
4b9b1769f7 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-15 00:08:47 +03:00
あく
02f7c6b421 Merge branch 'dev' into nestednonces 2024-10-14 21:06:56 +01:00
Zinong Li
fbc3b494b7 NFC: H World Hotel Chain Room Key Parser (#3946)
* quick and easy implementation
* delete debug artifacts
* log level correction (warning -> info)
2024-10-14 21:05:24 +01:00
Nathan N
f530eeed47 Merge branch 'dev' into nestednonces 2024-10-14 12:08:36 -04:00
MX
e3f393e505 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-14 18:00:10 +03:00
porta
0f831412fa [FL-3909] CLI improvements, part I (#3928)
* fix: cli top blinking
* feat: clear prompt on down key
* feat: proper-er ansi escape sequence handling
* ci: fix compact build error
* Make PVS happy
* style: remove magic numbers
* style: review suggestions

Co-authored-by: あく <alleteam@gmail.com>
2024-10-14 15:50:18 +01:00
Willy-JL
806fd93b38 Merge branch 'nestednonces' into mntm-dev 2024-10-13 01:01:01 +01:00
sommermorgentraum
2f22fad58b Infrared: Add option to "Load from Library File" for Universal Remotes (#255)
* init

* comments

* remove trash

* remove code that mistakenly added from merging conflicts

* remove code that mistakenly added from merging conflicts

* format

* remove header that added during debugging

* ecit name

* Revert some whitespace changes to avoid future conflicts

* get_button_count()

* Use same index values

* Use common functions where possible

* Unroll long if into guard check

* Fix furi check failed due to inflated button index

* Show "assets" folders

* Load DB file only once and show loading animation

* Add bool for auto_detect_buttons

* Show error when tryingto load remote file as universal library

* Remove unnecessary includes

* Fix inputs

* more_devices -> from_file

* Consistency

* Remember last selected library file

* Update changelog

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
2024-10-12 02:08:20 +01:00
MX
38889a434c Merge remote-tracking branch 'noproto/nestednonces' into dev 2024-10-11 21:13:50 +03:00
Nathan N
540478855c Merge branch 'dev' into nestednonces 2024-10-11 10:00:44 -04:00
noproto
a7c0819034 Refactor enums to avoid redefinition 2024-10-11 10:01:30 -04:00