Remove subghz region

This commit is contained in:
Willy-JL
2023-05-11 00:26:11 +01:00
parent d91f70b837
commit 09ff6da5ea
12 changed files with 40 additions and 202 deletions
@@ -5,7 +5,6 @@ enum VarItemListIndex {
VarItemListIndexBadbtRemember,
VarItemListIndexSubghzFrequencies,
VarItemListIndexSubghzExtend,
VarItemListIndexSubghzBypass,
};
void xtreme_app_scene_protocols_var_item_list_callback(void* context, uint32_t index) {
@@ -36,13 +35,6 @@ static void xtreme_app_scene_protocols_subghz_extend_changed(VariableItem* item)
app->save_subghz = true;
}
static void xtreme_app_scene_protocols_subghz_bypass_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item);
app->subghz_bypass = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF");
app->save_subghz = true;
}
void xtreme_app_scene_protocols_on_enter(void* context) {
XtremeApp* app = context;
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
@@ -66,11 +58,6 @@ void xtreme_app_scene_protocols_on_enter(void* context) {
variable_item_set_current_value_index(item, app->subghz_extend);
variable_item_set_current_value_text(item, app->subghz_extend ? "ON" : "OFF");
item = variable_item_list_add(
var_item_list, "SubGHz Bypass", 2, xtreme_app_scene_protocols_subghz_bypass_changed, app);
variable_item_set_current_value_index(item, app->subghz_bypass);
variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF");
variable_item_list_set_enter_callback(
var_item_list, xtreme_app_scene_protocols_var_item_list_callback, app);
+2 -2
View File
@@ -64,7 +64,7 @@ bool xtreme_app_apply(XtremeApp* app) {
}
if(app->save_subghz) {
furi_hal_subghz_set_extend_settings(app->subghz_extend, app->subghz_bypass);
furi_hal_subghz_set_is_extended(app->subghz_extend);
}
if(app->save_name) {
@@ -247,7 +247,7 @@ XtremeApp* xtreme_app_alloc() {
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
furi_hal_subghz_get_extend_settings(&app->subghz_extend, &app->subghz_bypass);
app->subghz_extend = furi_hal_subghz_get_is_extended();
strlcpy(app->device_name, furi_hal_version_get_name_ptr(), FURI_HAL_VERSION_ARRAY_NAME_LENGTH);
@@ -51,7 +51,6 @@ typedef struct {
uint8_t subghz_hopper_index;
char subghz_freq_buffer[XTREME_SUBGHZ_FREQ_BUFFER_SIZE];
bool subghz_extend;
bool subghz_bypass;
char device_name[FURI_HAL_VERSION_ARRAY_NAME_LENGTH];
int32_t xp_level;
FuriString* version_tag;
@@ -37,13 +37,12 @@ void desktop_debug_render(Canvas* canvas, void* model) {
snprintf(
buffer,
sizeof(buffer),
"%d.F%dB%dC%d %s:%s %s",
"%d.F%dB%dC%d %s %s",
furi_hal_version_get_hw_version(),
furi_hal_version_get_hw_target(),
furi_hal_version_get_hw_body(),
furi_hal_version_get_hw_connect(),
furi_hal_version_get_hw_region_name_otp(),
furi_hal_region_get_name(),
my_name ? my_name : "Unknown");
canvas_draw_str(canvas, 0, 19 + STATUS_BAR_Y_SHIFT, buffer);
+1 -2
View File
@@ -99,13 +99,12 @@ static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage*
furi_string_cat_printf(
buffer,
"%d.F%dB%dC%d %s:%s %s\n",
"%d.F%dB%dC%d %s %s\n",
furi_hal_version_get_hw_version(),
furi_hal_version_get_hw_target(),
furi_hal_version_get_hw_body(),
furi_hal_version_get_hw_connect(),
furi_hal_version_get_hw_region_name_otp(),
furi_hal_region_get_name(),
my_name ? my_name : "Unknown");
furi_string_cat_printf(buffer, "Serial Number:\n");