mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

fix typos from ofw

Browse Source
This commit is contained in:
MX
2023-05-10 21:48:48 +03:00
parent 6f10990386
commit cca6606c78
6 changed files with 27 additions and 27 deletions
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/keeloq.h> #include <lib/subghz/protocols/keeloq.h>
@@ -84,7 +84,7 @@ bool subghz_txrx_gen_data_protocol_and_te(
return ret; return ret;
} }
bool subghz_txrx_gen_keelog_protocol( //TODO lead to a general appearance bool subghz_txrx_gen_keeloq_protocol( //TODO lead to a general appearance
SubGhzTxRx* instance, SubGhzTxRx* instance,
const char* preset_name, const char* preset_name,
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 manufacture_name Name of Keeloq sysmem * @param manufacture_name Name of Keeloq sysmem
* @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* preset_name, const char* preset_name,
uint32_t frequency, uint32_t frequency,

2
applications/main/subghz/scenes/subghz_scene_set_seed.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"
#define TAG "SubGhzSetSeed" #define TAG "SubGhzSetSeed"

36
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>
@@ -367,7 +367,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 SubmenuIndexBeninca433: case SubmenuIndexBeninca433:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
433920000, 433920000,
@@ -382,7 +382,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexBeninca868: case SubmenuIndexBeninca868:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
868350000, 868350000,
@@ -397,7 +397,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexAllmatic433: case SubmenuIndexAllmatic433:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
433920000, 433920000,
@@ -412,7 +412,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexAllmatic868: case SubmenuIndexAllmatic868:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
868350000, 868350000,
@@ -427,7 +427,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexElmesElectronic: case SubmenuIndexElmesElectronic:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
433920000, 433920000,
@@ -442,7 +442,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexANMotorsAT4: case SubmenuIndexANMotorsAT4:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
433920000, 433920000,
@@ -457,7 +457,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexAprimatic: case SubmenuIndexAprimatic:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, subghz->txrx,
"AM650", "AM650",
433920000, 433920000,
@@ -472,7 +472,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexGibidi433: case SubmenuIndexGibidi433:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003, "Gibidi"); subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003, "Gibidi");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -481,7 +481,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexGSN: case SubmenuIndexGSN:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, key & 0x0FFFFFFF, 0x2, 0x0003, "GSN"); subghz->txrx, "AM650", 433920000, key & 0x0FFFFFFF, 0x2, 0x0003, "GSN");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -490,7 +490,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexIronLogic: case SubmenuIndexIronLogic:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, key & 0x00FFFFF0, 0x4, 0x0005, "IronLogic"); subghz->txrx, "AM650", 433920000, key & 0x00FFFFF0, 0x4, 0x0005, "IronLogic");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -499,7 +499,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexSommer_FM_434: case SubmenuIndexSommer_FM_434:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "FM476", 434420000, key & 0x0FFFFFFF, 0x4, 0x0003, "Sommer(fsk476)"); subghz->txrx, "FM476", 434420000, key & 0x0FFFFFFF, 0x4, 0x0003, "Sommer(fsk476)");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -508,7 +508,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexSommer_FM_868: case SubmenuIndexSommer_FM_868:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "FM476", 868800000, key & 0x0FFFFFFF, 0x4, 0x0003, "Sommer(fsk476)"); subghz->txrx, "FM476", 868800000, key & 0x0FFFFFFF, 0x4, 0x0003, "Sommer(fsk476)");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -517,7 +517,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexDTMNeo433: case SubmenuIndexDTMNeo433:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, key & 0x000FFFFF, 0x2, 0x0005, "DTM_Neo"); subghz->txrx, "AM650", 433920000, key & 0x000FFFFF, 0x2, 0x0005, "DTM_Neo");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -526,7 +526,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexCAMESpace: case SubmenuIndexCAMESpace:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003, "Came_Space"); subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003, "Came_Space");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -569,7 +569,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
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, key & 0x0FFFFFFF, 0x2, 0x0003, "DoorHan"); subghz->txrx, "AM650", 433920000, key & 0x0FFFFFFF, 0x2, 0x0003, "DoorHan");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -578,7 +578,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, key & 0x0FFFFFFF, 0x2, 0x0003, "DoorHan"); subghz->txrx, "AM650", 315000000, key & 0x0FFFFFFF, 0x2, 0x0003, "DoorHan");
if(!generated_protocol) { if(!generated_protocol) {
furi_string_set( furi_string_set(
@@ -605,7 +605,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
} }
break; break;
case SubmenuIndexNiceSmilo_433_92: case SubmenuIndexNiceSmilo_433_92:
generated_protocol = subghz_txrx_gen_keelog_protocol( generated_protocol = subghz_txrx_gen_keeloq_protocol(
subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003, "NICE_Smilo"); subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003, "NICE_Smilo");
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
*/ */