From 092d1370d37a522718d29599dd7e6352eccdb7d8 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 10 Feb 2026 23:46:32 +0300 Subject: [PATCH] fix missing define checks and logs removal --- protocols/fiat_v0.h | 2 ++ protocols/ford_v0.h | 2 ++ protocols/kia_v0.h | 2 ++ protocols/kia_v1.h | 2 ++ protocols/kia_v2.h | 2 ++ protocols/kia_v3_v4.h | 2 ++ protocols/kia_v5.h | 2 ++ protocols/kia_v6.h | 2 ++ protocols/psa.c | 4 ++++ protocols/psa.h | 2 ++ protocols/scher_khan.h | 2 ++ protocols/star_line.h | 2 ++ protocols/subaru.h | 2 ++ protocols/suzuki.h | 2 ++ protocols/vag.c | 41 +++++++++++++++++++++++++++++++---------- protocols/vag.h | 2 ++ 16 files changed, 63 insertions(+), 10 deletions(-) diff --git a/protocols/fiat_v0.h b/protocols/fiat_v0.h index 98dd232..0f4db08 100644 --- a/protocols/fiat_v0.h +++ b/protocols/fiat_v0.h @@ -10,6 +10,8 @@ #include #include +#include "../defines.h" + #define FIAT_PROTOCOL_V0_NAME "Fiat V0" typedef struct SubGhzProtocolDecoderFiatV0 SubGhzProtocolDecoderFiatV0; diff --git a/protocols/ford_v0.h b/protocols/ford_v0.h index 8d2d37c..fe07299 100644 --- a/protocols/ford_v0.h +++ b/protocols/ford_v0.h @@ -11,6 +11,8 @@ #include #include +#include "../defines.h" + #define FORD_PROTOCOL_V0_NAME "Ford V0" extern const SubGhzProtocol ford_protocol_v0; diff --git a/protocols/kia_v0.h b/protocols/kia_v0.h index 00da60c..9427896 100644 --- a/protocols/kia_v0.h +++ b/protocols/kia_v0.h @@ -2,6 +2,8 @@ #include "kia_generic.h" +#include "../defines.h" + #define KIA_PROTOCOL_V0_NAME "Kia V0" typedef struct SubGhzProtocolDecoderKIA SubGhzProtocolDecoderKIA; diff --git a/protocols/kia_v1.h b/protocols/kia_v1.h index 6a1fc1a..8eb5c4a 100644 --- a/protocols/kia_v1.h +++ b/protocols/kia_v1.h @@ -2,6 +2,8 @@ #include "kia_generic.h" +#include "../defines.h" + #define KIA_PROTOCOL_V1_NAME "Kia V1" typedef struct SubGhzProtocolDecoderKiaV1 SubGhzProtocolDecoderKiaV1; diff --git a/protocols/kia_v2.h b/protocols/kia_v2.h index 8aca37d..934d4ef 100644 --- a/protocols/kia_v2.h +++ b/protocols/kia_v2.h @@ -4,6 +4,8 @@ #include #include "protocols_common.h" +#include "../defines.h" + #define KIA_PROTOCOL_V2_NAME "Kia V2" typedef struct SubGhzProtocolDecoderKiaV2 SubGhzProtocolDecoderKiaV2; diff --git a/protocols/kia_v3_v4.h b/protocols/kia_v3_v4.h index 1dda504..202b794 100644 --- a/protocols/kia_v3_v4.h +++ b/protocols/kia_v3_v4.h @@ -2,6 +2,8 @@ #include "kia_generic.h" +#include "../defines.h" + #define KIA_PROTOCOL_V3_V4_NAME "Kia V3/V4" extern const SubGhzProtocol kia_protocol_v3_v4; diff --git a/protocols/kia_v5.h b/protocols/kia_v5.h index b442b3d..b0684ec 100644 --- a/protocols/kia_v5.h +++ b/protocols/kia_v5.h @@ -3,6 +3,8 @@ #include "kia_generic.h" #include +#include "../defines.h" + #define KIA_PROTOCOL_V5_NAME "Kia V5" typedef struct SubGhzProtocolDecoderKiaV5 SubGhzProtocolDecoderKiaV5; diff --git a/protocols/kia_v6.h b/protocols/kia_v6.h index b41b821..e7c7406 100644 --- a/protocols/kia_v6.h +++ b/protocols/kia_v6.h @@ -12,6 +12,8 @@ #include #include "kia_generic.h" +#include "../defines.h" + #define KIA_PROTOCOL_V6_NAME "Kia V6" typedef struct SubGhzProtocolDecoderKiaV6 SubGhzProtocolDecoderKiaV6; diff --git a/protocols/psa.c b/protocols/psa.c index 36b0464..4f72dd0 100644 --- a/protocols/psa.c +++ b/protocols/psa.c @@ -207,11 +207,15 @@ static void psa_build_buffer_mode23( buffer[8] = (uint8_t)(instance->button & 0xF); uint8_t original_buffer9 = 0; +#ifndef REMOVE_LOGS uint8_t original_buffer8 = 0; +#endif bool has_original_key2 = (instance->key2_low != 0); if(has_original_key2) { original_buffer9 = (uint8_t)(instance->key2_low & 0xFF); +#ifndef REMOVE_LOGS original_buffer8 = (uint8_t)((instance->key2_low >> 8) & 0xFF); +#endif buffer[9] = original_buffer9; FURI_LOG_D( TAG, diff --git a/protocols/psa.h b/protocols/psa.h index df55b02..29ef96d 100644 --- a/protocols/psa.h +++ b/protocols/psa.h @@ -10,6 +10,8 @@ #include #include +#include "../defines.h" + #define PSA_PROTOCOL_NAME "PSA" typedef struct SubGhzProtocolDecoderPSA SubGhzProtocolDecoderPSA; diff --git a/protocols/scher_khan.h b/protocols/scher_khan.h index 02025dd..4738d73 100644 --- a/protocols/scher_khan.h +++ b/protocols/scher_khan.h @@ -10,6 +10,8 @@ #include #include +#include "../defines.h" + #define SUBGHZ_PROTOCOL_SCHER_KHAN_NAME "Scher-Khan" typedef struct SubGhzProtocolDecoderScherKhan SubGhzProtocolDecoderScherKhan; diff --git a/protocols/star_line.h b/protocols/star_line.h index ccd25a1..c54eeab 100644 --- a/protocols/star_line.h +++ b/protocols/star_line.h @@ -10,6 +10,8 @@ #include #include +#include "../defines.h" + #define SUBGHZ_PROTOCOL_STAR_LINE_NAME "Star Line" typedef struct SubGhzProtocolDecoderStarLine SubGhzProtocolDecoderStarLine; diff --git a/protocols/subaru.h b/protocols/subaru.h index 7b45bd6..5464730 100644 --- a/protocols/subaru.h +++ b/protocols/subaru.h @@ -10,6 +10,8 @@ #include #include +#include "../defines.h" + #define SUBARU_PROTOCOL_NAME "Subaru" extern const SubGhzProtocol subaru_protocol; diff --git a/protocols/suzuki.h b/protocols/suzuki.h index f0b1a82..b217cb5 100644 --- a/protocols/suzuki.h +++ b/protocols/suzuki.h @@ -10,6 +10,8 @@ #include #include +#include "../defines.h" + #define SUZUKI_PROTOCOL_NAME "Suzuki" extern const SubGhzProtocol suzuki_protocol; diff --git a/protocols/vag.c b/protocols/vag.c index 6457497..aaa2f2c 100644 --- a/protocols/vag.c +++ b/protocols/vag.c @@ -226,8 +226,9 @@ static void vag_parse_data(SubGhzProtocolDecoderVAG* instance) { key1_bytes[6] = (uint8_t)(key1_low >> 8); key1_bytes[7] = (uint8_t)(key1_low); +#ifndef REMOVE_LOGS uint8_t type_byte = key1_bytes[0]; - +#endif uint8_t block[8]; block[0] = key1_bytes[1]; block[1] = key1_bytes[2]; @@ -1203,7 +1204,9 @@ static void vag_encoder_build_type1(SubGhzProtocolEncoderVAG* instance) { FURI_LOG_D(TAG, "Preamble: %zu pulses (220 cycles + 2 sync)", index); uint16_t prefix = 0xAF3F; +#ifndef REMOVE_LOGS size_t prefix_start = index; +#endif for(int i = 15; i >= 0; i--) { bool bit = (prefix >> i) & 1; if(bit) { @@ -1226,7 +1229,9 @@ static void vag_encoder_build_type1(SubGhzProtocolEncoderVAG* instance) { (unsigned long)(key1_inv >> 32), (unsigned long)(key1_inv & 0xFFFFFFFF)); +#ifndef REMOVE_LOGS size_t key1_start = index; +#endif for(int i = 63; i >= 0; i--) { bool bit = (key1_inv >> i) & 1; if(bit) { @@ -1242,8 +1247,9 @@ static void vag_encoder_build_type1(SubGhzProtocolEncoderVAG* instance) { uint16_t key2 = (uint16_t)(instance->key2_low & 0xFFFF); uint16_t key2_inv = ~key2; FURI_LOG_D(TAG, "Key2: %04X -> inverted: %04X", key2, key2_inv); - +#ifndef REMOVE_LOGS size_t key2_start = index; +#endif for(int i = 15; i >= 0; i--) { bool bit = (key2_inv >> i) & 1; if(bit) { @@ -1358,7 +1364,9 @@ static void vag_encoder_build_type2(SubGhzProtocolEncoderVAG* instance) { FURI_LOG_D(TAG, "Preamble: %zu pulses (220 cycles + 2 sync)", index); uint16_t prefix = 0xAF1C; +#ifndef REMOVE_LOGS size_t prefix_start = index; +#endif for(int i = 15; i >= 0; i--) { bool bit = (prefix >> i) & 1; if(bit) { @@ -1380,8 +1388,9 @@ static void vag_encoder_build_type2(SubGhzProtocolEncoderVAG* instance) { (unsigned long)(key1 & 0xFFFFFFFF), (unsigned long)(key1_inv >> 32), (unsigned long)(key1_inv & 0xFFFFFFFF)); - +#ifndef REMOVE_LOGS size_t key1_start = index; +#endif for(int i = 63; i >= 0; i--) { bool bit = (key1_inv >> i) & 1; if(bit) { @@ -1397,8 +1406,9 @@ static void vag_encoder_build_type2(SubGhzProtocolEncoderVAG* instance) { uint16_t key2 = (uint16_t)(instance->key2_low & 0xFFFF); uint16_t key2_inv = ~key2; FURI_LOG_D(TAG, "Key2: %04X -> inverted: %04X", key2, key2_inv); - +#ifndef REMOVE_LOGS size_t key2_start = index; +#endif for(int i = 15; i >= 0; i--) { bool bit = (key2_inv >> i) & 1; if(bit) { @@ -1499,7 +1509,7 @@ static void vag_encoder_build_type3_4(SubGhzProtocolEncoderVAG* instance) { (unsigned long)(key1 >> 32), (unsigned long)(key1 & 0xFFFFFFFF)); FURI_LOG_D(TAG, "Key2: %04X (NOT inverted for Type 3/4)", key2); - +#ifndef REMOVE_LOGS uint8_t key1_byte6 = (key1 >> 8) & 0xFF; uint8_t key1_byte7 = key1 & 0xFF; FURI_LOG_D( @@ -1523,10 +1533,11 @@ static void vag_encoder_build_type3_4(SubGhzProtocolEncoderVAG* instance) { (key1_byte7 >> 2) & 1, (key1_byte7 >> 1) & 1, (key1_byte7 >> 0) & 1); - +#endif for(int repeat = 0; repeat < 2; repeat++) { +#ifndef REMOVE_LOGS size_t repeat_start = index; - +#endif for(int i = 0; i < 45; i++) { upload[index++] = level_duration_make(true, 500); upload[index++] = level_duration_make(false, 500); @@ -1541,27 +1552,35 @@ static void vag_encoder_build_type3_4(SubGhzProtocolEncoderVAG* instance) { upload[index++] = level_duration_make(true, 750); upload[index++] = level_duration_make(false, 750); } - +#ifndef REMOVE_LOGS size_t key1_start = index; uint8_t consecutive_same = 0; + bool prev_level = true; +#endif for(int i = 63; i >= 0; i--) { bool bit = (key1 >> i) & 1; +#ifndef REMOVE_LOGS bool first_level = bit ? true : false; if(first_level == prev_level) { consecutive_same++; } +#endif if(bit) { upload[index++] = level_duration_make(true, 500); upload[index++] = level_duration_make(false, 500); +#ifndef REMOVE_LOGS prev_level = false; +#endif } else { upload[index++] = level_duration_make(false, 500); upload[index++] = level_duration_make(true, 500); +#ifndef REMOVE_LOGS prev_level = true; +#endif } } FURI_LOG_D( @@ -1570,8 +1589,9 @@ static void vag_encoder_build_type3_4(SubGhzProtocolEncoderVAG* instance) { repeat + 1, index - key1_start, consecutive_same); - +#ifndef REMOVE_LOGS size_t key2_start = index; +#endif bool last_level = false; for(int i = 15; i >= 0; i--) { bool bit = (key2 >> i) & 1; @@ -1883,8 +1903,9 @@ SubGhzProtocolStatus "Could not decode original signal - check if keys are loaded and Type is correct"); } } - +#ifndef REMOVE_LOGS uint32_t old_cnt = instance->cnt; +#endif instance->cnt = (instance->cnt + 1) & 0xFFFFFF; FURI_LOG_I( TAG, diff --git a/protocols/vag.h b/protocols/vag.h index 776390e..987c615 100644 --- a/protocols/vag.h +++ b/protocols/vag.h @@ -11,6 +11,8 @@ #include #include +#include "../defines.h" + #define VAG_PROTOCOL_NAME "VAG" extern const SubGhzProtocol vag_protocol;