Skip to content

Commit 5858415

Browse files
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.
2 parents 19e4a4a + c176524 commit 5858415

File tree

121 files changed

+2878
-2419
lines changed

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 changed

CHANGELOG.md

Lines changed: 41 additions & 192 deletions
Large diffs are not rendered by default.

applications/debug/unit_tests/resources/unit_tests/Manifest_test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ F:0156915c656d8c038c6d555d34349a36:6877:subghz/came_atomo_raw.sub
2424
F:111a8b796661f3cbd6f49f756cf91107:8614:subghz/came_raw.sub
2525
F:2101b0a5a72c87f9dce77223b2885aa7:162:subghz/came_twee.sub
2626
F:c608b78b8e4646eeb94db37644623254:10924:subghz/came_twee_raw.sub
27-
F:c4a55acddb68fc3111d592c9292022a8:21703:subghz/cenmax_raw.sub
2827
F:51d6bd600345954b9c84a5bc6e999313:159:subghz/clemsa.sub
2928
F:14fa0d5931a32674bfb2ddf288f3842b:21499:subghz/clemsa_raw.sub
3029
F:f38b6dfa0920199200887b2cd5c0a385:161:subghz/doitrand.sub
@@ -44,7 +43,6 @@ F:20bba4b0aec006ced7e82513f9459e31:15532:subghz/hormann_hsm_raw.sub
4443
F:3392f2db6aa7777e937db619b86203bb:10637:subghz/ido_117_111_raw.sub
4544
F:cc5c7968527cc233ef11a08986e31bf2:167:subghz/intertechno_v3.sub
4645
F:70bceb941739260ab9f6162cfdeb0347:18211:subghz/intertechno_v3_raw.sub
47-
F:bc9a4622f3e22fd7f82eb3f26e61f59b:44952:subghz/kia_seed_raw.sub
4846
F:6b6e95fc70ea481dc6184d291466d16a:159:subghz/linear.sub
4947
F:77aaa9005db54c0357451ced081857b2:14619:subghz/linear_raw.sub
5048
F:1a618e21e6ffa9984d465012e704c450:161:subghz/magellan.sub
@@ -64,7 +62,6 @@ F:2b1192e4898aaf274caebbb493b9f96e:164:subghz/power_smart.sub
6462
F:8b8195cab1d9022fe38e802383fb923a:3648:subghz/power_smart_raw.sub
6563
F:1ccf1289533e0486a1d010d934ad7b06:170:subghz/princeton.sub
6664
F:8bccc506a61705ec429aecb879e5d7ce:7344:subghz/princeton_raw.sub
67-
F:0bda91d783e464165190c3b3d16666a7:38724:subghz/scher_khan_magic_code.sub
6865
F:116d7e1a532a0c9e00ffeee105f7138b:166:subghz/security_pls_1_0.sub
6966
F:441fc7fc6fa11ce0068fde3f6145177b:69413:subghz/security_pls_1_0_raw.sub
7067
F:e5e33c24c5e55f592ca892b5aa8fa31f:208:subghz/security_pls_2_0.sub

applications/debug/unit_tests/resources/unit_tests/subghz/cenmax_raw.sub

Lines changed: 0 additions & 15 deletions
This file was deleted.

applications/debug/unit_tests/resources/unit_tests/subghz/kia_seed_raw.sub

Lines changed: 0 additions & 25 deletions
This file was deleted.

applications/debug/unit_tests/resources/unit_tests/subghz/scher_khan_magic_code.sub

Lines changed: 0 additions & 22 deletions
This file was deleted.

applications/debug/unit_tests/tests/subghz/subghz_test.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -425,13 +425,6 @@ MU_TEST(subghz_decoder_keeloq_test) {
425425
"Test decoder " SUBGHZ_PROTOCOL_KEELOQ_NAME " error\r\n");
426426
}
427427

