From 8deb29a8ff328205071d92a3792da4d1a77dfdcc Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 28 Feb 2023 21:45:55 +0300
Subject: [PATCH] Fix #370 and fix other protocol counter

---
 lib/subghz/protocols/faac_slh.c   | 6 +-----
 lib/subghz/protocols/secplus_v2.c | 7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/subghz/protocols/faac_slh.c b/lib/subghz/protocols/faac_slh.c
index 6918101a9..4b69ae73d 100644
--- a/lib/subghz/protocols/faac_slh.c
+++ b/lib/subghz/protocols/faac_slh.c
@@ -110,11 +110,7 @@ void subghz_protocol_encoder_faac_slh_free(void* context) {
 }
 
 static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* instance) {
-    if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
-        instance->generic.cnt = 0;
-    } else {
-        instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
-    }
+    instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
     uint32_t fix = instance->generic.serial << 4 | instance->generic.btn;
     uint32_t hop = 0;
     uint32_t decrypt = 0;
diff --git a/lib/subghz/protocols/secplus_v2.c b/lib/subghz/protocols/secplus_v2.c
index 593be0494..9f8c31654 100644
--- a/lib/subghz/protocols/secplus_v2.c
+++ b/lib/subghz/protocols/secplus_v2.c
@@ -379,11 +379,8 @@ static void subghz_protocol_secplus_v2_encode(SubGhzProtocolEncoderSecPlus_v2* i
     uint8_t roll_1[9] = {0};
     uint8_t roll_2[9] = {0};
 
-    if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
-        instance->generic.cnt = 0;
-    } else {
-        instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
-    }
+    instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
+
     //ToDo it is not known what value the counter starts
     if(instance->generic.cnt > 0xFFFFFFF) instance->generic.cnt = 0xE500000;
     uint32_t rolling = subghz_protocol_blocks_reverse_key(instance->generic.cnt, 28);