1
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00

subghz update hopping config text

by Willy-JL
This commit is contained in:
MX
2024-07-22 01:47:19 +03:00
parent 3d46a62f71
commit 69c780fddb
4 changed files with 31 additions and 14 deletions

View File

@@ -52,17 +52,17 @@ const float raw_threshold_rssi_value[RAW_THRESHOLD_RSSI_COUNT] = {
#define HOPPING_MODE_COUNT 12 #define HOPPING_MODE_COUNT 12
const char* const hopping_mode_text[HOPPING_MODE_COUNT] = { const char* const hopping_mode_text[HOPPING_MODE_COUNT] = {
"OFF", "OFF",
"-90.0", "-90dBm",
"-85.0", "-85dBm",
"-80.0", "-80dBm",
"-75.0", "-75dBm",
"-70.0", "-70dBm",
"-65.0", "-65dBm",
"-60.0", "-60dBm",
"-55.0", "-55dBm",
"-50.0", "-50dBm",
"-45.0", "-45dBm",
"-40.0", "-40dBm",
}; };
const float hopping_mode_value[HOPPING_MODE_COUNT] = { const float hopping_mode_value[HOPPING_MODE_COUNT] = {
@@ -251,10 +251,13 @@ static void subghz_scene_receiver_config_set_hopping(VariableItem* item) {
preset.data_size); preset.data_size);
variable_item_set_current_value_index( variable_item_set_current_value_index(
frequency_item, subghz_setting_get_frequency_default_index(setting)); frequency_item, subghz_setting_get_frequency_default_index(setting));
variable_item_set_item_label(item, "Hopping");
} else { } else {
variable_item_set_current_value_text(frequency_item, " -----"); variable_item_set_current_value_text(frequency_item, " -----");
variable_item_set_current_value_index( variable_item_set_current_value_index(
frequency_item, subghz_setting_get_frequency_default_index(setting)); frequency_item, subghz_setting_get_frequency_default_index(setting));
variable_item_set_item_label(item, "Hopping RSSI");
} }
subghz->last_settings->enable_hopping = index != 0; subghz->last_settings->enable_hopping = index != 0;
subghz->last_settings->hopping_threshold = hopping_mode_value[index]; subghz->last_settings->hopping_threshold = hopping_mode_value[index];
@@ -414,13 +417,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
SubGhzCustomEventManagerSet) { SubGhzCustomEventManagerSet) {
// Hopping // Hopping
value_index = subghz_scene_receiver_config_hopper_value_index(subghz);
item = variable_item_list_add( item = variable_item_list_add(
subghz->variable_item_list, subghz->variable_item_list,
"Hopping", value_index ? "Hopping RSSI" : "Hopping",
HOPPING_MODE_COUNT, HOPPING_MODE_COUNT,
subghz_scene_receiver_config_set_hopping, subghz_scene_receiver_config_set_hopping,
subghz); subghz);
value_index = subghz_scene_receiver_config_hopper_value_index(subghz);
variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, hopping_mode_text[value_index]); variable_item_set_current_value_text(item, hopping_mode_text[value_index]);

View File

