Skip to content

Commit 69c780f

Browse files
committed
subghz update hopping config text
by Willy-JL
1 parent 3d46a62 commit 69c780f

File tree

4 files changed

+31
-14
lines changed

4 files changed

+31
-14
lines changed

applications/main/subghz/scenes/subghz_scene_receiver_config.c

+16-13
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ const float raw_threshold_rssi_value[RAW_THRESHOLD_RSSI_COUNT] = {
5252
#define HOPPING_MODE_COUNT 12
5353
const char* const hopping_mode_text[HOPPING_MODE_COUNT] = {
5454
"OFF",
55-
"-90.0",
56-
"-85.0",
57-
"-80.0",
58-
"-75.0",
59-
"-70.0",
60-
"-65.0",
61-
"-60.0",
62-
"-55.0",
63-
"-50.0",
64-
"-45.0",
65-
"-40.0",
55+
"-90dBm",
56+
"-85dBm",
57+
"-80dBm",
58+
"-75dBm",
59+
"-70dBm",
60+
"-65dBm",
61+
"-60dBm",
62+
"-55dBm",
63+
"-50dBm",
64+
"-45dBm",
65+
"-40dBm",
6666

6767
};
6868
const float hopping_mode_value[HOPPING_MODE_COUNT] = {
@@ -251,10 +251,13 @@ static void subghz_scene_receiver_config_set_hopping(VariableItem* item) {
251251
preset.data_size);
252252
variable_item_set_current_value_index(
253253
frequency_item, subghz_setting_get_frequency_default_index(setting));
254+
variable_item_set_item_label(item, "Hopping");
254255
} else {
255256
variable_item_set_current_value_text(frequency_item, " -----");
256257
variable_item_set_current_value_index(
257258
frequency_item, subghz_setting_get_frequency_default_index(setting));
259+
260+
variable_item_set_item_label(item, "Hopping RSSI");
258261
}
259262
subghz->last_settings->enable_hopping = index != 0;
260263
subghz->last_settings->hopping_threshold = hopping_mode_value[index];
@@ -414,13 +417,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
414417
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
415418
SubGhzCustomEventManagerSet) {
416419
// Hopping
420+
value_index = subghz_scene_receiver_config_hopper_value_index(subghz);
417421
item = variable_item_list_add(
418422
subghz->variable_item_list,
419-
"Hopping",
423+
value_index ? "Hopping RSSI" : "Hopping",
420424
HOPPING_MODE_COUNT,
421425
subghz_scene_receiver_config_set_hopping,
422426
subghz);
423-
value_index = subghz_scene_receiver_config_hopper_value_index(subghz);
424427

425428
variable_item_set_current_value_index(item, value_index);
426429
variable_item_set_current_value_text(item, hopping_mode_text[value_index]);

applications/services/gui/modules/variable_item_list.c

+6
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,12 @@ void variable_item_set_values_count(VariableItem* item, uint8_t values_count) {
544544
item->values_count = values_count;
545545
}
546546

547+
void variable_item_set_item_label(VariableItem* item, const char* label) {
548+
furi_check(item);
549+
furi_check(label);
550+
item->label = label;
551+
}
552+
547553
void variable_item_set_current_value_text(VariableItem* item, const char* current_value_text) {
548554
furi_check(item);
549555
furi_string_set(item->current_value_text, current_value_text);

applications/services/gui/modules/variable_item_list.h

+7
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ void variable_item_set_current_value_index(VariableItem* item, uint8_t current_v
9797
*/
9898
void variable_item_set_values_count(VariableItem* item, uint8_t values_count);
9999

100+
/** Set new label for item
101+
*
102+
* @param item VariableItem* instance
103+
* @param label The new label text
104+
*/
105+
void variable_item_set_item_label(VariableItem* item, const char* label);
106+
100107
/** Set item current selected text
101108
*
102109
* @param item VariableItem* instance

targets/f7/api_symbols.csv

+2-1
Original file line numberDiff line numberDiff line change
@@ -773,8 +773,8 @@ Function,+,bt_keys_storage_set_default_path,void,Bt*
773773
Function,+,bt_keys_storage_set_file_path,void,"BtKeysStorage*, const char*"
774774
Function,+,bt_keys_storage_set_ram_params,void,"BtKeysStorage*, uint8_t*, uint16_t"
775775
Function,+,bt_keys_storage_set_storage_path,void,"Bt*, const char*"
776-
Function,-,bt_open_rpc_connection,void,Bt*
777776
Function,+,bt_keys_storage_update,_Bool,"BtKeysStorage*, uint8_t*, uint32_t"
777+
Function,-,bt_open_rpc_connection,void,Bt*
778778
Function,+,bt_profile_restore_default,_Bool,Bt*
779779
Function,+,bt_profile_start,FuriHalBleProfileBase*,"Bt*, const FuriHalBleProfileTemplate*, FuriHalBleProfileParams"
780780
Function,+,bt_remote_rssi,_Bool,"Bt*, uint8_t*"
@@ -3610,6 +3610,7 @@ Function,+,variable_item_list_set_enter_callback,void,"VariableItemList*, Variab
36103610
Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t"
36113611
Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t"
36123612
Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*"
3613+
Function,+,variable_item_set_item_label,void,"VariableItem*, const char*"
36133614
Function,+,variable_item_set_locked,void,"VariableItem*, _Bool, const char*"
36143615
Function,+,variable_item_set_values_count,void,"VariableItem*, uint8_t"
36153616
Function,+,varint_int32_length,size_t,int32_t

0 commit comments

Comments
 (0)