From a941ed8c2aba434d3af852fc2e7178dd70f1e9f5 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Wed, 10 May 2023 23:12:50 +0300 Subject: [PATCH] Rename funcs --- .../subghz/helpers/subghz_txrx_create_protocol_key.c | 10 +++++----- .../subghz/helpers/subghz_txrx_create_protocol_key.h | 10 +++++----- .../main/subghz/scenes/subghz_scene_set_seed.c | 6 +++--- .../main/subghz/scenes/subghz_scene_set_type.c | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c index 7a0060f16..053f472aa 100644 --- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c +++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c @@ -116,7 +116,7 @@ bool subghz_txrx_gen_keeloq_protocol( //TODO lead to a general appearance return res; } -bool subghz_scene_set_type_submenu_gen_data_keeloq_bft( //TODO rename & lead to a general appearance +bool subghz_txrx_gen_keeloq_bft_protocol( //TODO rename & lead to a general appearance void* context, const char* preset_name, uint32_t frequency, @@ -161,7 +161,7 @@ bool subghz_scene_set_type_submenu_gen_data_keeloq_bft( //TODO rename & lead to return res; } -bool subghz_scene_set_type_submenu_gen_data_nice_flor( //TODO rename & lead to a general appearance +bool subghz_txrx_gen_nice_flor_s_protocol( //TODO rename & lead to a general appearance void* context, const char* preset_name, uint32_t frequency, @@ -193,7 +193,7 @@ bool subghz_scene_set_type_submenu_gen_data_nice_flor( //TODO rename & lead to a return res; } -bool subghz_scene_set_type_submenu_gen_data_faac_slh( //TODO rename & lead to a general appearance +bool subghz_txrx_gen_faac_slh_protocol( //TODO rename & lead to a general appearance void* context, const char* preset_name, uint32_t frequency, @@ -236,7 +236,7 @@ bool subghz_scene_set_type_submenu_gen_data_faac_slh( //TODO rename & lead to a return res; } -bool subghz_scene_set_type_submenu_gen_data_alutech_at_4n( //TODO rename & lead to a general appearance +bool subghz_txrx_gen_alutech_at_4n_protocol( //TODO rename & lead to a general appearance void* context, const char* preset_name, uint32_t frequency, @@ -266,7 +266,7 @@ bool subghz_scene_set_type_submenu_gen_data_alutech_at_4n( //TODO rename & lead return res; } -bool subghz_scene_set_type_submenu_gen_data_somfy_telis( //TODO rename & lead to a general appearance +bool subghz_txrx_gen_somfy_telis_protocol( //TODO rename & lead to a general appearance void* context, const char* preset_name, uint32_t frequency, diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h index 96e592936..61dbf9e56 100644 --- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h +++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h @@ -63,7 +63,7 @@ bool subghz_txrx_gen_keeloq_protocol( uint16_t cnt, const char* manufacture_name); -bool subghz_scene_set_type_submenu_gen_data_keeloq_bft( //TODO rename +bool subghz_txrx_gen_keeloq_bft_protocol( //TODO rename void* context, const char* preset_name, uint32_t frequency, @@ -73,7 +73,7 @@ bool subghz_scene_set_type_submenu_gen_data_keeloq_bft( //TODO rename uint32_t seed, const char* manufacture_name); -bool subghz_scene_set_type_submenu_gen_data_nice_flor( //TODO rename +bool subghz_txrx_gen_nice_flor_s_protocol( //TODO rename void* context, const char* preset_name, uint32_t frequency, @@ -82,7 +82,7 @@ bool subghz_scene_set_type_submenu_gen_data_nice_flor( //TODO rename uint16_t cnt, bool nice_one); -bool subghz_scene_set_type_submenu_gen_data_faac_slh( //TODO rename +bool subghz_txrx_gen_faac_slh_protocol( //TODO rename void* context, const char* preset_name, uint32_t frequency, @@ -92,7 +92,7 @@ bool subghz_scene_set_type_submenu_gen_data_faac_slh( //TODO rename uint32_t seed, const char* manufacture_name); -bool subghz_scene_set_type_submenu_gen_data_alutech_at_4n( //TODO rename +bool subghz_txrx_gen_alutech_at_4n_protocol( //TODO rename void* context, const char* preset_name, uint32_t frequency, @@ -100,7 +100,7 @@ bool subghz_scene_set_type_submenu_gen_data_alutech_at_4n( //TODO rename uint8_t btn, uint16_t cnt); -bool subghz_scene_set_type_submenu_gen_data_somfy_telis( //TODO rename +bool subghz_txrx_gen_somfy_telis_protocol( //TODO rename void* context, const char* preset_name, uint32_t frequency, diff --git a/applications/main/subghz/scenes/subghz_scene_set_seed.c b/applications/main/subghz/scenes/subghz_scene_set_seed.c index 18bc787bb..e6850d1e3 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_seed.c +++ b/applications/main/subghz/scenes/subghz_scene_set_seed.c @@ -45,7 +45,7 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { seed = subghz->secure_data->seed[0] << 24 | subghz->secure_data->seed[1] << 16 | subghz->secure_data->seed[2] << 8 | subghz->secure_data->seed[3]; - generated_protocol = subghz_scene_set_type_submenu_gen_data_keeloq_bft( + generated_protocol = subghz_txrx_gen_keeloq_bft_protocol( subghz->txrx, "AM650", 433920000, @@ -74,7 +74,7 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { subghz->secure_data->seed[2] << 8 | subghz->secure_data->seed[3]; if(state == SubmenuIndexFaacSLH_433) { - generated_protocol = subghz_scene_set_type_submenu_gen_data_faac_slh( + generated_protocol = subghz_txrx_gen_faac_slh_protocol( subghz->txrx, "AM650", 433920000, @@ -84,7 +84,7 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { seed, "FAAC_SLH"); } else if(state == SubmenuIndexFaacSLH_868) { - generated_protocol = subghz_scene_set_type_submenu_gen_data_faac_slh( + generated_protocol = subghz_txrx_gen_faac_slh_protocol( subghz->txrx, "AM650", 868350000, diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c index 342f01536..23ecbb539 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_type.c +++ b/applications/main/subghz/scenes/subghz_scene_set_type.c @@ -535,7 +535,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { } break; case SubmenuIndexBFTMitto: - generated_protocol = subghz_scene_set_type_submenu_gen_data_keeloq_bft( + generated_protocol = subghz_txrx_gen_keeloq_bft_protocol( subghz->txrx, "AM650", 433920000, @@ -551,7 +551,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { } break; case SubmenuIndexAlutechAT4N: - generated_protocol = subghz_scene_set_type_submenu_gen_data_alutech_at_4n( + generated_protocol = subghz_txrx_gen_alutech_at_4n_protocol( subghz->txrx, "AM650", 433920000, (key & 0x000FFFFF) | 0x00100000, 0x44, 0x0003); if(!generated_protocol) { furi_string_set( @@ -560,7 +560,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { } break; case SubmenuIndexSomfyTelis: - generated_protocol = subghz_scene_set_type_submenu_gen_data_somfy_telis( + generated_protocol = subghz_txrx_gen_somfy_telis_protocol( subghz->txrx, "AM650", 433920000, key & 0x00FFFFFF, 0x2, 0x0003); if(!generated_protocol) { //TODO does not use databases furi_string_set( @@ -587,7 +587,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { } break; case SubmenuIndexNiceFlorS_433_92: - generated_protocol = subghz_scene_set_type_submenu_gen_data_nice_flor( + generated_protocol = subghz_txrx_gen_nice_flor_s_protocol( subghz->txrx, "AM650", 433920000, key & 0x0FFFFFFF, 0x1, 0x0003, false); if(!generated_protocol) { furi_string_set( @@ -596,7 +596,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { } break; case SubmenuIndexNiceOne_433_92: - generated_protocol = subghz_scene_set_type_submenu_gen_data_nice_flor( + generated_protocol = subghz_txrx_gen_nice_flor_s_protocol( subghz->txrx, "AM650", 433920000, key & 0x0FFFFFFF, 0x1, 0x0003, true); if(!generated_protocol) { furi_string_set(