428-
MU_TEST(subghz_decoder_kia_seed_test) {
429-
mu_assert(
430-
subghz_decoder_test(
431-
EXT_PATH("unit_tests/subghz/kia_seed_raw.sub"), SUBGHZ_PROTOCOL_KIA_NAME),
432-
"Test decoder " SUBGHZ_PROTOCOL_KIA_NAME " error\r\n");
433-
}
434-
435428
MU_TEST(subghz_decoder_nero_radio_test) {
436429
mu_assert(
437430
subghz_decoder_test(
@@ -467,14 +460,6 @@ MU_TEST(subghz_decoder_princeton_test) {
467460
"Test decoder " SUBGHZ_PROTOCOL_PRINCETON_NAME " error\r\n");
468461
}
469462

470-
MU_TEST(subghz_decoder_scher_khan_magic_code_test) {
471-
mu_assert(
472-
subghz_decoder_test(
473-
EXT_PATH("unit_tests/subghz/scher_khan_magic_code.sub"),
474-
SUBGHZ_PROTOCOL_SCHER_KHAN_NAME),
475-
"Test decoder " SUBGHZ_PROTOCOL_SCHER_KHAN_NAME " error\r\n");
476-
}
477-
478463
MU_TEST(subghz_decoder_somfy_keytis_test) {
479464
mu_assert(
480465
subghz_decoder_test(
@@ -489,13 +474,6 @@ MU_TEST(subghz_decoder_somfy_telis_test) {
489474
"Test decoder " SUBGHZ_PROTOCOL_SOMFY_TELIS_NAME " error\r\n");
490475
}
491476

492-
MU_TEST(subghz_decoder_star_line_test) {
493-
mu_assert(
494-
subghz_decoder_test(
495-
EXT_PATH("unit_tests/subghz/cenmax_raw.sub"), SUBGHZ_PROTOCOL_STAR_LINE_NAME),
496-
"Test decoder " SUBGHZ_PROTOCOL_STAR_LINE_NAME " error\r\n");
497-
}
498-
499477
MU_TEST(subghz_decoder_linear_test) {
500478
mu_assert(
501479
subghz_decoder_test(
@@ -984,16 +962,13 @@ MU_TEST_SUITE(subghz) {
984962
MU_RUN_TEST(subghz_decoder_hormann_hsm_test);
985963
MU_RUN_TEST(subghz_decoder_ido_test);
986964
MU_RUN_TEST(subghz_decoder_keeloq_test);
987-
MU_RUN_TEST(subghz_decoder_kia_seed_test);
988965
MU_RUN_TEST(subghz_decoder_nero_radio_test);
989966
MU_RUN_TEST(subghz_decoder_nero_sketch_test);
990967
MU_RUN_TEST(subghz_decoder_nice_flo_test);
991968
MU_RUN_TEST(subghz_decoder_nice_flor_s_test);
992969
MU_RUN_TEST(subghz_decoder_princeton_test);
993-
MU_RUN_TEST(subghz_decoder_scher_khan_magic_code_test);
994970
MU_RUN_TEST(subghz_decoder_somfy_keytis_test);
995971
MU_RUN_TEST(subghz_decoder_somfy_telis_test);
996-
MU_RUN_TEST(subghz_decoder_star_line_test);
997972
MU_RUN_TEST(subghz_decoder_linear_test);
998973
MU_RUN_TEST(subghz_decoder_linear_delta3_test);
999974
MU_RUN_TEST(subghz_decoder_megacode_test);

applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ static void subghz_device_cc1101_ext_interconnect_load_preset(
4343
subghz_device_cc1101_ext_load_custom_preset(
4444
subghz_device_cc1101_preset_2fsk_dev2_38khz_async_regs);
4545
break;
46+
case FuriHalSubGhzPreset2FSKDev12KAsync:
47+
subghz_device_cc1101_ext_load_custom_preset(
48+
subghz_device_cc1101_preset_2fsk_dev12khz_async_regs);
49+
break;
4650
case FuriHalSubGhzPreset2FSKDev476Async:
4751
subghz_device_cc1101_ext_load_custom_preset(
4852
subghz_device_cc1101_preset_2fsk_dev47_6khz_async_regs);

applications/examples/example_event_loop/example_event_loop_mutex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ typedef struct {
2626
uint8_t worker_result;
2727
} EventLoopMutexApp;
2828

29-
// This funciton is being run in a separate thread to simulate lenghty blocking operations
29+
// This funciton is being run in a separate thread to simulate lengthy blocking operations
3030
static int32_t event_loop_mutex_app_worker_thread(void* context) {
3131
furi_assert(context);
3232
EventLoopMutexApp* app = context;

applications/external

Submodule external updated 339 files

applications/main/archive/helpers/archive_browser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static const char* const known_ext[] = {
4545
[ArchiveFileTypeUpdateManifest] = ".fuf",
4646
[ArchiveFileTypeDiskImage] = ".img",
4747
[ArchiveFileTypeFolder] = "?",
48+
[ArchiveFileTypeProtoPirate] = ".psf",
4849
[ArchiveFileTypeUnknown] = "*",
4950
[ArchiveFileTypeAppOrJs] = ".fap|.js",
5051
[ArchiveFileTypeSetting] = "?",

0 commit comments

Comments
 (0)