diff --git a/CHANGELOG.md b/CHANGELOG.md index 306253d4f..ce868c071 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,8 @@ - UL: Keeloq Comunello add manually support (by @xMasterX) - UL: Add variant of 'Add Manually' menu with manual editing for each value (by @MrLego8-9) - UL: Add ZKTeco 430.5 MHz add manually support (by @xMasterX) + - UL: Add Elplast 18bit static code protocol (hello Hackcat ^_^) + - UL: Try to decode BFT (2 buttons remotes only) on the fly in regular Read mode (by @xMasterX) - RFID: - Support writing Securakey, Jablotron and FDX-B to EM4305 cards (#434 by @jamisonderek) - OFW: Show ISO-3166 Country Names For Pet Chips (by @zinongli) @@ -147,6 +149,7 @@ - Fix read crash with unexpectedly large MFC AUTH(0) response, eg with Chameleon Ultra NTAG emualtion (by @WillyJL) - Fix slashes in prefilled filename (by @WillyJL) - FBT: Fix redundant decl for apps using an icon disabled in API (by @WillyJL) +- UL: Sub-GHz: Fix crash in add manually menu (by @xMasterX) - OFW: GUI: Fix Number Input Save Icon (by @zinongli) - OFW: JS: Stop PWM on exit (by @portasynthinca3) - OFW: Sub-GHz: Fix TIM17 config not applied immediately (by @Aerosnail) diff --git a/applications/main/subghz/helpers/subghz_gen_info.c b/applications/main/subghz/helpers/subghz_gen_info.c index 90853cec5..459f600ca 100644 --- a/applications/main/subghz/helpers/subghz_gen_info.c +++ b/applications/main/subghz/helpers/subghz_gen_info.c @@ -1,6 +1,7 @@ #include "subghz_gen_info.h" #include "../helpers/subghz_txrx_create_protocol_key.h" #include +#include void subghz_gen_info_reset(GenInfo* gen_info) { furi_assert(gen_info); @@ -233,7 +234,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .faac_slh.serial = ((key & 0x00FFFFF0) | 0xA0000006) >> 4, .faac_slh.btn = 0x06, .faac_slh.cnt = 0x02, - .faac_slh.seed = key, + .faac_slh.seed = (uint32_t)key, .faac_slh.manuf = "FAAC_SLH"}; break; case SetTypeFaacSLH_868: @@ -244,7 +245,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .faac_slh.serial = ((key & 0x00FFFFF0) | 0xA0000006) >> 4, .faac_slh.btn = 0x06, .faac_slh.cnt = 0x02, - .faac_slh.seed = (key & 0x0FFFFFFF), + .faac_slh.seed = (uint32_t)key, .faac_slh.manuf = "FAAC_SLH"}; break; case SetTypeBeninca433: 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 ad0047596..9b7ba8075 100644 --- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c +++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c @@ -422,7 +422,8 @@ void subghz_txrx_gen_serial_gangqi(uint64_t* result_key) { // Add bytesum to the end // serial | const_and_button - *result_key = (serial << 18) | (const_and_button << 10) | (bytesum << 2); + *result_key = ((uint64_t)serial << 18) | ((uint64_t)const_and_button << 10) | + ((uint64_t)bytesum << 2); } void subghz_txrx_gen_key_marantec(uint64_t* result_key) { diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c index 93419a974..d3bb2482e 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_type.c +++ b/applications/main/subghz/scenes/subghz_scene_set_type.c @@ -223,6 +223,8 @@ bool subghz_scene_set_type_generate_protocol_from_infos(SubGhz* subghz) { if(generated_protocol) { subghz_file_name_clear(subghz); + scene_manager_set_scene_state( + subghz->scene_manager, SubGhzSceneSetType, SubGhzCustomEventManagerSet); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName); } else { furi_string_set(subghz->error_str, "Function requires\nan SD card with\nfresh databases."); diff --git a/lib/subghz/protocols/elplast.c b/lib/subghz/protocols/elplast.c new file mode 100644 index 000000000..619ba9fd3 --- /dev/null +++ b/lib/subghz/protocols/elplast.c @@ -0,0 +1,324 @@ +#include "elplast.h" +#include "../blocks/const.h" +#include "../blocks/decoder.h" +#include "../blocks/encoder.h" +#include "../blocks/generic.h" +#include "../blocks/math.h" + +#define TAG "SubGhzProtocolElplast" + +static const SubGhzBlockConst subghz_protocol_elplast_const = { + .te_short = 230, + .te_long = 1550, + .te_delta = 160, + .min_count_bit_for_found = 18, +}; + +struct SubGhzProtocolDecoderElplast { + SubGhzProtocolDecoderBase base; + + SubGhzBlockDecoder decoder; + SubGhzBlockGeneric generic; +}; + +struct SubGhzProtocolEncoderElplast { + SubGhzProtocolEncoderBase base; + + SubGhzProtocolBlockEncoder encoder; + SubGhzBlockGeneric generic; +}; + +typedef enum { + ElplastDecoderStepReset = 0, + ElplastDecoderStepSaveDuration, + ElplastDecoderStepCheckDuration, +} ElplastDecoderStep; + +const SubGhzProtocolDecoder subghz_protocol_elplast_decoder = { + .alloc = subghz_protocol_decoder_elplast_alloc, + .free = subghz_protocol_decoder_elplast_free, + + .feed = subghz_protocol_decoder_elplast_feed, + .reset = subghz_protocol_decoder_elplast_reset, + + .get_hash_data = NULL, + .get_hash_data_long = subghz_protocol_decoder_elplast_get_hash_data, + .serialize = subghz_protocol_decoder_elplast_serialize, + .deserialize = subghz_protocol_decoder_elplast_deserialize, + .get_string = subghz_protocol_decoder_elplast_get_string, + .get_string_brief = NULL, +}; + +const SubGhzProtocolEncoder subghz_protocol_elplast_encoder = { + .alloc = subghz_protocol_encoder_elplast_alloc, + .free = subghz_protocol_encoder_elplast_free, + + .deserialize = subghz_protocol_encoder_elplast_deserialize, + .stop = subghz_protocol_encoder_elplast_stop, + .yield = subghz_protocol_encoder_elplast_yield, +}; + +const SubGhzProtocol subghz_protocol_elplast = { + .name = SUBGHZ_PROTOCOL_ELPLAST_NAME, + .type = SubGhzProtocolTypeStatic, + .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | + SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send, + + .decoder = &subghz_protocol_elplast_decoder, + .encoder = &subghz_protocol_elplast_encoder, +}; + +void* subghz_protocol_encoder_elplast_alloc(SubGhzEnvironment* environment) { + UNUSED(environment); + SubGhzProtocolEncoderElplast* instance = malloc(sizeof(SubGhzProtocolEncoderElplast)); + + instance->base.protocol = &subghz_protocol_elplast; + instance->generic.protocol_name = instance->base.protocol->name; + + instance->encoder.repeat = 10; + instance->encoder.size_upload = 256; + instance->encoder.upload = malloc(instance->encoder.size_upload * sizeof(LevelDuration)); + instance->encoder.is_running = false; + return instance; +} + +void subghz_protocol_encoder_elplast_free(void* context) { + furi_assert(context); + SubGhzProtocolEncoderElplast* instance = context; + free(instance->encoder.upload); + free(instance); +} + +/** + * Generating an upload from data. + * @param instance Pointer to a SubGhzProtocolEncoderElplast instance + */ +static void subghz_protocol_encoder_elplast_get_upload(SubGhzProtocolEncoderElplast* instance) { + furi_assert(instance); + size_t index = 0; + + // Send key and GAP + for(uint8_t i = instance->generic.data_count_bit; i > 0; i--) { + if(bit_read(instance->generic.data, i - 1)) { + // Send bit 1 + instance->encoder.upload[index++] = + level_duration_make(true, (uint32_t)subghz_protocol_elplast_const.te_long); + if(i == 1) { + //Send gap if bit was last + instance->encoder.upload[index++] = level_duration_make( + false, (uint32_t)subghz_protocol_elplast_const.te_long * 8); + } else { + instance->encoder.upload[index++] = + level_duration_make(false, (uint32_t)subghz_protocol_elplast_const.te_short); + } + } else { + // Send bit 0 + instance->encoder.upload[index++] = + level_duration_make(true, (uint32_t)subghz_protocol_elplast_const.te_short); + if(i == 1) { + //Send gap if bit was last + instance->encoder.upload[index++] = level_duration_make( + false, (uint32_t)subghz_protocol_elplast_const.te_long * 8); + } else { + instance->encoder.upload[index++] = + level_duration_make(false, (uint32_t)subghz_protocol_elplast_const.te_long); + } + } + } + + instance->encoder.size_upload = index; + return; +} + +SubGhzProtocolStatus + subghz_protocol_encoder_elplast_deserialize(void* context, FlipperFormat* flipper_format) { + furi_assert(context); + SubGhzProtocolEncoderElplast* instance = context; + SubGhzProtocolStatus ret = SubGhzProtocolStatusError; + do { + ret = subghz_block_generic_deserialize_check_count_bit( + &instance->generic, + flipper_format, + subghz_protocol_elplast_const.min_count_bit_for_found); + if(ret != SubGhzProtocolStatusOk) { + break; + } + //optional parameter parameter + flipper_format_read_uint32( + flipper_format, "Repeat", (uint32_t*)&instance->encoder.repeat, 1); + + subghz_protocol_encoder_elplast_get_upload(instance); + instance->encoder.is_running = true; + } while(false); + + return ret; +} + +void subghz_protocol_encoder_elplast_stop(void* context) { + SubGhzProtocolEncoderElplast* instance = context; + instance->encoder.is_running = false; +} + +LevelDuration subghz_protocol_encoder_elplast_yield(void* context) { + SubGhzProtocolEncoderElplast* instance = context; + + if(instance->encoder.repeat == 0 || !instance->encoder.is_running) { + instance->encoder.is_running = false; + return level_duration_reset(); + } + + LevelDuration ret = instance->encoder.upload[instance->encoder.front]; + + if(++instance->encoder.front == instance->encoder.size_upload) { + instance->encoder.repeat--; + instance->encoder.front = 0; + } + + return ret; +} + +void* subghz_protocol_decoder_elplast_alloc(SubGhzEnvironment* environment) { + UNUSED(environment); + SubGhzProtocolDecoderElplast* instance = malloc(sizeof(SubGhzProtocolDecoderElplast)); + instance->base.protocol = &subghz_protocol_elplast; + instance->generic.protocol_name = instance->base.protocol->name; + return instance; +} + +void subghz_protocol_decoder_elplast_free(void* context) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + free(instance); +} + +void subghz_protocol_decoder_elplast_reset(void* context) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + instance->decoder.parser_step = ElplastDecoderStepReset; +} + +void subghz_protocol_decoder_elplast_feed(void* context, bool level, volatile uint32_t duration) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + + // Elplast/P-11B/3BK/E.C.A Decoder + // 2025.09 - @xMasterX (MMX) + + // Key samples + // 00110010110000001010 = 32C0A + // 00110010110010000010 = 32C82 + + switch(instance->decoder.parser_step) { + case ElplastDecoderStepReset: + if((!level) && (DURATION_DIFF(duration, subghz_protocol_elplast_const.te_long * 8) < + subghz_protocol_elplast_const.te_delta * 13)) { + //Found GAP + instance->decoder.decode_data = 0; + instance->decoder.decode_count_bit = 0; + instance->decoder.parser_step = ElplastDecoderStepSaveDuration; + } + break; + case ElplastDecoderStepSaveDuration: + if(level) { + instance->decoder.te_last = duration; + instance->decoder.parser_step = ElplastDecoderStepCheckDuration; + } else { + instance->decoder.parser_step = ElplastDecoderStepReset; + } + break; + case ElplastDecoderStepCheckDuration: + if(!level) { + // Bit 1 is long and short timing = 1550us HIGH (te_last) and 230us LOW + if((DURATION_DIFF(instance->decoder.te_last, subghz_protocol_elplast_const.te_long) < + subghz_protocol_elplast_const.te_delta) && + (DURATION_DIFF(duration, subghz_protocol_elplast_const.te_short) < + subghz_protocol_elplast_const.te_delta)) { + subghz_protocol_blocks_add_bit(&instance->decoder, 1); + instance->decoder.parser_step = ElplastDecoderStepSaveDuration; + // Bit 0 is short and long timing = 230us HIGH (te_last) and 1550us LOW + } else if( + (DURATION_DIFF(instance->decoder.te_last, subghz_protocol_elplast_const.te_short) < + subghz_protocol_elplast_const.te_delta) && + (DURATION_DIFF(duration, subghz_protocol_elplast_const.te_long) < + subghz_protocol_elplast_const.te_delta)) { + subghz_protocol_blocks_add_bit(&instance->decoder, 0); + instance->decoder.parser_step = ElplastDecoderStepSaveDuration; + } else if( + // End of the key + DURATION_DIFF(duration, subghz_protocol_elplast_const.te_long * 8) < + subghz_protocol_elplast_const.te_delta * 13) { + //Found next GAP and add bit 0 or 1 (only bit 0 was found on the remotes) + if((DURATION_DIFF( + instance->decoder.te_last, subghz_protocol_elplast_const.te_long) < + subghz_protocol_elplast_const.te_delta)) { + subghz_protocol_blocks_add_bit(&instance->decoder, 1); + } + if((DURATION_DIFF( + instance->decoder.te_last, subghz_protocol_elplast_const.te_short) < + subghz_protocol_elplast_const.te_delta)) { + subghz_protocol_blocks_add_bit(&instance->decoder, 0); + } + // If got 18 bits key reading is finished + if(instance->decoder.decode_count_bit == + subghz_protocol_elplast_const.min_count_bit_for_found) { + instance->generic.data = instance->decoder.decode_data; + instance->generic.data_count_bit = instance->decoder.decode_count_bit; + if(instance->base.callback) + instance->base.callback(&instance->base, instance->base.context); + } + instance->decoder.decode_data = 0; + instance->decoder.decode_count_bit = 0; + instance->decoder.parser_step = ElplastDecoderStepReset; + } else { + instance->decoder.parser_step = ElplastDecoderStepReset; + } + } else { + instance->decoder.parser_step = ElplastDecoderStepReset; + } + break; + } +} + +uint32_t subghz_protocol_decoder_elplast_get_hash_data(void* context) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + return subghz_protocol_blocks_get_hash_data_long( + &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1); +} + +SubGhzProtocolStatus subghz_protocol_decoder_elplast_serialize( + void* context, + FlipperFormat* flipper_format, + SubGhzRadioPreset* preset) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + return subghz_block_generic_serialize(&instance->generic, flipper_format, preset); +} + +SubGhzProtocolStatus + subghz_protocol_decoder_elplast_deserialize(void* context, FlipperFormat* flipper_format) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + return subghz_block_generic_deserialize_check_count_bit( + &instance->generic, flipper_format, subghz_protocol_elplast_const.min_count_bit_for_found); +} + +void subghz_protocol_decoder_elplast_get_string(void* context, FuriString* output) { + furi_assert(context); + SubGhzProtocolDecoderElplast* instance = context; + + uint64_t code_found_reverse = subghz_protocol_blocks_reverse_key( + instance->generic.data, instance->generic.data_count_bit); + + uint32_t code_found_reverse_lo = code_found_reverse & 0x000003ffffffffff; + + furi_string_cat_printf( + output, + "%s %db\r\n" + "Key: 0x%05lX\r\n" + "Yek: 0x%05lX", + instance->generic.protocol_name, + instance->generic.data_count_bit, + (uint32_t)(instance->generic.data & 0xFFFFFF), + code_found_reverse_lo); +} diff --git a/lib/subghz/protocols/elplast.h b/lib/subghz/protocols/elplast.h new file mode 100644 index 000000000..ab68cb1cd --- /dev/null +++ b/lib/subghz/protocols/elplast.h @@ -0,0 +1,109 @@ +#pragma once + +#include "base.h" + +#define SUBGHZ_PROTOCOL_ELPLAST_NAME "Elplast" + +typedef struct SubGhzProtocolDecoderElplast SubGhzProtocolDecoderElplast; +typedef struct SubGhzProtocolEncoderElplast SubGhzProtocolEncoderElplast; + +extern const SubGhzProtocolDecoder subghz_protocol_elplast_decoder; +extern const SubGhzProtocolEncoder subghz_protocol_elplast_encoder; +extern const SubGhzProtocol subghz_protocol_elplast; + +/** + * Allocate SubGhzProtocolEncoderElplast. + * @param environment Pointer to a SubGhzEnvironment instance + * @return SubGhzProtocolEncoderElplast* pointer to a SubGhzProtocolEncoderElplast instance + */ +void* subghz_protocol_encoder_elplast_alloc(SubGhzEnvironment* environment); + +/** + * Free SubGhzProtocolEncoderElplast. + * @param context Pointer to a SubGhzProtocolEncoderElplast instance + */ +void subghz_protocol_encoder_elplast_free(void* context); + +/** + * Deserialize and generating an upload to send. + * @param context Pointer to a SubGhzProtocolEncoderElplast instance + * @param flipper_format Pointer to a FlipperFormat instance + * @return status + */ +SubGhzProtocolStatus + subghz_protocol_encoder_elplast_deserialize(void* context, FlipperFormat* flipper_format); + +/** + * Forced transmission stop. + * @param context Pointer to a SubGhzProtocolEncoderElplast instance + */ +void subghz_protocol_encoder_elplast_stop(void* context); + +/** + * Getting the level and duration of the upload to be loaded into DMA. + * @param context Pointer to a SubGhzProtocolEncoderElplast instance + * @return LevelDuration + */ +LevelDuration subghz_protocol_encoder_elplast_yield(void* context); + +/** + * Allocate SubGhzProtocolDecoderElplast. + * @param environment Pointer to a SubGhzEnvironment instance + * @return SubGhzProtocolDecoderElplast* pointer to a SubGhzProtocolDecoderElplast instance + */ +void* subghz_protocol_decoder_elplast_alloc(SubGhzEnvironment* environment); + +/** + * Free SubGhzProtocolDecoderElplast. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + */ +void subghz_protocol_decoder_elplast_free(void* context); + +/** + * Reset decoder SubGhzProtocolDecoderElplast. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + */ +void subghz_protocol_decoder_elplast_reset(void* context); + +/** + * Parse a raw sequence of levels and durations received from the air. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + * @param level Signal level true-high false-low + * @param duration Duration of this level in, us + */ +void subghz_protocol_decoder_elplast_feed(void* context, bool level, uint32_t duration); + +/** + * Getting the hash sum of the last randomly received parcel. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + * @return hash Hash sum + */ +uint32_t subghz_protocol_decoder_elplast_get_hash_data(void* context); + +/** + * Serialize data SubGhzProtocolDecoderElplast. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + * @param flipper_format Pointer to a FlipperFormat instance + * @param preset The modulation on which the signal was received, SubGhzRadioPreset + * @return status + */ +SubGhzProtocolStatus subghz_protocol_decoder_elplast_serialize( + void* context, + FlipperFormat* flipper_format, + SubGhzRadioPreset* preset); + +/** + * Deserialize data SubGhzProtocolDecoderElplast. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + * @param flipper_format Pointer to a FlipperFormat instance + * @return status + */ +SubGhzProtocolStatus + subghz_protocol_decoder_elplast_deserialize(void* context, FlipperFormat* flipper_format); + +/** + * Getting a textual representation of the received data. + * @param context Pointer to a SubGhzProtocolDecoderElplast instance + * @param output Resulting text + */ +void subghz_protocol_decoder_elplast_get_string(void* context, FuriString* output); diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c index 95149fff8..3777433ee 100644 --- a/lib/subghz/protocols/keeloq.c +++ b/lib/subghz/protocols/keeloq.c @@ -861,6 +861,13 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( } break; case KEELOQ_LEARNING_SECURE: + bool reset_seed_back = false; + if((strcmp(furi_string_get_cstr(manufacture_code->name), "BFT") == 0)) { + if(instance->seed == 0) { + instance->seed = (fix & 0xFFFFFFF); + reset_seed_back = true; + } + } man = subghz_protocol_keeloq_common_secure_learning( fix, instance->seed, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); @@ -868,6 +875,8 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( *manufacture_name = furi_string_get_cstr(manufacture_code->name); keystore->mfname = *manufacture_name; return 1; + } else { + if(reset_seed_back) instance->seed = 0; } break; case KEELOQ_LEARNING_MAGIC_XOR_TYPE_1: diff --git a/lib/subghz/protocols/protocol_items.c b/lib/subghz/protocols/protocol_items.c index 9966f941a..0f9da5ce1 100644 --- a/lib/subghz/protocols/protocol_items.c +++ b/lib/subghz/protocols/protocol_items.c @@ -83,6 +83,7 @@ const SubGhzProtocol* const subghz_protocol_registry_items[] = { &subghz_protocol_revers_rb2, &subghz_protocol_feron, &subghz_protocol_roger, + &subghz_protocol_elplast, }; const SubGhzProtocolRegistry subghz_protocol_registry = { diff --git a/lib/subghz/protocols/protocol_items.h b/lib/subghz/protocols/protocol_items.h index c3b9cc7f6..01e93b7d7 100644 --- a/lib/subghz/protocols/protocol_items.h +++ b/lib/subghz/protocols/protocol_items.h @@ -84,3 +84,4 @@ #include "revers_rb2.h" #include "feron.h" #include "roger.h" +#include "elplast.h"