Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
MX
2025-07-30 06:03:25 +03:00
parent 979e428ad8
commit 9ab4fcb256
8 changed files with 1088 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/main/subghz/helpers/subghz_gen_info.c
View File

@@ -2,7 +2,6 @@
#include "../helpers/subghz_txrx_create_protocol_key.h"
#include <lib/subghz/protocols/protocol_items.h>
void subghz_gen_info_reset(GenInfo* gen_info) {
furi_assert(gen_info);
memset(gen_info, 0, sizeof(GenInfo));
@@ -154,8 +153,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty
.type = GenData,
.mod = "AM650",
.freq = 433920000,
.data.name =
SUBGHZ_PROTOCOL_GANGQI_NAME, // Add button 0xD arm and crc sum to the end
.data.name = SUBGHZ_PROTOCOL_GANGQI_NAME, // Add button 0xD arm and crc sum to the end
.data.key = gangqi_key,
.data.bits = 34,
.data.te = 0};

7
applications/main/subghz/scenes/subghz_scene_set_key.c
View File

@@ -29,12 +29,7 @@ void subghz_scene_set_key_on_enter(void* context) {
ByteInput* byte_input = subghz->byte_input;
byte_input_set_header_text(byte_input, "Enter KEY in hex");
byte_input_set_result_callback(
byte_input,
subghz_scene_set_key_byte_input_callback,
NULL,
subghz,
byte_ptr,
byte_count);
byte_input, subghz_scene_set_key_byte_input_callback, NULL, subghz, byte_ptr, byte_count);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput);
}

7
applications/main/subghz/scenes/subghz_scene_set_seed.c
View File

@@ -46,12 +46,7 @@ void subghz_scene_set_seed_on_enter(void* context) {
ByteInput* byte_input = subghz->byte_input;
byte_input_set_header_text(byte_input, "Enter SEED in hex");
byte_input_set_result_callback(
byte_input,
subghz_scene_set_seed_byte_input_callback,
NULL,
subghz,
byte_ptr,
byte_count);
byte_input, subghz_scene_set_seed_byte_input_callback, NULL, subghz, byte_ptr, byte_count);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput);
}

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

@@ -224,8 +224,7 @@ bool subghz_scene_set_type_generate_protocol_from_infos(SubGhz* subghz) {
subghz_file_name_clear(subghz);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName);
} else {
furi_string_set(
subghz->error_str, "Function requires\nan SD card with\nfresh databases.");
furi_string_set(subghz->error_str, "Function requires\nan SD card with\nfresh databases.");
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowError);
}
return generated_protocol;
@@ -244,15 +243,19 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
subghz_gen_info_reset(subghz->gen_info);
subghz_scene_set_type_fill_generation_infos(subghz->gen_info, event.event);
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart) == SubmenuIndexAddManually) {
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart) ==
SubmenuIndexAddManually) {
generated_protocol = subghz_scene_set_type_generate_protocol_from_infos(subghz);
} else if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart) == SubmenuIndexAddManuallyAdvanced) {
} else if(
scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart) ==
SubmenuIndexAddManuallyAdvanced) {
switch(subghz->gen_info->type) {
case GenData: // Key (u64)
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetKey);
break;
case GenSecPlus1: // None
return subghz_txrx_gen_secplus_v1_protocol(subghz->txrx, subghz->gen_info->mod, subghz->gen_info->freq);
return subghz_txrx_gen_secplus_v1_protocol(
subghz->txrx, subghz->gen_info->mod, subghz->gen_info->freq);
case GenFaacSLH: // Serial (u32), Button (u8), Counter (u8), Seed (u32)
case GenKeeloq: // Serial (u32), Button (u8), Counter (u8)
case GenCameAtomo: // Serial (u32), Counter (u8)