Merge commit '97eaee54c8f12c0103487c7c5c8df6ba0b538e12' into mntm-dev

This commit is contained in:
WillyJL
2026-02-28 20:11:35 +01:00
68 changed files with 1118 additions and 388 deletions
+10 -3
View File
@@ -91,7 +91,7 @@ void* subghz_protocol_encoder_mastercode_alloc(SubGhzEnvironment* environment) {
instance->base.protocol = &subghz_protocol_mastercode;
instance->generic.protocol_name = instance->base.protocol->name;
instance->encoder.repeat = 10;
instance->encoder.repeat = 3;
instance->encoder.size_upload = 72;
instance->encoder.upload = malloc(instance->encoder.size_upload * sizeof(LevelDuration));
instance->encoder.is_running = false;
@@ -201,7 +201,7 @@ LevelDuration subghz_protocol_encoder_mastercode_yield(void* context) {
LevelDuration ret = instance->encoder.upload[instance->encoder.front];
if(++instance->encoder.front == instance->encoder.size_upload) {
instance->encoder.repeat--;
if(!subghz_block_generic_global.endless_tx) instance->encoder.repeat--;
instance->encoder.front = 0;
}
@@ -345,10 +345,17 @@ void subghz_protocol_decoder_mastercode_get_string(void* context, FuriString* ou
furi_assert(context);
SubGhzProtocolDecoderMastercode* instance = context;
subghz_protocol_mastercode_check_remote_controller(&instance->generic);
// push protocol data to global variable
subghz_block_generic_global.btn_is_available = false;
subghz_block_generic_global.current_btn = instance->generic.btn;
subghz_block_generic_global.btn_length_bit = 2;
//
furi_string_cat_printf(
output,
"%s %dbit\r\n"
"Key:%llX Btn %X\r\n"
"Key:%llX Btn:%X\r\n"
" +: " DIP_PATTERN "\r\n"
" o: " DIP_PATTERN "\r\n"
" -: " DIP_PATTERN "\r\n",