From 0b92e5ae74c64e1e67c513b928134b6673c1921d Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Wed, 18 Jan 2023 19:16:20 +0300 Subject: [PATCH] Fix various issues --- lib/subghz/protocols/somfy_telis.c | 11 +++++------ lib/subghz/protocols/somfy_telis.h | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/subghz/protocols/somfy_telis.c b/lib/subghz/protocols/somfy_telis.c index 0952ff2ff..689cbf583 100644 --- a/lib/subghz/protocols/somfy_telis.c +++ b/lib/subghz/protocols/somfy_telis.c @@ -31,8 +31,6 @@ struct SubGhzProtocolEncoderSomfyTelis { SubGhzProtocolBlockEncoder encoder; SubGhzBlockGeneric generic; - - SubGhzKeystore* keystore; }; typedef enum { @@ -76,11 +74,11 @@ const SubGhzProtocol subghz_protocol_somfy_telis = { }; void* subghz_protocol_encoder_somfy_telis_alloc(SubGhzEnvironment* environment) { + UNUSED(environment); SubGhzProtocolEncoderSomfyTelis* instance = malloc(sizeof(SubGhzProtocolEncoderSomfyTelis)); instance->base.protocol = &subghz_protocol_somfy_telis; instance->generic.protocol_name = instance->base.protocol->name; - instance->keystore = subghz_environment_get_keystore(environment); instance->encoder.repeat = 10; instance->encoder.size_upload = 512; @@ -641,14 +639,15 @@ void subghz_protocol_decoder_somfy_telis_get_string(void* context, FuriString* o furi_string_cat_printf( output, "%s %db\r\n" - "Key:0x%X\r\n" - "Address:0x%03lX \r\n" + "Key:0x%lX%08lX\r\n" + "Sn:0x%06lX \r\n" "Cnt:0x%04lX\r\n" "Btn:%s\r\n", instance->generic.protocol_name, instance->generic.data_count_bit, - (uint16_t)(instance->generic.data >> 48), + (uint32_t)(instance->generic.data >> 32), + (uint32_t)instance->generic.data, instance->generic.serial, instance->generic.cnt, subghz_protocol_somfy_telis_get_name_button(instance->generic.btn)); diff --git a/lib/subghz/protocols/somfy_telis.h b/lib/subghz/protocols/somfy_telis.h index 3d5cd22f1..b5e989866 100644 --- a/lib/subghz/protocols/somfy_telis.h +++ b/lib/subghz/protocols/somfy_telis.h @@ -14,7 +14,7 @@ extern const SubGhzProtocol subghz_protocol_somfy_telis; /** * Allocate SubGhzProtocolEncoderSomfyTelis. * @param environment Pointer to a SubGhzEnvironment instance - * @return SubGhzProtocolEncoderSomfyTelis* pointer to a SubGhzProtocolEncoderSSomfyTelis instance + * @return SubGhzProtocolEncoderSomfyTelis* pointer to a SubGhzProtocolEncoderSomfyTelis instance */ void* subghz_protocol_encoder_somfy_telis_alloc(SubGhzEnvironment* environment); @@ -31,7 +31,6 @@ void subghz_protocol_encoder_somfy_telis_free(void* context); * @param serial Serial number, 24 bit * @param btn Button number, 8 bit * @param cnt Counter value, 16 bit - * @param manufacture_name Name of manufacturer's key * @param preset Modulation, SubGhzRadioPreset * @return true On success */