Skip to content

lvgl API: use lv_obj_has_state to check state value #198

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
suchmememanyskill merged 1 commit into from
Jul 9, 2025
Merged

lvgl API: use lv_obj_has_state to check state value #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CYD-Klipper/src/core/bambu/bambu_printer_panels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ struct
};
} __internal_bambu_file_state = {};

#define SET_BOOL_STATE(bool_name, func_name) static void func_name (lv_event_t * e) { auto state = lv_obj_get_state(lv_event_get_target(e)); bool_name = (state & LV_STATE_CHECKED == LV_STATE_CHECKED); }
#define SET_BOOL_STATE(bool_name, func_name) static void func_name (lv_event_t * e) { bool_name = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED); }

SET_BOOL_STATE(__internal_bambu_file_state.bambu_option_use_ams, set_bambu_option_use_ams)
SET_BOOL_STATE(__internal_bambu_file_state.bambu_option_timelapse, set_bambu_option_timelapse)
Expand Down
3 changes: 1 addition & 2 deletions CYD-Klipper/src/ui/macros.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ int macros_add_macros_to_panel(lv_obj_t * root_panel, BasePrinter* printer)

static void power_device_toggle(lv_event_t * e)
{
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
DoubleStorage* device = (DoubleStorage*)lv_event_get_user_data(e);
LOG_F(("Power Device: %s, State: %d -> %d\n", device->power_device_name, !checked, checked))

Expand Down
39 changes: 13 additions & 26 deletions CYD-Klipper/src/ui/panels/settings_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
#endif // REPO_VERSION

static void invert_color_switch(lv_event_t * e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.printer_config[global_config.printer_index].invert_colors = checked;
write_global_config();
set_invert_display();
Expand Down Expand Up @@ -46,16 +45,14 @@ static void reset_ip_click(lv_event_t * e){
}

static void light_mode_switch(lv_event_t * e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
get_current_printer()->printer_config->light_mode = checked;
write_global_config();
set_color_scheme();
}

static void filament_move_mode_switch(lv_event_t * e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
get_current_printer()->printer_config->custom_filament_move_macros = checked;
write_global_config();
}
Expand Down Expand Up @@ -97,60 +94,52 @@ static void wake_timeout_dropdown(lv_event_t * e){
}

static void dualusb_screen_fix_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.display_mode = checked;
write_global_config();
ESP.restart();
}

static void disable_m117_messaging_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.disable_m117_messaging = checked;
write_global_config();
}

static void sort_macros_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.sort_macros = checked;
write_global_config();
}

static void show_estop_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.show_estop = checked;
write_global_config();
}

static void full_filenames_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.full_filenames = checked;
write_global_config();
}

static void double_size_gcode_img_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.double_size_gcode_img = checked;
write_global_config();
}

static void rotate_screen_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.rotate_screen = checked;
global_config.screen_calibrated = false;
write_global_config();
ESP.restart();
}

static void on_during_print_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.on_during_print = checked;
check_if_screen_needs_to_be_disabled();
write_global_config();
Expand All @@ -161,15 +150,13 @@ static void btn_ota_do_update(lv_event_t * e){
}

static void auto_ota_update_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.auto_ota_update = checked;
write_global_config();
}

static void multi_printer_switch(lv_event_t* e){
auto state = lv_obj_get_state(lv_event_get_target(e));
bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
global_config.multi_printer_mode = checked;
write_global_config();
nav_buttons_setup(PANEL_SETTINGS);
Expand Down
4 changes: 1 addition & 3 deletions CYD-Klipper/src/ui/panels/temp_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,7 @@ static void set_temp_via_preset(lv_event_t * e){
}

static void btn_toggleable_edit(lv_event_t * e){
lv_obj_t * btn = lv_event_get_target(e);
auto state = lv_obj_get_state(btn);
temp_edit_mode = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
temp_edit_mode = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
}

static void btn_retract(lv_event_t * e){
Expand Down
Loading