Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge errors

Browse Source
This commit is contained in:
Max Lapan
2022-11-26 17:25:24 +01:00
parent ce013251f2
commit b5c5fff555
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/debug/unit_tests/subghz/subghz_test.c
+8 -12
View File
@@ -437,19 +437,18 @@ MU_TEST(subghz_decoder_clemsa_test) {
"Test decoder " SUBGHZ_PROTOCOL_CLEMSA_NAME " error\r\n");
}
<<<<<<< HEAD
MU_TEST(subghz_decoder_pocsag_test) {
mu_assert(
subghz_decoder_test(
EXT_PATH("unit_tests/subghz/pocsag.sub"), SUBGHZ_PROTOCOL_POCSAG_NAME),
"Test decoder " SUBGHZ_PROTOCOL_POCSAG_NAME " error\r\n");
=======
MU_TEST(subghz_decoder_ansonic_test) {
mu_assert(
subghz_decoder_test(
EXT_PATH("unit_tests/subghz/ansonic_raw.sub"), SUBGHZ_PROTOCOL_ANSONIC_NAME),
"Test decoder " SUBGHZ_PROTOCOL_ANSONIC_NAME " error\r\n");
>>>>>>> dev
}
MU_TEST(subghz_decoder_pocsag_test) {
mu_assert(
subghz_decoder_test(
EXT_PATH("unit_tests/subghz/pocsag.sub"), SUBGHZ_PROTOCOL_POCSAG_NAME),
"Test decoder " SUBGHZ_PROTOCOL_POCSAG_NAME " error\r\n");
}
//test encoders
@@ -619,11 +618,8 @@ MU_TEST_SUITE(subghz) {
MU_RUN_TEST(subghz_decoder_magellan_test);
MU_RUN_TEST(subghz_decoder_intertechno_v3_test);
MU_RUN_TEST(subghz_decoder_clemsa_test);
<<<<<<< HEAD
MU_RUN_TEST(subghz_decoder_pocsag_test);
=======
MU_RUN_TEST(subghz_decoder_ansonic_test);
>>>>>>> dev
MU_RUN_TEST(subghz_decoder_pocsag_test);
MU_RUN_TEST(subghz_encoder_princeton_test);
MU_RUN_TEST(subghz_encoder_came_test);