diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h index dffc6d193..d212de4ef 100644 --- a/applications/main/subghz/helpers/subghz_custom_event.h +++ b/applications/main/subghz/helpers/subghz_custom_event.h @@ -120,6 +120,7 @@ typedef enum { SetTypeCAMESpace, SetTypePricenton315, SetTypePricenton433, + SetTypeZKTeco430, SetTypeBETT_433, SetTypeGangQi_433, SetTypeHollarm_433, diff --git a/applications/main/subghz/helpers/subghz_gen_info.c b/applications/main/subghz/helpers/subghz_gen_info.c index f6abec0c6..90853cec5 100644 --- a/applications/main/subghz/helpers/subghz_gen_info.c +++ b/applications/main/subghz/helpers/subghz_gen_info.c @@ -38,6 +38,16 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .data.bits = 24, .data.te = 400}; break; + case SetTypeZKTeco430: + gen_info = (GenInfo){ + .type = GenData, + .mod = "AM650", + .freq = 430500000, + .data.name = SUBGHZ_PROTOCOL_PRINCETON_NAME, + .data.key = (key & 0x00FFFF00) | 0x30, // btn 0x30(UP), 0x03(STOP), 0x0C(DOWN) + .data.bits = 24, + .data.te = 357}; + break; case SetTypeNiceFlo12bit: gen_info = (GenInfo){ .type = GenData, diff --git a/applications/main/subghz/scenes/subghz_scene_set_counter.c b/applications/main/subghz/scenes/subghz_scene_set_counter.c index f66152a7c..9afa3408c 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_counter.c +++ b/applications/main/subghz/scenes/subghz_scene_set_counter.c @@ -107,7 +107,8 @@ bool subghz_scene_set_counter_on_event(void* context, SceneManagerEvent event) { 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); + 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); diff --git a/applications/main/subghz/scenes/subghz_scene_set_key.c b/applications/main/subghz/scenes/subghz_scene_set_key.c index b617b1a0f..690c62182 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_key.c +++ b/applications/main/subghz/scenes/subghz_scene_set_key.c @@ -44,7 +44,6 @@ bool subghz_scene_set_key_on_event(void* context, SceneManagerEvent event) { if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { - if(subghz->gen_info->type == GenData) { subghz->gen_info->data.key = __bswap64(subghz->gen_info->data.key); diff --git a/applications/main/subghz/scenes/subghz_scene_set_seed.c b/applications/main/subghz/scenes/subghz_scene_set_seed.c index 3e4a33536..c858b2a17 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_seed.c +++ b/applications/main/subghz/scenes/subghz_scene_set_seed.c @@ -60,7 +60,6 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { bool generated_protocol = false; if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { - switch(subghz->gen_info->type) { case GenFaacSLH: subghz->gen_info->faac_slh.seed = __bswap32(subghz->gen_info->faac_slh.seed); diff --git a/applications/main/subghz/scenes/subghz_scene_set_serial.c b/applications/main/subghz/scenes/subghz_scene_set_serial.c index bedb0d1cc..5c3b76733 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_serial.c +++ b/applications/main/subghz/scenes/subghz_scene_set_serial.c @@ -95,25 +95,32 @@ bool subghz_scene_set_serial_on_event(void* context, SceneManagerEvent event) { 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); + 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); + 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); + 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); + 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); + 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); + 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); + subghz->gen_info->phoenix_v2.serial = + __bswap32(subghz->gen_info->phoenix_v2.serial); break; // Not needed for these types case GenData: diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c index f493954bc..93419a974 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_type.c +++ b/applications/main/subghz/scenes/subghz_scene_set_type.c @@ -68,6 +68,7 @@ static const char* submenu_names[SetTypeMAX] = { [SetTypeCAMESpace] = "KL: CAME Space 433MHz", [SetTypePricenton315] = "Princeton 315MHz", [SetTypePricenton433] = "Princeton 433MHz", + [SetTypeZKTeco430] = "ZKTeco 430MHz", [SetTypeGangQi_433] = "GangQi 433MHz", [SetTypeHollarm_433] = "Hollarm 433MHz", [SetTypeReversRB2_433] = "Revers RB2 433MHz", diff --git a/applications/main/subghz_remote b/applications/main/subghz_remote index ee887fb77..25ff072cc 160000 --- a/applications/main/subghz_remote +++ b/applications/main/subghz_remote @@ -1 +1 @@ -Subproject commit ee887fb77484fb8a06a5f346e9f41d81ab5ec9e3 +Subproject commit 25ff072cc7f90a4af3a8b43bb418bb74dcf9da41