Commit 5858415
committed
Merge branch 'dev' into kiisu-mntm
Merging latest dev branch changes into kiisu-mntm.
Major changes merged from dev:
- NFC: ISO 15693-3 emulation READ_MULTI and GET_BLOCK_SECURITY fixes (Next-Flip#501)
- NFC: Fix sending 32+ byte ISO 15693-3 commands
- Archive: Support opening and pinning ProtoPirate files from Archive (Next-Flip#510)
- Apps: Add ISO 15693-3 NFC Writer (by ch4istO)
- SubGHz: Major protocol updates including:
* Added AES common module for encryption
* Added Beninca ARC protocol
* Added Treadmill37 protocol
* Removed Kia, Scher Khan, and Star Line protocols
* Updated many existing protocols with AES support
- Unit test resource updates and improvements
- Documentation updates for SubGHz settings and supported systems
This brings kiisu-mntm up to date with dev (c176524) while preserving all kiisu-mntm-specific changes.File tree
121 files changed
+2878
-2419
lines changed- applications
- debug/unit_tests
- resources/unit_tests
- subghz
- tests/subghz
- drivers/subghz/cc1101_ext
- examples/example_event_loop
- main
- archive
- helpers
- scenes
- views
- nfc
- helpers/protocol_support
- felica
- type_4_tag
- scenes
- subghz
- helpers
- resources/subghz/assets
- scenes
- system
- findmy
- js_app/modules/js_subghz
- assets/icons/Archive
- documentation
- file_formats
- lib
- digital_signal/presets/nfc
- mjs
- nfc/protocols
- iso15693_3
- type_4_tag
- subghz
- blocks
- devices
- cc1101_int
- protocols
- targets/f7
- furi_hal
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
121 files changed
+2878
-2419
lines changedLarge diffs are not rendered by default.
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
| |||
44 | 43 | | |
45 | 44 | | |
46 | 45 | | |
47 | | - | |
48 | 46 | | |
49 | 47 | | |
50 | 48 | | |
| |||
64 | 62 | | |
65 | 63 | | |
66 | 64 | | |
67 | | - | |
68 | 65 | | |
69 | 66 | | |
70 | 67 | | |
| |||
Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 0 additions & 22 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
425 | 425 | | |
426 | 426 | | |
427 | 427 | | |
428 | | - | |
429 | | - | |
430 | | - | |
431 | | - | |
432 | | - | |
433 | | - | |
434 | | - | |
435 | 428 | | |
436 | 429 | | |
437 | 430 | | |
| |||
467 | 460 | | |
468 | 461 | | |
469 | 462 | | |
470 | | - | |
471 | | - | |
472 | | - | |
473 | | - | |
474 | | - | |
475 | | - | |
476 | | - | |
477 | | - | |
478 | 463 | | |
479 | 464 | | |
480 | 465 | | |
| |||
489 | 474 | | |
490 | 475 | | |
491 | 476 | | |
492 | | - | |
493 | | - | |
494 | | - | |
495 | | - | |
496 | | - | |
497 | | - | |
498 | | - | |
499 | 477 | | |
500 | 478 | | |
501 | 479 | | |
| |||
984 | 962 | | |
985 | 963 | | |
986 | 964 | | |
987 | | - | |
988 | 965 | | |
989 | 966 | | |
990 | 967 | | |
991 | 968 | | |
992 | 969 | | |
993 | | - | |
994 | 970 | | |
995 | 971 | | |
996 | | - | |
997 | 972 | | |
998 | 973 | | |
999 | 974 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
46 | 50 | | |
47 | 51 | | |
48 | 52 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| |||
0 commit comments