diff --git a/applications/main/subghz/helpers/subghz_gen_info.h b/applications/main/subghz/helpers/subghz_gen_info.h index 003ab871a..88ccdec75 100644 --- a/applications/main/subghz/helpers/subghz_gen_info.h +++ b/applications/main/subghz/helpers/subghz_gen_info.h @@ -25,46 +25,46 @@ typedef struct { const char* name; uint64_t key; uint8_t bits; - uint16_t te; + uint32_t te; } data; struct { uint32_t serial; uint8_t btn; - uint8_t cnt; + uint32_t cnt; uint32_t seed; const char* manuf; } faac_slh; struct { uint32_t serial; uint8_t btn; - uint8_t cnt; + uint16_t cnt; const char* manuf; } keeloq; struct { uint32_t serial; - uint8_t cnt; + uint16_t cnt; } came_atomo; struct { uint32_t serial; uint8_t btn; - uint8_t cnt; + uint16_t cnt; uint32_t seed; const char* manuf; } keeloq_bft; struct { uint32_t serial; uint8_t btn; - uint8_t cnt; + uint16_t cnt; } alutech_at_4n; struct { uint32_t serial; uint8_t btn; - uint8_t cnt; + uint16_t cnt; } somfy_telis; struct { uint32_t serial; uint8_t btn; - uint8_t cnt; + uint16_t cnt; bool nice_one; } nice_flor_s; struct { diff --git a/applications/main/subghz/scenes/subghz_scene_set_counter.c b/applications/main/subghz/scenes/subghz_scene_set_counter.c index 8f61c2285..f66152a7c 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_counter.c +++ b/applications/main/subghz/scenes/subghz_scene_set_counter.c @@ -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,9 +92,44 @@ bool subghz_scene_set_counter_on_event(void* context, SceneManagerEvent event) { if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { - GenInfo gen_info = *subghz->gen_info; + // 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(gen_info.type) { + switch(subghz->gen_info->type) { case GenFaacSLH: case GenKeeloqBFT: scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetSeed); @@ -102,65 +137,65 @@ bool subghz_scene_set_counter_on_event(void* context, SceneManagerEvent event) { case GenKeeloq: generated_protocol = subghz_txrx_gen_keeloq_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.keeloq.serial), - gen_info.keeloq.btn, - gen_info.keeloq.cnt, - gen_info.keeloq.manuf); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->keeloq.serial, + subghz->gen_info->keeloq.btn, + subghz->gen_info->keeloq.cnt, + subghz->gen_info->keeloq.manuf); break; case GenCameAtomo: generated_protocol = subghz_txrx_gen_came_atomo_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.came_atomo.serial), - gen_info.came_atomo.cnt); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->came_atomo.serial, + subghz->gen_info->came_atomo.cnt); break; case GenAlutechAt4n: generated_protocol = subghz_txrx_gen_alutech_at_4n_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.alutech_at_4n.serial), - gen_info.alutech_at_4n.btn, - gen_info.alutech_at_4n.cnt); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->alutech_at_4n.serial, + subghz->gen_info->alutech_at_4n.btn, + subghz->gen_info->alutech_at_4n.cnt); break; case GenSomfyTelis: generated_protocol = subghz_txrx_gen_somfy_telis_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.somfy_telis.serial), - gen_info.somfy_telis.btn, - gen_info.somfy_telis.cnt); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->somfy_telis.serial, + subghz->gen_info->somfy_telis.btn, + subghz->gen_info->somfy_telis.cnt); break; case GenNiceFlorS: generated_protocol = subghz_txrx_gen_nice_flor_s_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.nice_flor_s.serial), - gen_info.nice_flor_s.btn, - gen_info.nice_flor_s.cnt, - gen_info.nice_flor_s.nice_one); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->nice_flor_s.serial, + subghz->gen_info->nice_flor_s.btn, + subghz->gen_info->nice_flor_s.cnt, + subghz->gen_info->nice_flor_s.nice_one); break; case GenSecPlus2: generated_protocol = subghz_txrx_gen_secplus_v2_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.sec_plus_2.serial), - gen_info.sec_plus_2.btn, - __bswap32(gen_info.sec_plus_2.cnt)); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->sec_plus_2.serial, + subghz->gen_info->sec_plus_2.btn, + subghz->gen_info->sec_plus_2.cnt); break; case GenPhoenixV2: generated_protocol = subghz_txrx_gen_phoenix_v2_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.phoenix_v2.serial), - __bswap16(gen_info.phoenix_v2.cnt)); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->phoenix_v2.serial, + subghz->gen_info->phoenix_v2.cnt); break; // Not needed for these types case GenData: diff --git a/applications/main/subghz/scenes/subghz_scene_set_key.c b/applications/main/subghz/scenes/subghz_scene_set_key.c index 71c57c5f9..b617b1a0f 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_key.c +++ b/applications/main/subghz/scenes/subghz_scene_set_key.c @@ -44,26 +44,27 @@ bool subghz_scene_set_key_on_event(void* context, SceneManagerEvent event) { if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { - GenInfo gen_info = *subghz->gen_info; - if(gen_info.type == GenData) { - if(gen_info.data.te) { + if(subghz->gen_info->type == GenData) { + subghz->gen_info->data.key = __bswap64(subghz->gen_info->data.key); + + if(subghz->gen_info->data.te) { generated_protocol = subghz_txrx_gen_data_protocol_and_te( subghz->txrx, - gen_info.mod, - gen_info.freq, - gen_info.data.name, - __bswap64(gen_info.data.key), - gen_info.data.bits, - gen_info.data.te); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->data.name, + subghz->gen_info->data.key, + subghz->gen_info->data.bits, + subghz->gen_info->data.te); } else { generated_protocol = subghz_txrx_gen_data_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - gen_info.data.name, - __bswap64(gen_info.data.key), - gen_info.data.bits); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->data.name, + subghz->gen_info->data.key, + subghz->gen_info->data.bits); } } diff --git a/applications/main/subghz/scenes/subghz_scene_set_seed.c b/applications/main/subghz/scenes/subghz_scene_set_seed.c index bebab6c27..3e4a33536 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_seed.c +++ b/applications/main/subghz/scenes/subghz_scene_set_seed.c @@ -60,30 +60,31 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { bool generated_protocol = false; if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { - GenInfo gen_info = *subghz->gen_info; - switch(gen_info.type) { + switch(subghz->gen_info->type) { case GenFaacSLH: + subghz->gen_info->faac_slh.seed = __bswap32(subghz->gen_info->faac_slh.seed); generated_protocol = subghz_txrx_gen_faac_slh_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.faac_slh.serial), - gen_info.faac_slh.btn, - gen_info.faac_slh.cnt, - __bswap32(gen_info.faac_slh.seed), - gen_info.faac_slh.manuf); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->faac_slh.serial, + subghz->gen_info->faac_slh.btn, + subghz->gen_info->faac_slh.cnt, + subghz->gen_info->faac_slh.seed, + subghz->gen_info->faac_slh.manuf); break; case GenKeeloqBFT: + subghz->gen_info->keeloq_bft.seed = __bswap32(subghz->gen_info->keeloq_bft.seed); generated_protocol = subghz_txrx_gen_keeloq_bft_protocol( subghz->txrx, - gen_info.mod, - gen_info.freq, - __bswap32(gen_info.keeloq_bft.serial), - gen_info.keeloq_bft.btn, - gen_info.keeloq_bft.cnt, - __bswap32(gen_info.keeloq_bft.seed), - gen_info.keeloq_bft.manuf); + subghz->gen_info->mod, + subghz->gen_info->freq, + subghz->gen_info->keeloq_bft.serial, + subghz->gen_info->keeloq_bft.btn, + subghz->gen_info->keeloq_bft.cnt, + subghz->gen_info->keeloq_bft.seed, + subghz->gen_info->keeloq_bft.manuf); break; // Not needed for these types case GenKeeloq: diff --git a/applications/main/subghz/scenes/subghz_scene_set_serial.c b/applications/main/subghz/scenes/subghz_scene_set_serial.c index 6684e35a4..bedb0d1cc 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_serial.c +++ b/applications/main/subghz/scenes/subghz_scene_set_serial.c @@ -86,6 +86,43 @@ bool subghz_scene_set_serial_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.serial = __bswap32(subghz->gen_info->faac_slh.serial); + break; + case GenKeeloq: + subghz->gen_info->keeloq.serial = __bswap32(subghz->gen_info->keeloq.serial); + break; + case GenCameAtomo: + subghz->gen_info->came_atomo.serial = __bswap32(subghz->gen_info->came_atomo.serial); + break; + case GenKeeloqBFT: + subghz->gen_info->keeloq_bft.serial = __bswap32(subghz->gen_info->keeloq_bft.serial); + break; + case GenAlutechAt4n: + subghz->gen_info->alutech_at_4n.serial = __bswap32(subghz->gen_info->alutech_at_4n.serial); + break; + case GenSomfyTelis: + subghz->gen_info->somfy_telis.serial = __bswap32(subghz->gen_info->somfy_telis.serial); + break; + case GenNiceFlorS: + subghz->gen_info->nice_flor_s.serial = __bswap32(subghz->gen_info->nice_flor_s.serial); + break; + case GenSecPlus2: + subghz->gen_info->sec_plus_2.serial = __bswap32(subghz->gen_info->sec_plus_2.serial); + break; + case GenPhoenixV2: + subghz->gen_info->phoenix_v2.serial = __bswap32(subghz->gen_info->phoenix_v2.serial); + break; + // Not needed for these types + case GenData: + case GenSecPlus1: + default: + furi_crash("Not implemented"); + break; + } + switch(subghz->gen_info->type) { case GenFaacSLH: case GenKeeloq: diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c index e4faead62..f493954bc 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_type.c +++ b/applications/main/subghz/scenes/subghz_scene_set_type.c @@ -254,15 +254,14 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetKey); break; case GenSecPlus1: // None - generated_protocol = subghz_scene_set_type_generate_protocol_from_infos(subghz); - break; - case GenFaacSLH: // Serial (u32), Button (u8), Counter (u8), Seed (u32) - case GenKeeloq: // Serial (u32), Button (u8), Counter (u8) - case GenCameAtomo: // Serial (u32), Counter (u8) - case GenKeeloqBFT: // Serial (u32), Button (u8), Counter (u8), Seed (u32) - case GenAlutechAt4n: // Serial (u32), Button (u8), Counter (u8) - case GenSomfyTelis: // Serial (u32), Button (u8), Counter (u8) - case GenNiceFlorS: // Serial (u32), Button (u8), Counter (u8) + return subghz_scene_set_type_generate_protocol_from_infos(subghz); + case GenFaacSLH: // Serial (u32), Button (u8), Counter (u32), Seed (u32) + case GenKeeloq: // Serial (u32), Button (u8), Counter (u16) + case GenCameAtomo: // Serial (u32), Counter (u16) + case GenKeeloqBFT: // Serial (u32), Button (u8), Counter (u16), Seed (u32) + case GenAlutechAt4n: // Serial (u32), Button (u8), Counter (u16) + case GenSomfyTelis: // Serial (u32), Button (u8), Counter (u16) + case GenNiceFlorS: // Serial (u32), Button (u8), Counter (u16) case GenSecPlus2: // Serial (u32), Button (u8), Counter (u32) case GenPhoenixV2: // Serial (u32), Counter (u16) scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetSerial);