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

fix: use the datasize of the generation functions in the protocols geninfo struct

Browse Source
This commit is contained in:
Louis D
2025-08-01 14:44:42 +02:00
parent 7c3e874716
commit 71eafcdd6c
3 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
applications/main/subghz/scenes/subghz_scene_set_counter.c
View File

@@ -19,31 +19,31 @@ void subghz_scene_set_counter_on_enter(void* context) {
switch(subghz->gen_info->type) {
case GenFaacSLH:
byte_ptr = &subghz->gen_info->faac_slh.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->faac_slh.cnt;
byte_count = sizeof(subghz->gen_info->faac_slh.cnt);
break;
case GenKeeloq:
byte_ptr = &subghz->gen_info->keeloq.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->keeloq.cnt;
byte_count = sizeof(subghz->gen_info->keeloq.cnt);
break;
case GenCameAtomo:
byte_ptr = &subghz->gen_info->came_atomo.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->came_atomo.cnt;
byte_count = sizeof(subghz->gen_info->came_atomo.cnt);
break;
case GenKeeloqBFT:
byte_ptr = &subghz->gen_info->keeloq_bft.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->keeloq_bft.cnt;
byte_count = sizeof(subghz->gen_info->keeloq_bft.cnt);
break;
case GenAlutechAt4n:
byte_ptr = &subghz->gen_info->alutech_at_4n.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->alutech_at_4n.cnt;
byte_count = sizeof(subghz->gen_info->alutech_at_4n.cnt);
break;
case GenSomfyTelis:
byte_ptr = &subghz->gen_info->somfy_telis.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->somfy_telis.cnt;
byte_count = sizeof(subghz->gen_info->somfy_telis.cnt);
break;
case GenNiceFlorS:
byte_ptr = &subghz->gen_info->nice_flor_s.cnt;
byte_ptr = (uint8_t*)&subghz->gen_info->nice_flor_s.cnt;
byte_count = sizeof(subghz->gen_info->nice_flor_s.cnt);
break;
case GenSecPlus2:
@@ -92,6 +92,43 @@ bool subghz_scene_set_counter_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubGhzCustomEventByteInputDone) {
// Swap bytes
switch(subghz->gen_info->type) {
case GenFaacSLH:
subghz->gen_info->faac_slh.cnt = __bswap32(subghz->gen_info->faac_slh.cnt);
break;
case GenKeeloq:
subghz->gen_info->keeloq.cnt = __bswap16(subghz->gen_info->keeloq.cnt);
break;
case GenCameAtomo:
subghz->gen_info->came_atomo.cnt = __bswap16(subghz->gen_info->came_atomo.cnt);
break;
case GenKeeloqBFT:
subghz->gen_info->keeloq_bft.cnt = __bswap16(subghz->gen_info->keeloq_bft.cnt);
break;
case GenAlutechAt4n:
subghz->gen_info->alutech_at_4n.cnt = __bswap16(subghz->gen_info->alutech_at_4n.cnt);
break;
case GenSomfyTelis:
subghz->gen_info->somfy_telis.cnt = __bswap16(subghz->gen_info->somfy_telis.cnt);
break;
case GenNiceFlorS:
subghz->gen_info->nice_flor_s.cnt = __bswap16(subghz->gen_info->nice_flor_s.cnt);
break;
case GenSecPlus2:
subghz->gen_info->sec_plus_2.cnt = __bswap32(subghz->gen_info->sec_plus_2.cnt);
break;
case GenPhoenixV2:
subghz->gen_info->phoenix_v2.cnt = __bswap16(subghz->gen_info->phoenix_v2.cnt);
break;
// Not needed for these types
case GenData:
case GenSecPlus1:
default:
furi_crash("Not implemented");
break;
}
switch(subghz->gen_info->type) {
case GenFaacSLH:
case GenKeeloqBFT:
@@ -144,7 +181,6 @@ bool subghz_scene_set_counter_on_event(void* context, SceneManagerEvent event) {
subghz->gen_info->nice_flor_s.nice_one);
break;
case GenSecPlus2:
subghz->gen_info->sec_plus_2.cnt = __bswap32(subghz->gen_info->sec_plus_2.cnt);
generated_protocol = subghz_txrx_gen_secplus_v2_protocol(
subghz->txrx,
subghz->gen_info->mod,
@@ -154,7 +190,6 @@ bool subghz_scene_set_counter_on_event(void* context, SceneManagerEvent event) {
subghz->gen_info->sec_plus_2.cnt);
break;
case GenPhoenixV2:
subghz->gen_info->phoenix_v2.cnt = __bswap16(subghz->gen_info->phoenix_v2.cnt);
generated_protocol = subghz_txrx_gen_phoenix_v2_protocol(
subghz->txrx,
subghz->gen_info->mod,