mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SubGHz: Fix typos (#2661)

Browse Source 
Co-authored-by: hedger <hedger@users.noreply.github.com>
This commit is contained in:
MX 2023-05-11 06:10:20 +03:00 committed by GitHub
parent 9914aa40bd
commit 9862876f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/debug/unit_tests/subghz/subghz_test.c
View File

@ -407,7 +407,7 @@ MU_TEST(subghz_decoder_ido_test) {
"Test decoder " SUBGHZ_PROTOCOL_IDO_NAME " error\r\n"); "Test decoder " SUBGHZ_PROTOCOL_IDO_NAME " error\r\n");
} }
MU_TEST(subghz_decoder_keelog_test) { MU_TEST(subghz_decoder_keeloq_test) {
mu_assert( mu_assert(
subghz_decoder_test( subghz_decoder_test(
EXT_PATH("unit_tests/subghz/doorhan_raw.sub"), SUBGHZ_PROTOCOL_KEELOQ_NAME), EXT_PATH("unit_tests/subghz/doorhan_raw.sub"), SUBGHZ_PROTOCOL_KEELOQ_NAME),
@ -676,7 +676,7 @@ MU_TEST(subghz_encoder_nice_flo_test) {
"Test encoder " SUBGHZ_PROTOCOL_NICE_FLO_NAME " error\r\n"); "Test encoder " SUBGHZ_PROTOCOL_NICE_FLO_NAME " error\r\n");
} }
MU_TEST(subghz_encoder_keelog_test) { MU_TEST(subghz_encoder_keeloq_test) {
mu_assert( mu_assert(
subghz_encoder_test(EXT_PATH("unit_tests/subghz/doorhan.sub")), subghz_encoder_test(EXT_PATH("unit_tests/subghz/doorhan.sub")),
"Test encoder " SUBGHZ_PROTOCOL_KEELOQ_NAME " error\r\n"); "Test encoder " SUBGHZ_PROTOCOL_KEELOQ_NAME " error\r\n");
@ -813,7 +813,7 @@ MU_TEST_SUITE(subghz) {
MU_RUN_TEST(subghz_decoder_gate_tx_test); MU_RUN_TEST(subghz_decoder_gate_tx_test);
MU_RUN_TEST(subghz_decoder_hormann_hsm_test); MU_RUN_TEST(subghz_decoder_hormann_hsm_test);
MU_RUN_TEST(subghz_decoder_ido_test); MU_RUN_TEST(subghz_decoder_ido_test);
MU_RUN_TEST(subghz_decoder_keelog_test); MU_RUN_TEST(subghz_decoder_keeloq_test);
MU_RUN_TEST(subghz_decoder_kia_seed_test); MU_RUN_TEST(subghz_decoder_kia_seed_test);
MU_RUN_TEST(subghz_decoder_nero_radio_test); MU_RUN_TEST(subghz_decoder_nero_radio_test);
MU_RUN_TEST(subghz_decoder_nero_sketch_test); MU_RUN_TEST(subghz_decoder_nero_sketch_test);
@ -852,7 +852,7 @@ MU_TEST_SUITE(subghz) {
MU_RUN_TEST(subghz_encoder_came_twee_test); MU_RUN_TEST(subghz_encoder_came_twee_test);
MU_RUN_TEST(subghz_encoder_gate_tx_test); MU_RUN_TEST(subghz_encoder_gate_tx_test);
MU_RUN_TEST(subghz_encoder_nice_flo_test); MU_RUN_TEST(subghz_encoder_nice_flo_test);
MU_RUN_TEST(subghz_encoder_keelog_test); MU_RUN_TEST(subghz_encoder_keeloq_test);
MU_RUN_TEST(subghz_encoder_linear_test); MU_RUN_TEST(subghz_encoder_linear_test);
MU_RUN_TEST(subghz_encoder_linear_delta3_test); MU_RUN_TEST(subghz_encoder_linear_delta3_test);
MU_RUN_TEST(subghz_encoder_megacode_test); MU_RUN_TEST(subghz_encoder_megacode_test);

4
applications/main/subghz/helpers/subghz_txrx_create_potocol_key.c → applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
View File

@ -1,5 +1,5 @@
#include "subghz_txrx_i.h" #include "subghz_txrx_i.h"
#include "subghz_txrx_create_potocol_key.h" #include "subghz_txrx_create_protocol_key.h"
#include <lib/subghz/transmitter.h> #include <lib/subghz/transmitter.h>
#include <lib/subghz/protocols/protocol_items.h> #include <lib/subghz/protocols/protocol_items.h>
#include <lib/subghz/protocols/protocol_items.h> #include <lib/subghz/protocols/protocol_items.h>
@ -84,7 +84,7 @@ bool subghz_txrx_gen_data_protocol_and_te(
return ret; return ret;
} }
bool subghz_txrx_gen_keelog_protocol( bool subghz_txrx_gen_keeloq_protocol(
SubGhzTxRx* instance, SubGhzTxRx* instance,
const char* name_preset, const char* name_preset,
uint32_t frequency, uint32_t frequency,

2
applications/main/subghz/helpers/subghz_txrx_create_potocol_key.h → applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h
View File

@ -54,7 +54,7 @@ bool subghz_txrx_gen_data_protocol_and_te(
* @param cnt Counter * @param cnt Counter
* @return bool True if success * @return bool True if success
*/ */
bool subghz_txrx_gen_keelog_protocol( bool subghz_txrx_gen_keeloq_protocol(
SubGhzTxRx* instance, SubGhzTxRx* instance,
const char* name_preset, const char* name_preset,
uint32_t frequency, uint32_t frequency,

6
applications/main/subghz/scenes/subghz_scene_set_type.c
View File

@ -1,5 +1,5 @@
#include "../subghz_i.h" #include "../subghz_i.h"
#include "../helpers/subghz_txrx_create_potocol_key.h" #include "../helpers/subghz_txrx_create_protocol_key.h"
#include <lib/subghz/blocks/math.h> #include <lib/subghz/blocks/math.h>
#include <lib/subghz/protocols/protocol_items.h> #include <lib/subghz/protocols/protocol_items.h>
@ -172,7 +172,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
subghz->txrx, "AM650", 433920000, SUBGHZ_PROTOCOL_GATE_TX_NAME, rev_key, 24); subghz->txrx, "AM650", 433920000, SUBGHZ_PROTOCOL_GATE_TX_NAME, rev_key, 24);
break; break;
case SubmenuIndexDoorHan_433_92: case SubmenuIndexDoorHan_433_92:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, "DoorHan", key, 0x2, 0x0003); subghz->txrx, "AM650", 433920000, "DoorHan", key, 0x2, 0x0003);
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@ -181,7 +181,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexDoorHan_315_00: case SubmenuIndexDoorHan_315_00:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 315000000, "DoorHan", key, 0x2, 0x0003); subghz->txrx, "AM650", 315000000, "DoorHan", key, 0x2, 0x0003);
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(

2
lib/subghz/protocols/keeloq_common.c
View File

@ -23,7 +23,7 @@ inline uint32_t subghz_protocol_keeloq_common_encrypt(const uint32_t data, const
} }
/** Simple Learning Decrypt /** Simple Learning Decrypt
* @param data - keelog encrypt data * @param data - keeloq encrypt data
* @param key - manufacture (64bit) * @param key - manufacture (64bit)
* @return 0xBSSSCCCC, B(4bit) key, S(10bit) serial&0x3FF, C(16bit) counter * @return 0xBSSSCCCC, B(4bit) key, S(10bit) serial&0x3FF, C(16bit) counter
*/ */