Merge pull request #960 from LeeroysHub/dev

UNLEASHED:: TX Power setting to SubGhz App

applications/main/subghz/helpers/subghz_txrx.c

@@ -101,12 +101,39 @@ void subghz_txrx_set_preset(
     size_t preset_data_size) {
     furi_assert(instance);
     furi_string_set(instance->preset->name, preset_name);
+
     SubGhzRadioPreset* preset = instance->preset;
     preset->frequency = frequency;
     preset->data = preset_data;
     preset->data_size = preset_data_size;
 }
 
+uint8_t*
+    subghz_txrx_set_tx_power(uint8_t* preset_data, size_t preset_data_size, uint32_t tx_power) {
+#define TX_POWER_OFFSET       7
+#define TX_PRESET_POWER_COUNT 11
+    const uint32_t tx_power_value[TX_PRESET_POWER_COUNT] = {
+        0,
+        0xC0,
+        0xC5,
+        0xCD,
+        0x86,
+        0x50,
+        0x37,
+        0x26,
+        0x1D,
+        0x17,
+        0x03,
+    };
+
+    //Set the TX Power Here in the CC1101 register...
+    if(tx_power)
+        preset_data[preset_data_size - TX_POWER_OFFSET] = (uint8_t)tx_power_value[tx_power];
+
+    //Pass back the preset_so we can call one liners.
+    return preset_data;
+}
+
 const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset) {
     UNUSED(instance);
     const char* preset_name = "";
@@ -677,20 +704,27 @@ void subghz_txrx_set_default_preset(SubGhzTxRx* instance, uint32_t frequency) {
     subghz_txrx_set_preset(instance, default_modulation, frequency, NULL, 0);
 }
 
-const char*
+const char* subghz_txrx_set_preset_internal(
-    subghz_txrx_set_preset_internal(SubGhzTxRx* instance, uint32_t frequency, uint8_t index) {
+    SubGhzTxRx* instance,
+    uint32_t frequency,
+    uint8_t index,
+    uint32_t tx_power) {
     furi_assert(instance);
 
+    //Grab the prset name.
     SubGhzSetting* setting = subghz_txrx_get_setting(instance);
     const char* preset_name = subghz_setting_get_preset_name(setting, index);
     subghz_setting_set_default_frequency(setting, frequency);
 
-    subghz_txrx_set_preset(
+    //Get the preset data now so we can set TX power.
-        instance,
+    uint8_t* preset_data = subghz_setting_get_preset_data(setting, index);
-        preset_name,
+    size_t preset_data_size = subghz_setting_get_preset_data_size(setting, index);
-        frequency,
+
-        subghz_setting_get_preset_data(setting, index),
+    //Edit TX power, if necessary.
-        subghz_setting_get_preset_data_size(setting, index));
+    subghz_txrx_set_tx_power(preset_data, preset_data_size, tx_power);
+
+    //Set the Updated Preset.
+    subghz_txrx_set_preset(instance, preset_name, frequency, preset_data, preset_data_size);
 
     return preset_name;
 }

applications/main/subghz/helpers/subghz_txrx.h

@@ -57,6 +57,16 @@ void subghz_txrx_set_preset(
     uint8_t* preset_data,
     size_t preset_data_size);
 
+/**
+ * Set TX Power
+ * 
+ * @param preset_data Data of preset
+ * @param preset_data_size Size of preset data
+ * @param tx_power Menu Index of TX Power Setting. (Saves iterating in Config enter)
+ */
+uint8_t*
+    subghz_txrx_set_tx_power(uint8_t* preset_data, size_t preset_data_size, uint32_t tx_power);
+
 /**
  * Get name of preset
  * 
@@ -360,7 +370,11 @@ void subghz_txrx_set_default_preset(SubGhzTxRx* instance, uint32_t frequency);
  * @param instance  - instance Pointer to a SubGhzTxRx
  * @param frequency - frequency of new preset
  * @param index - index of preset taken from SubGhzSetting
+ * @param tx_power - index of TX Power menu index option to use.
  * @return const char* -  name of preset
  */
-const char*
+const char* subghz_txrx_set_preset_internal(
-    subghz_txrx_set_preset_internal(SubGhzTxRx* instance, uint32_t frequency, uint8_t index);
+    SubGhzTxRx* instance,
+    uint32_t frequency,
+    uint8_t index,
+    uint32_t tx_power);

applications/main/subghz/scenes/subghz_scene_radio_settings.c

@@ -66,6 +66,22 @@ const int32_t debug_counter_val[DEBUG_COUNTER_COUNT] = {
     -50,
 };
 
+//TX Power
+#define TX_POWER_COUNT 11
+const char* const tx_power_text[TX_POWER_COUNT] = {
+    "Preset",
+    "12dBm",
+    "10dBm",
+    "7dBm",
+    "5dBm",
+    "0dBm",
+    "-6dBm",
+    "-10dBm",
+    "-15dBm",
+    "-20dBm",
+    "-30dBm",
+};
+
 static void subghz_scene_radio_settings_set_device(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -80,6 +96,20 @@ static void subghz_scene_radio_settings_set_device(VariableItem* item) {
     subghz_txrx_radio_device_set(subghz->txrx, radio_device_value[index]);
 }
 
+static void subghz_scene_radio_settings_set_tx_power(VariableItem* item) {
+    SubGhz* subghz = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    //Update the Menu Item on screen
+    variable_item_set_current_value_text(item, tx_power_text[index]);
+
+    //Set TX power and remember setting
+    subghz->last_settings->tx_power = subghz->tx_power = index;
+
+    //Save the settings now, this is the convention here!
+    subghz_last_settings_save(subghz->last_settings);
+}
+
 static void subghz_scene_receiver_config_set_debug_pin(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -144,6 +174,18 @@ void subghz_scene_radio_settings_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, radio_device_text[value_index]);
 
+    //Add TX Power
+    item = variable_item_list_add(
+        subghz->variable_item_list,
+        "TX Power",
+        TX_POWER_COUNT,
+        subghz_scene_radio_settings_set_tx_power,
+        subghz);
+
+    value_index = subghz->tx_power;
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, tx_power_text[value_index]);
+
     item = variable_item_list_add(
         variable_item_list,
         "Protocol Names",

applications/main/subghz/scenes/subghz_scene_read_raw.c

@@ -110,7 +110,8 @@ void subghz_scene_read_raw_on_enter(void* context) {
             subghz_txrx_set_preset_internal(
                 subghz->txrx,
                 subghz->last_settings->frequency,
-                subghz->last_settings->preset_index);
+                subghz->last_settings->preset_index,
+                subghz->last_settings->tx_power);
         }
     }
     subghz_scene_read_raw_update_statusbar(subghz);

applications/main/subghz/scenes/subghz_scene_receiver.c

@@ -165,11 +165,15 @@ void subghz_scene_receiver_on_enter(void* context) {
 
     if(subghz_rx_key_state_get(subghz) == SubGhzRxKeyStateIDLE) {
         subghz_txrx_set_preset_internal(
-            subghz->txrx, subghz->last_settings->frequency, subghz->last_settings->preset_index);
+            subghz->txrx,
+            subghz->last_settings->frequency,
+            subghz->last_settings->preset_index,
+            subghz->last_settings->tx_power);
 
         subghz->filter = subghz->last_settings->filter;
         subghz_txrx_receiver_set_filter(subghz->txrx, subghz->filter);
         subghz->ignore_filter = subghz->last_settings->ignore_filter;
+        subghz->tx_power = subghz->last_settings->tx_power;
 
         subghz_history_reset(history);
         subghz_rx_key_state_set(subghz, SubGhzRxKeyStateStart);

applications/main/subghz/scenes/subghz_scene_receiver_config.c

@@ -185,6 +185,11 @@ static void subghz_scene_receiver_config_set_frequency(VariableItem* item) {
             frequency / 1000000,
             (frequency % 1000000) / 10000);
         variable_item_set_current_value_text(item, text_buf);
+
+        //Set TX Power
+        subghz_txrx_set_tx_power(preset.data, preset.data_size, subghz->tx_power);
+
+        //Set the preset now.
         subghz_txrx_set_preset(
             subghz->txrx,
             furi_string_get_cstr(preset.name),
@@ -211,12 +216,14 @@ static void subghz_scene_receiver_config_set_preset(VariableItem* item) {
     variable_item_set_current_value_text(item, preset_name);
     //subghz->last_settings->preset = index;
     SubGhzRadioPreset preset = subghz_txrx_get_preset(subghz->txrx);
+    uint8_t* preset_data = subghz_setting_get_preset_data(setting, index);
+    size_t preset_data_size = subghz_setting_get_preset_data_size(setting, index);
+
+    //Edit TX power, if necessary.
+    subghz_txrx_set_tx_power(preset_data, preset_data_size, subghz->tx_power);
+
     subghz_txrx_set_preset(
-        subghz->txrx,
+        subghz->txrx, preset_name, preset.frequency, preset_data, preset_data_size);
-        preset_name,
-        preset.frequency,
-        subghz_setting_get_preset_data(setting, index),
-        subghz_setting_get_preset_data_size(setting, index));
     subghz->last_settings->preset_index = index;
 }
 
@@ -242,6 +249,9 @@ static void subghz_scene_receiver_config_set_hopping(VariableItem* item) {
             (frequency % 1000000) / 10000);
         variable_item_set_current_value_text(frequency_item, text_buf);
 
+        //Edit TX power, if necessary.
+        subghz_txrx_set_tx_power(preset.data, preset.data_size, subghz->tx_power);
+
         // Maybe better add one more function with only with the frequency argument?
         subghz_txrx_set_preset(
             subghz->txrx,
@@ -341,7 +351,8 @@ static void subghz_scene_receiver_config_var_list_enter_callback(void* context,
         subghz_txrx_set_preset_internal(
             subghz->txrx,
             SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY,
-            SUBGHZ_LAST_SETTING_DEFAULT_PRESET);
+            SUBGHZ_LAST_SETTING_DEFAULT_PRESET,
+            subghz->tx_power);
 
         SubGhzSetting* setting = subghz_txrx_get_setting(subghz->txrx);
         SubGhzRadioPreset preset = subghz_txrx_get_preset(subghz->txrx);
@@ -359,7 +370,7 @@ static void subghz_scene_receiver_config_var_list_enter_callback(void* context,
         subghz->last_settings->ignore_filter = subghz->ignore_filter;
         subghz->last_settings->filter = subghz->filter;
         subghz->last_settings->delete_old_signals = false;
-
+        subghz->last_settings->tx_power = subghz->tx_power = 0;
         subghz_txrx_speaker_set_state(subghz->txrx, speaker_value[default_index]);
 
         subghz_txrx_hopper_set_state(subghz->txrx, hopping_value[default_index]);

applications/main/subghz/scenes/subghz_scene_receiver_info.c

@@ -36,6 +36,10 @@ static bool subghz_scene_receiver_info_update_parser(void* context) {
 
         SubGhzRadioPreset* preset =
             subghz_history_get_radio_preset(subghz->history, subghz->idx_menu_chosen);
+
+        //Edit TX power, if necessary.
+        subghz_txrx_set_tx_power(preset->data, preset->data_size, subghz->tx_power);
+
         subghz_txrx_set_preset(
             subghz->txrx,
             furi_string_get_cstr(preset->name),

applications/main/subghz/subghz.c

@@ -207,7 +207,10 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
 
     if(!alloc_for_tx_only) {
         subghz_txrx_set_preset_internal(
-            subghz->txrx, subghz->last_settings->frequency, subghz->last_settings->preset_index);
+            subghz->txrx,
+            subghz->last_settings->frequency,
+            subghz->last_settings->preset_index,
+            subghz->tx_power);
         subghz->history = subghz_history_alloc();
     }
 
@@ -218,10 +221,13 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
     if(!alloc_for_tx_only) {
         subghz->ignore_filter = subghz->last_settings->ignore_filter;
         subghz->filter = subghz->last_settings->filter;
+        subghz->tx_power = subghz->last_settings->tx_power;
     } else {
         subghz->filter = SubGhzProtocolFlag_Decodable;
         subghz->ignore_filter = 0x0;
+        subghz->tx_power = 0;
     }
+
     subghz_txrx_receiver_set_filter(subghz->txrx, subghz->filter);
     subghz_txrx_set_need_save_callback(subghz->txrx, subghz_save_to_file, subghz);
 

applications/main/subghz/subghz_i.c

@@ -137,12 +137,19 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
         }
         size_t preset_index =
             subghz_setting_get_inx_preset_by_name(setting, furi_string_get_cstr(temp_str));
+
+        //Edit TX power, if necessary.
+        uint8_t* preset_data = subghz_setting_get_preset_data(setting, preset_index);
+        size_t preset_data_size = subghz_setting_get_preset_data_size(setting, preset_index);
+        subghz_txrx_set_tx_power(preset_data, preset_data_size, subghz->tx_power);
+
+        //Set the Updated Preset.
         subghz_txrx_set_preset(
             subghz->txrx,
             furi_string_get_cstr(temp_str),
             temp_data32,
-            subghz_setting_get_preset_data(setting, preset_index),
+            preset_data,
-            subghz_setting_get_preset_data_size(setting, preset_index));
+            preset_data_size);
 
         //Load protocol
         if(!flipper_format_read_string(fff_data_file, "Protocol", temp_str)) {

applications/main/subghz/subghz_i.h

@@ -93,7 +93,7 @@ struct SubGhz {
 
     uint16_t idx_menu_chosen;
     SubGhzLoadTypeFile load_type_file;
-
+    uint32_t tx_power;
     void* rpc_ctx;
 };
 

applications/main/subghz/subghz_last_settings.c

@@ -19,6 +19,7 @@
 #define SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD                        "DelOldSignals"
 #define SUBGHZ_LAST_SETTING_FIELD_HOPPING_THRESHOLD                 "HoppingThreshold"
 #define SUBGHZ_LAST_SETTING_FIELD_LED_AND_POWER_AMP                 "LedAndPowerAmp"
+#define SUBGHZ_LAST_SETTING_FIELD_TX_POWER                          "TXPower"
 
 SubGhzLastSettings* subghz_last_settings_alloc(void) {
     SubGhzLastSettings* instance = malloc(sizeof(SubGhzLastSettings));
@@ -119,6 +120,10 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
                    1)) {
                 flipper_format_rewind(fff_data_file);
             }
+            if(!flipper_format_read_uint32(
+                   fff_data_file, SUBGHZ_LAST_SETTING_FIELD_TX_POWER, &instance->tx_power, 1)) {
+                flipper_format_rewind(fff_data_file);
+            }
             if(!flipper_format_read_float(
                    fff_data_file,
                    SUBGHZ_LAST_SETTING_FIELD_HOPPING_THRESHOLD,
@@ -222,6 +227,10 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) {
                file, SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD, &instance->delete_old_signals, 1)) {
             break;
         }
+        if(!flipper_format_write_uint32(
+               file, SUBGHZ_LAST_SETTING_FIELD_TX_POWER, &instance->tx_power, 1)) {
+            break;
+        }
         if(!flipper_format_write_float(
                file,
                SUBGHZ_LAST_SETTING_FIELD_HOPPING_THRESHOLD,

applications/main/subghz/subghz_last_settings.h

@@ -26,6 +26,7 @@ typedef struct {
     bool delete_old_signals;
     float hopping_threshold;
     bool leds_and_amp;
+    uint32_t tx_power;
 } SubGhzLastSettings;
 
 SubGhzLastSettings* subghz_last_settings_alloc(void);