@@ -544,6 +544,12 @@ void variable_item_set_values_count(VariableItem* item, uint8_t values_count) {
item->values_count = values_count; item->values_count = values_count;
} }
void variable_item_set_item_label(VariableItem* item, const char* label) {
furi_check(item);
furi_check(label);
item->label = label;
}
void variable_item_set_current_value_text(VariableItem* item, const char* current_value_text) { void variable_item_set_current_value_text(VariableItem* item, const char* current_value_text) {
furi_check(item); furi_check(item);
furi_string_set(item->current_value_text, current_value_text); furi_string_set(item->current_value_text, current_value_text);

View File

@@ -97,6 +97,13 @@ void variable_item_set_current_value_index(VariableItem* item, uint8_t current_v
*/ */
void variable_item_set_values_count(VariableItem* item, uint8_t values_count); void variable_item_set_values_count(VariableItem* item, uint8_t values_count);
/** Set new label for item
*
* @param item VariableItem* instance
* @param label The new label text
*/
void variable_item_set_item_label(VariableItem* item, const char* label);
/** Set item current selected text /** Set item current selected text
* *
* @param item VariableItem* instance * @param item VariableItem* instance

View File

@@ -773,8 +773,8 @@ Function,+,bt_keys_storage_set_default_path,void,Bt*
Function,+,bt_keys_storage_set_file_path,void,"BtKeysStorage*, const char*" Function,+,bt_keys_storage_set_file_path,void,"BtKeysStorage*, const char*"
Function,+,bt_keys_storage_set_ram_params,void,"BtKeysStorage*, uint8_t*, uint16_t" Function,+,bt_keys_storage_set_ram_params,void,"BtKeysStorage*, uint8_t*, uint16_t"
Function,+,bt_keys_storage_set_storage_path,void,"Bt*, const char*" Function,+,bt_keys_storage_set_storage_path,void,"Bt*, const char*"
Function,-,bt_open_rpc_connection,void,Bt*
Function,+,bt_keys_storage_update,_Bool,"BtKeysStorage*, uint8_t*, uint32_t" Function,+,bt_keys_storage_update,_Bool,"BtKeysStorage*, uint8_t*, uint32_t"
Function,-,bt_open_rpc_connection,void,Bt*
Function,+,bt_profile_restore_default,_Bool,Bt* Function,+,bt_profile_restore_default,_Bool,Bt*
Function,+,bt_profile_start,FuriHalBleProfileBase*,"Bt*, const FuriHalBleProfileTemplate*, FuriHalBleProfileParams" Function,+,bt_profile_start,FuriHalBleProfileBase*,"Bt*, const FuriHalBleProfileTemplate*, FuriHalBleProfileParams"
Function,+,bt_remote_rssi,_Bool,"Bt*, uint8_t*" Function,+,bt_remote_rssi,_Bool,"Bt*, uint8_t*"
@@ -3610,6 +3610,7 @@ Function,+,variable_item_list_set_enter_callback,void,"VariableItemList*, Variab
Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t" Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t"
Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t" Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t"
Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*" Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*"
Function,+,variable_item_set_item_label,void,"VariableItem*, const char*"
Function,+,variable_item_set_locked,void,"VariableItem*, _Bool, const char*" Function,+,variable_item_set_locked,void,"VariableItem*, _Bool, const char*"
Function,+,variable_item_set_values_count,void,"VariableItem*, uint8_t" Function,+,variable_item_set_values_count,void,"VariableItem*, uint8_t"
Function,+,varint_int32_length,size_t,int32_t Function,+,varint_int32_length,size_t,int32_t
1 entry status name type params
773 Function + bt_keys_storage_set_file_path void BtKeysStorage*, const char*
774 Function + bt_keys_storage_set_ram_params void BtKeysStorage*, uint8_t*, uint16_t
775 Function + bt_keys_storage_set_storage_path void Bt*, const char*
Function - bt_open_rpc_connection void Bt*
776 Function + bt_keys_storage_update _Bool BtKeysStorage*, uint8_t*, uint32_t
777 Function - bt_open_rpc_connection void Bt*
778 Function + bt_profile_restore_default _Bool Bt*
779 Function + bt_profile_start FuriHalBleProfileBase* Bt*, const FuriHalBleProfileTemplate*, FuriHalBleProfileParams
780 Function + bt_remote_rssi _Bool Bt*, uint8_t*
3610 Function + variable_item_list_set_selected_item void VariableItemList*, uint8_t
3611 Function + variable_item_set_current_value_index void VariableItem*, uint8_t
3612 Function + variable_item_set_current_value_text void VariableItem*, const char*
3613 Function + variable_item_set_item_label void VariableItem*, const char*
3614 Function + variable_item_set_locked void VariableItem*, _Bool, const char*
3615 Function + variable_item_set_values_count void VariableItem*, uint8_t
3616 Function + varint_int32_length size_t int32_t