Skip to content

Add new settings page and element positioning preview for goggle OSD #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ligenxxxx merged 7 commits into from
May 29, 2023
Merged

Add new settings page and element positioning preview for goggle OSD #222

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f745e7
Add new setting page for goggle OSD
Nikolas-S Apr 17, 2023
132cb65
add osd element positioning preview
Nikolas-S Apr 19, 2023
d5830de
fix code formatting
Nikolas-S Apr 20, 2023
81785ae
improve slider scroll acceleration
Nikolas-S Apr 21, 2023
3eff555
fix long press handling in osd element pos preview
Nikolas-S Apr 26, 2023
7b1b167
improve user hint for osd element positioning
Nikolas-S Apr 26, 2023
e99d396
remove obsolete comments
Nikolas-S May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove obsolete comments
  • Loading branch information
@Nikolas-S
Nikolas-S committed May 24, 2023
commit e99d39667e95607b9c576a715a3807588ab47b86
21 changes: 2 additions & 19 deletions src/ui/ui_osd_element_pos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,25 +193,8 @@ static int persist_all_osd_element_settings(const setting_osd_t *settings_to_per

res = ini_putl("osd", "embedded_mode", settings_to_persist->embedded_mode, SETTING_INI);

for (int i = 0; i < OSD_ELEMENTS_TOTAL; i++) {
for (int i = 0; i < OSD_ELEMENTS_TOTAL; i++)
res &= settings_put_osd_element(&settings_to_persist->element[i], osd_element_list[i].name_settings);
}

// res &= settings_put_osd_element(&settings_to_persist->elements.topfan_speed, osd_element_list[OSD_ELEMENT_TOP_FAN_SPEED].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.latency_lock, osd_element_list[OSD_ELEMENT_LATENCY_LOCK].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.vtx_temp, osd_element_list[OSD_ELEMENT_VTX_TEMP].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.vrx_temp, osd_element_list[OSD_ELEMENT_VRX_TEMP].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.battery_low, osd_element_list[OSD_ELEMENT_BATTERY_LOW].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.channel, osd_element_list[OSD_ELEMENT_CHANNEL].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.sd_rec, osd_element_list[OSD_ELEMENT_SD_REC].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.vlq, osd_element_list[OSD_ELEMENT_VLQ].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.ant0, osd_element_list[OSD_ELEMENT_ANT0].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.ant1, osd_element_list[OSD_ELEMENT_ANT1].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.ant2, osd_element_list[OSD_ELEMENT_ANT2].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.ant3, osd_element_list[OSD_ELEMENT_ANT3].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.osd_tempe[0], osd_element_list[OSD_ELEMENT_GOGGLE_TEMP_TOP].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.osd_tempe[1], osd_element_list[OSD_ELEMENT_GOGGLE_TEMP_LEFT].name_settings);
// res &= settings_put_osd_element(&settings_to_persist->elements.osd_tempe[2], osd_element_list[OSD_ELEMENT_GOGGLE_TEMP_RIGHT].name_settings);

return res;
}
Expand Down Expand Up @@ -505,7 +488,7 @@ static int ui_handle_click() {
for (int i = 0; i < OSD_GOGGLE_NUM; i++) {
g_setting.osd.element[i] = g_setting_defaults.osd.element[i];
}

update_ui();
osd_update_mode();
lv_label_set_text(label_reset_all_osd_elements, "#00FF00 Elements reset.#");
Expand Down