From d74c5fb1494b9d772a0b409e923bc73dfff5fb38 Mon Sep 17 00:00:00 2001
From: r3df0xx <daniel@dogaru.org>
Date: Sun, 20 Mar 2022 18:55:06 +0300
Subject: [PATCH] Update nice_flor_s.c

Check if counter++ works
---
 lib/subghz/protocols/nice_flor_s.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/lib/subghz/protocols/nice_flor_s.c b/lib/subghz/protocols/nice_flor_s.c
index dc5b58d10..f55bc8a9c 100644
--- a/lib/subghz/protocols/nice_flor_s.c
+++ b/lib/subghz/protocols/nice_flor_s.c
@@ -99,6 +99,13 @@ void subghz_protocol_encoder_nice_flor_s_free(void* context) {
     free(instance);
 }
 
+static bool subghz_protocol_nice_flor_s_gen_data(SubGhzProtocolEncoderNiceFlorS* instance, uint8_t btn, const char* file_name) {
+    instance->generic.cnt++;
+    uint64_t data_to_encrypt = btn | instance->generic.serial | instance->generic.cnt;
+    instance->generic.data = subghz_protocol_nice_flor_s_encrypt(data_to_encrypt, file_name);
+    return true;
+}
+
 bool subghz_protocol_nice_flor_s_create_data(
     void* context,
     FlipperFormat* flipper_format,
@@ -110,15 +117,15 @@ bool subghz_protocol_nice_flor_s_create_data(
     const char* file_name) {
     furi_assert(context);
     SubGhzProtocolEncoderNiceFlorS* instance = context;
-    instance->generic.btn = btn;
     instance->generic.serial = serial;
     instance->generic.cnt = cnt;
     instance->generic.data_count_bit = 52;
-    instance->generic.cnt++;
-    uint64_t data_to_encrypt = btn | instance->generic.serial | instance->generic.cnt;
-    instance->generic.data = subghz_protocol_nice_flor_s_encrypt(data_to_encrypt, file_name);
-    subghz_block_generic_serialize(&instance->generic, flipper_format, frequency, preset);
-    return true;
+    bool res = subghz_protocol_nice_flor_s_gen_data(instance, btn, file_name);
+    if (res) {
+        res = 
+            subghz_block_generic_serialize(&instance->generic, flipper_format, frequency, preset);
+    }
+    return res;
 }
 
 /**
@@ -127,9 +134,16 @@ bool subghz_protocol_nice_flor_s_create_data(
  * @return true On success
  */
 static bool
-    subghz_protocol_encoder_nice_flor_s_get_upload(SubGhzProtocolEncoderNiceFlorS* instance, uint8_t btn) {
+    subghz_protocol_encoder_nice_flor_s_get_upload(SubGhzProtocolEncoderNiceFlorS* instance, uint8_t btn, const char* file_name) {
     furi_assert(instance);
 
+    //gen new key
+    if(subghz_protocol_nice_flor_s_gen_data(instance, btn, file_name)) {
+        //ToDo if you need to add a callback to automatically update the data on the display
+    } else {
+        return false;
+    }
+
     size_t index = 0;
     size_t size_upload = (instance->generic.data_count_bit * 2) + ((35 + 2 + 2) * 2);
     if(size_upload > instance->encoder.size_upload) {