Nice One manual adding support

applications/main/subghz/helpers/subghz_custom_event.h

@@ -13,6 +13,7 @@ typedef enum {
     SubmenuIndexNiceFlo12bit,
     SubmenuIndexNiceFlo24bit,
     SubmenuIndexNiceFlorS_433_92,
+    SubmenuIndexNiceOne_433_92,
     SubmenuIndexNiceSmilo_433_92,
     SubmenuIndexCAME12bit,
     SubmenuIndexCAME24bit,

applications/main/subghz/scenes/subghz_scene_set_type.c

@@ -115,6 +115,12 @@ void subghz_scene_set_type_on_enter(void* context) {
         SubmenuIndexNiceFlorS_433_92,
         subghz_scene_set_type_submenu_callback,
         subghz);
+    submenu_add_item(
+        subghz->submenu,
+        "Nice One 433MHz",
+        SubmenuIndexNiceOne_433_92,
+        subghz_scene_set_type_submenu_callback,
+        subghz);
     submenu_add_item(
         subghz->submenu,
         "CAME 12bit 433MHz",
@@ -367,7 +373,33 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                     key & 0x0FFFFFFF,
                     0x1,
                     0x0003,
-                    subghz->txrx->preset);
+                    subghz->txrx->preset,
+                    false);
+                generated_protocol = true;
+            } else {
+                generated_protocol = false;
+            }
+            subghz_transmitter_free(subghz->txrx->transmitter);
+            if(!generated_protocol) {
+                furi_string_set(
+                    subghz->error_str, "Function requires\nan SD card with\nfresh databases.");
+                scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowError);
+            }
+            break;
+        case SubmenuIndexNiceOne_433_92:
+            subghz->txrx->transmitter = subghz_transmitter_alloc_init(
+                subghz->txrx->environment, SUBGHZ_PROTOCOL_NICE_FLOR_S_NAME);
+            subghz_preset_init(
+                subghz, "AM650", subghz_setting_get_default_frequency(subghz->setting), NULL, 0);
+            if(subghz->txrx->transmitter) {
+                subghz_protocol_nice_flor_s_create_data(
+                    subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
+                    subghz->txrx->fff_data,
+                    key & 0x0FFFFFFF,
+                    0x1,
+                    0x0003,
+                    subghz->txrx->preset,
+                    true);
                 generated_protocol = true;
             } else {
                 generated_protocol = false;

firmware/targets/f7/api_symbols.csv

@@ -3197,7 +3197,7 @@ Function,-,subghz_protocol_encoder_star_line_yield,LevelDuration,void*
 Function,-,subghz_protocol_faac_slh_create_data,_Bool,"void*, FlipperFormat*, uint32_t, uint8_t, uint32_t, uint32_t, const char*, SubGhzRadioPreset*"
 Function,-,subghz_protocol_keeloq_bft_create_data,_Bool,"void*, FlipperFormat*, uint32_t, uint8_t, uint16_t, uint32_t, const char*, SubGhzRadioPreset*"
 Function,-,subghz_protocol_keeloq_create_data,_Bool,"void*, FlipperFormat*, uint32_t, uint8_t, uint16_t, const char*, SubGhzRadioPreset*"
-Function,-,subghz_protocol_nice_flor_s_create_data,_Bool,"void*, FlipperFormat*, uint32_t, uint8_t, uint16_t, SubGhzRadioPreset*"
+Function,-,subghz_protocol_nice_flor_s_create_data,_Bool,"void*, FlipperFormat*, uint32_t, uint8_t, uint16_t, SubGhzRadioPreset*, _Bool"
 Function,-,subghz_protocol_nice_flor_s_encrypt,uint64_t,"uint64_t, const char*"
 Function,+,subghz_protocol_raw_file_encoder_worker_set_callback_end,void,"SubGhzProtocolEncoderRAW*, SubGhzProtocolEncoderRAWCallbackEnd, void*"
 Function,+,subghz_protocol_raw_gen_fff_data,void,"FlipperFormat*, const char*"

lib/subghz/blocks/generic.c

@@ -78,6 +78,16 @@ bool subghz_block_generic_serialize(
             FURI_LOG_E(TAG, "Unable to add Key");
             break;
         }
+
+        // Nice One - Manual adding support
+        if(instance->data_count_bit == 72 &&
+           (strcmp(instance->protocol_name, "Nice FloR-S") == 0)) {
+            uint32_t temp = (instance->data_2 >> 4) & 0xFFFFF;
+            if(!flipper_format_write_uint32(flipper_format, "Data", &temp, 1)) {
+                FURI_LOG_E(TAG, "Unable to add Data");
+                break;
+            }
+        }
         res = true;
     } while(false);
     furi_string_free(temp_str);

lib/subghz/protocols/nice_flor_s.c

@@ -543,18 +543,36 @@ bool subghz_protocol_nice_flor_s_create_data(
     uint32_t serial,
     uint8_t btn,
     uint16_t cnt,
-    SubGhzRadioPreset* preset) {
+    SubGhzRadioPreset* preset,
+    bool nice_one) {
     furi_assert(context);
     SubGhzProtocolEncoderNiceFlorS* instance = context;
     instance->generic.serial = serial;
     instance->generic.cnt = cnt;
-    instance->generic.data_count_bit = 52;
+    if(nice_one) {
+        instance->generic.data_count_bit = NICE_ONE_COUNT_BIT;
+    } else {
+        instance->generic.data_count_bit = 52;
+    }
     uint64_t decrypt = ((uint64_t)instance->generic.serial << 16) | instance->generic.cnt;
     uint64_t enc_part = subghz_protocol_nice_flor_s_encrypt(
         decrypt, instance->nice_flor_s_rainbow_table_file_name);
     uint8_t byte = btn << 4 | (0xF ^ btn ^ 0x3);
     instance->generic.data = (uint64_t)byte << 44 | enc_part;
 
+    if(instance->generic.data_count_bit == NICE_ONE_COUNT_BIT) {
+        uint8_t add_data[10] = {0};
+        for(size_t i = 0; i < 7; i++) {
+            add_data[i] = (instance->generic.data >> (48 - i * 8)) & 0xFF;
+        }
+        subghz_protocol_nice_one_get_data(add_data, 0, 0);
+        instance->generic.data_2 = 0;
+        for(size_t j = 7; j < 10; j++) {
+            instance->generic.data_2 <<= 8;
+            instance->generic.data_2 += add_data[j];
+        }
+    }
+
     bool res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
 
     return res;

lib/subghz/protocols/nice_flor_s.h

@@ -63,6 +63,7 @@ uint64_t subghz_protocol_nice_flor_s_encrypt(uint64_t data, const char* file_nam
  * @param btn Button number, 4 bit
  * @param cnt Counter value, 16 bit
  * @param preset Modulation, SubGhzRadioPreset
+ * @param nice_one Nice One if true, Nice Flor S if false
  * @return true On success
  */
 bool subghz_protocol_nice_flor_s_create_data(
@@ -71,7 +72,8 @@ bool subghz_protocol_nice_flor_s_create_data(
     uint32_t serial,
     uint8_t btn,
     uint16_t cnt,
-    SubGhzRadioPreset* preset);
+    SubGhzRadioPreset* preset,
+    bool nice_one);
 
 /**
  * Allocate SubGhzProtocolDecoderNiceFlorS.