Merge pull request #405 from gid9798/custom-buttons

Unification of custom buttons

Author: xMasterX

applications/main/subghz/scenes/subghz_scene_receiver_info.c

@@ -2,10 +2,8 @@
 #include "../helpers/subghz_custom_event.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
-#include <lib/subghz/protocols/alutech_at_4n.h>
-#include <lib/subghz/protocols/nice_flor_s.h>
-#include <lib/subghz/protocols/somfy_telis.h>
-#include <lib/subghz/protocols/secplus_v2.h>
+
+#include <lib/subghz/blocks/custom_btn.h>
 
 void subghz_scene_receiver_info_callback(GuiButtonType result, InputType type, void* context) {
     furi_assert(context);
@@ -238,10 +236,7 @@ void subghz_scene_receiver_info_on_exit(void* context) {
     keeloq_reset_mfname();
     keeloq_reset_kl_type();
     keeloq_reset_original_btn();
-    alutech_reset_original_btn();
-    nice_flors_reset_original_btn();
-    somfy_telis_reset_original_btn();
-    secplus2_reset_original_btn();
+    subghz_custom_btns_reset();
     star_line_reset_mfname();
     star_line_reset_kl_type();
 }

applications/main/subghz/scenes/subghz_scene_rpc.c

@@ -1,10 +1,8 @@
 #include "../subghz_i.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
-#include <lib/subghz/protocols/alutech_at_4n.h>
-#include <lib/subghz/protocols/nice_flor_s.h>
-#include <lib/subghz/protocols/somfy_telis.h>
-#include <lib/subghz/protocols/secplus_v2.h>
+
+#include <lib/subghz/blocks/custom_btn.h>
 
 typedef enum {
     SubGhzRpcStateIdle,
@@ -115,10 +113,7 @@ void subghz_scene_rpc_on_exit(void* context) {
     keeloq_reset_mfname();
     keeloq_reset_kl_type();
     keeloq_reset_original_btn();
-    alutech_reset_original_btn();
-    nice_flors_reset_original_btn();
-    somfy_telis_reset_original_btn();
-    secplus2_reset_original_btn();
+    subghz_custom_btns_reset();
     star_line_reset_mfname();
     star_line_reset_kl_type();
 }

applications/main/subghz/scenes/subghz_scene_transmitter.c

@@ -2,11 +2,9 @@
 #include "../views/transmitter.h"
 #include <dolphin/dolphin.h>
 #include <lib/subghz/protocols/keeloq.h>
-#include <lib/subghz/protocols/alutech_at_4n.h>
 #include <lib/subghz/protocols/star_line.h>
-#include <lib/subghz/protocols/nice_flor_s.h>
-#include <lib/subghz/protocols/somfy_telis.h>
-#include <lib/subghz/protocols/secplus_v2.h>
+
+#include <lib/subghz/blocks/custom_btn.h>
 
 void subghz_scene_transmitter_callback(SubGhzCustomEvent event, void* context) {
     furi_assert(context);
@@ -91,12 +89,8 @@ bool subghz_scene_transmitter_on_event(void* context, SceneManagerEvent event) {
                 subghz_tx_stop(subghz);
                 subghz_sleep(subghz);
             }
-            if(keeloq_get_custom_btn() != 0) {
-                keeloq_set_btn(0);
-                alutech_set_btn(0);
-                nice_flors_set_btn(0);
-                somfy_telis_set_btn(0);
-                secplus2_set_btn(0);
+            if(subghz_custom_btn_get() != 0) {
+                subghz_custom_btn_set(0);
                 uint8_t tmp_counter = furi_hal_subghz_get_rolling_counter_mult();
                 furi_hal_subghz_set_rolling_counter_mult(0);
                 // Calling restore!
@@ -138,10 +132,7 @@ void subghz_scene_transmitter_on_exit(void* context) {
     keeloq_reset_mfname();
     keeloq_reset_kl_type();
     keeloq_reset_original_btn();
-    alutech_reset_original_btn();
-    nice_flors_reset_original_btn();
-    somfy_telis_reset_original_btn();
-    secplus2_reset_original_btn();
+    subghz_custom_btns_reset();
     star_line_reset_mfname();
     star_line_reset_kl_type();
 }

applications/main/subghz/views/transmitter.c

@@ -4,11 +4,7 @@
 #include <input/input.h>
 #include <gui/elements.h>
 
-#include <lib/subghz/protocols/keeloq.h>
-#include <lib/subghz/protocols/alutech_at_4n.h>
-#include <lib/subghz/protocols/nice_flor_s.h>
-#include <lib/subghz/protocols/somfy_telis.h>
-#include <lib/subghz/protocols/secplus_v2.h>
+#include <lib/subghz/blocks/custom_btn.h>
 
 struct SubGhzViewTransmitter {
     View* view;
@@ -160,30 +156,18 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
 
     // Temp Buttons (UP)
     if(can_be_sent && event->key == InputKeyUp && event->type == InputTypePress) {
-        keeloq_set_btn(1);
-        alutech_set_btn(1);
-        nice_flors_set_btn(1);
-        somfy_telis_set_btn(1);
-        secplus2_set_btn(1);
+        subghz_custom_btn_set(1);
         with_view_model(
             subghz_transmitter->view,
             SubGhzViewTransmitterModel * model,
             {
                 furi_string_reset(model->temp_button_id);
-                if(keeloq_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(alutech_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(nice_flors_get_original_btn() != 0) {
-                    furi_string_printf(
-                        model->temp_button_id, "%01X", nice_flors_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(somfy_telis_get_original_btn() != 0) {
-                    furi_string_printf(
-                        model->temp_button_id, "%01X", somfy_telis_get_original_btn());
-                    model->draw_temp_button = true;
+                if(subghz_custom_btn_get_original() != 0) {
+                    if(subghz_custom_btn_get() == 1) {
+                        furi_string_printf(
+                            model->temp_button_id, "%01X", subghz_custom_btn_get_original());
+                        model->draw_temp_button = true;
+                    }
                 }
             },
             true);
@@ -197,30 +181,18 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
     }
     // Down
     if(can_be_sent && event->key == InputKeyDown && event->type == InputTypePress) {
-        keeloq_set_btn(2);
-        alutech_set_btn(2);
-        nice_flors_set_btn(2);
-        somfy_telis_set_btn(2);
-        secplus2_set_btn(2);
+        subghz_custom_btn_set(2);
         with_view_model(
             subghz_transmitter->view,
             SubGhzViewTransmitterModel * model,
             {
                 furi_string_reset(model->temp_button_id);
-                if(keeloq_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(alutech_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(nice_flors_get_original_btn() != 0) {
-                    furi_string_printf(
-                        model->temp_button_id, "%01X", nice_flors_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(somfy_telis_get_original_btn() != 0) {
-                    furi_string_printf(
-                        model->temp_button_id, "%01X", somfy_telis_get_original_btn());
-                    model->draw_temp_button = true;
+                if(subghz_custom_btn_get_original() != 0) {
+                    if(subghz_custom_btn_get() == 2) {
+                        furi_string_printf(
+                            model->temp_button_id, "%01X", subghz_custom_btn_get_original());
+                        model->draw_temp_button = true;
+                    }
                 }
             },
             true);
@@ -234,30 +206,18 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
     }
     // Left
     if(can_be_sent && event->key == InputKeyLeft && event->type == InputTypePress) {
-        keeloq_set_btn(3);
-        alutech_set_btn(3);
-        nice_flors_set_btn(3);
-        somfy_telis_set_btn(3);
-        secplus2_set_btn(3);
+        subghz_custom_btn_set(3);
         with_view_model(
             subghz_transmitter->view,
             SubGhzViewTransmitterModel * model,
             {
                 furi_string_reset(model->temp_button_id);
-                if(keeloq_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(alutech_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(nice_flors_get_original_btn() != 0) {
-                    furi_string_printf(
-                        model->temp_button_id, "%01X", nice_flors_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(somfy_telis_get_original_btn() != 0) {
-                    furi_string_printf(
-                        model->temp_button_id, "%01X", somfy_telis_get_original_btn());
-                    model->draw_temp_button = true;
+                if(subghz_custom_btn_get_original() != 0) {
+                    if(subghz_custom_btn_get() == 3) {
+                        furi_string_printf(
+                            model->temp_button_id, "%01X", subghz_custom_btn_get_original());
+                        model->draw_temp_button = true;
+                    }
                 }
             },
             true);
@@ -271,19 +231,18 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
     }
     // Right
     if(can_be_sent && event->key == InputKeyRight && event->type == InputTypePress) {
-        keeloq_set_btn(4);
-        alutech_set_btn(4);
+        subghz_custom_btn_set(4);
         with_view_model(
             subghz_transmitter->view,
             SubGhzViewTransmitterModel * model,
             {
                 furi_string_reset(model->temp_button_id);
-                if(keeloq_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
-                    model->draw_temp_button = true;
-                } else if(alutech_get_original_btn() != 0) {
-                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
-                    model->draw_temp_button = true;
+                if(subghz_custom_btn_get_original() != 0) {
+                    if(subghz_custom_btn_get() == 4) {
+                        furi_string_printf(
+                            model->temp_button_id, "%01X", subghz_custom_btn_get_original());
+                        model->draw_temp_button = true;
+                    }
                 }
             },
             true);

applications/main/subghz_remote/subghz_remote_app.c

@@ -19,10 +19,8 @@
 #include <lib/subghz/types.h>
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
-#include <lib/subghz/protocols/alutech_at_4n.h>
-#include <lib/subghz/protocols/nice_flor_s.h>
-#include <lib/subghz/protocols/somfy_telis.h>
-#include <lib/subghz/protocols/secplus_v2.h>
+
+#include <lib/subghz/blocks/custom_btn.h>
 
 #define SUBREMOTEMAP_FOLDER "/ext/subghz_remote"
 #define SUBREMOTEMAP_EXTENSION ".txt"
@@ -489,10 +487,7 @@ void subghz_remote_tx_stop(SubGHzRemote* app) {
         keeloq_reset_mfname();
         keeloq_reset_kl_type();
         keeloq_reset_original_btn();
-        alutech_reset_original_btn();
-        nice_flors_reset_original_btn();
-        somfy_telis_reset_original_btn();
-        secplus2_reset_original_btn();
+        subghz_custom_btns_reset();
         star_line_reset_mfname();
         star_line_reset_kl_type();
     }

firmware/targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,20.0,,
+Version,+,20.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -503,10 +503,6 @@ Function,-,acosl,long double,long double
 Function,-,aligned_alloc,void*,"size_t, size_t"
 Function,+,aligned_free,void,void*
 Function,+,aligned_malloc,void*,"size_t, size_t"
-Function,-,alutech_get_custom_btn,uint8_t,
-Function,-,alutech_get_original_btn,uint8_t,
-Function,-,alutech_reset_original_btn,void,
-Function,-,alutech_set_btn,void,uint8_t
 Function,-,arc4random,__uint32_t,
 Function,-,arc4random_buf,void,"void*, size_t"
 Function,-,arc4random_uniform,__uint32_t,__uint32_t
@@ -1780,12 +1776,9 @@ Function,-,j1f,float,float
 Function,-,jn,double,"int, double"
 Function,-,jnf,float,"int, float"
 Function,-,jrand48,long,unsigned short[3]
-Function,-,keeloq_get_custom_btn,uint8_t,
-Function,-,keeloq_get_original_btn,uint8_t,
 Function,-,keeloq_reset_kl_type,void,
 Function,-,keeloq_reset_mfname,void,
 Function,-,keeloq_reset_original_btn,void,
-Function,-,keeloq_set_btn,void,uint8_t
 Function,-,l64a,char*,long
 Function,-,labs,long,long
 Function,-,lcong48,void,unsigned short[7]
@@ -2093,10 +2086,6 @@ Function,-,nfca_get_crc16,uint16_t,"uint8_t*, uint16_t"
 Function,-,nfca_signal_alloc,NfcaSignal*,
 Function,-,nfca_signal_encode,void,"NfcaSignal*, uint8_t*, uint16_t, uint8_t*"
 Function,-,nfca_signal_free,void,NfcaSignal*
-Function,-,nice_flors_get_custom_btn,uint8_t,
-Function,-,nice_flors_get_original_btn,uint8_t,
-Function,-,nice_flors_reset_original_btn,void,
-Function,-,nice_flors_set_btn,void,uint8_t
 Function,+,notification_internal_message,void,"NotificationApp*, const NotificationSequence*"
 Function,+,notification_internal_message_block,void,"NotificationApp*, const NotificationSequence*"
 Function,+,notification_message,void,"NotificationApp*, const NotificationSequence*"
@@ -2464,10 +2453,6 @@ Function,+,scene_manager_search_and_switch_to_previous_scene_one_of,_Bool,"Scene
 Function,+,scene_manager_set_scene_state,void,"SceneManager*, uint32_t, uint32_t"
 Function,+,scene_manager_stop,void,SceneManager*
 Function,+,sd_api_get_fs_type_text,const char*,SDFsType
-Function,-,secplus2_get_custom_btn,uint8_t,
-Function,-,secplus2_get_original_btn,uint8_t,
-Function,-,secplus2_reset_original_btn,void,
-Function,-,secplus2_set_btn,void,uint8_t
 Function,-,secure_getenv,char*,const char*
 Function,-,seed48,unsigned short*,unsigned short[3]
 Function,-,select,int,"int, fd_set*, fd_set*, fd_set*, timeval*"
@@ -2503,10 +2488,6 @@ Function,-,siprintf,int,"char*, const char*, ..."
 Function,-,siscanf,int,"const char*, const char*, ..."
 Function,-,sniprintf,int,"char*, size_t, const char*, ..."
 Function,+,snprintf,int,"char*, size_t, const char*, ..."
-Function,-,somfy_telis_get_custom_btn,uint8_t,
-Function,-,somfy_telis_get_original_btn,uint8_t,
-Function,-,somfy_telis_reset_original_btn,void,
-Function,-,somfy_telis_set_btn,void,uint8_t
 Function,-,sprintf,int,"char*, const char*, ..."
 Function,-,sqrt,double,double
 Function,-,sqrtf,float,float
@@ -2663,6 +2644,12 @@ Function,+,subghz_block_generic_deserialize,SubGhzProtocolStatus,"SubGhzBlockGen
 Function,+,subghz_block_generic_deserialize_check_count_bit,SubGhzProtocolStatus,"SubGhzBlockGeneric*, FlipperFormat*, uint16_t"
 Function,+,subghz_block_generic_get_preset_name,void,"const char*, FuriString*"
 Function,+,subghz_block_generic_serialize,SubGhzProtocolStatus,"SubGhzBlockGeneric*, FlipperFormat*, SubGhzRadioPreset*"
+Function,-,subghz_custom_btn_get,uint8_t,
+Function,-,subghz_custom_btn_get_original,uint8_t,
+Function,-,subghz_custom_btn_set,void,uint8_t
+Function,-,subghz_custom_btn_set_max,void,uint8_t
+Function,-,subghz_custom_btn_set_original,void,uint8_t
+Function,-,subghz_custom_btns_reset,void,
 Function,+,subghz_environment_alloc,SubGhzEnvironment*,
 Function,+,subghz_environment_free,void,SubGhzEnvironment*
 Function,+,subghz_environment_get_alutech_at_4n_rainbow_table_file_name,const char*,SubGhzEnvironment*

lib/subghz/blocks/custom_btn.c

@@ -0,0 +1,34 @@
+#include "custom_btn.h"
+
+static uint8_t custom_btn_id;
+static uint8_t custom_btn_original;
+static uint8_t custom_btn_max_btns = 0;
+
+void subghz_custom_btn_set(uint8_t b) {
+    if(b > custom_btn_max_btns) {
+        custom_btn_id = 0;
+    } else {
+        custom_btn_id = b;
+    }
+}
+
+uint8_t subghz_custom_btn_get() {
+    return custom_btn_id;
+}
+
+void subghz_custom_btn_set_original(uint8_t b) {
+    custom_btn_original = b;
+}
+
+uint8_t subghz_custom_btn_get_original() {
+    return custom_btn_original;
+}
+
+void subghz_custom_btn_set_max(uint8_t b) {
+    custom_btn_max_btns = b;
+}
+
+void subghz_custom_btns_reset() {
+    custom_btn_original = 0;
+    custom_btn_max_btns = 0;
+}