Skip to content

Commit 53c8aea

Browse files
committed
[WIP] config: Adapt latest LVGL changes
1 parent acc72f7 commit 53c8aea

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

config/app/behaviors/behavior_lvgl_key_press.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
1414
#include <zmk/behavior.h>
1515
#include <drivers/behavior/lvgl_key_press.h>
1616

17-
#if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
17+
#if 0
1818

1919
#define LVKP_MSGQ_COUNT 10
2020
K_MSGQ_DEFINE(lvkp_msgq, sizeof(lv_indev_data_t), LVKP_MSGQ_COUNT, 4);

config/app/behaviors/behavior_mouse_wheel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static int behavior_mouse_wheel_init(const struct device *dev)
3939
return 0;
4040
};
4141

42-
DEVICE_DT_INST_DEFINE(0, behavior_mouse_wheel_init, NULL, NULL, NULL, APPLICATION,
42+
DEVICE_DT_INST_DEFINE(0, behavior_mouse_wheel_init, NULL, NULL, NULL, POST_KERNEL,
4343
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_mouse_wheel_driver_api);
4444

4545
#endif /* DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT) */

config/boards/helloword/hw75_dynamic/app/screen/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
config ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
55
select LV_USE_LABEL
6-
select LV_USE_BTN
6+
select LV_USE_BUTTON
77
select LV_USE_LIST
88
select LV_USE_FLEX
99
select LV_USE_PAGE

config/boards/helloword/hw75_dynamic/app/screen/layer_status.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ ZMK_SUBSCRIPTION(layer_status_subscribtion, zmk_layer_state_changed);
7777

7878
static void layer_button_selected(lv_event_t *event)
7979
{
80-
int layer_id = (int)event->user_data;
81-
if (layer_id != zmk_keymap_highest_layer_active()) {
82-
zmk_keymap_layer_to((uint8_t)layer_id);
83-
}
80+
// int layer_id = (int)event->user_data;
81+
// if (layer_id != zmk_keymap_highest_layer_active()) {
82+
// zmk_keymap_layer_to((uint8_t)layer_id);
83+
// }
8484
}
8585

8686
int layer_status_init(lv_obj_t *parent, lv_group_t *group)

config/boards/helloword/hw75_dynamic/app/screen/status_screen.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ lv_obj_t *zmk_display_status_screen()
2222
knob_status_init(screen);
2323
knob_indicator_init(screen);
2424

25-
lv_indev_t *indev = behavior_lvgl_get_indev();
26-
lv_indev_set_group(indev, group);
25+
// lv_indev_t *indev = behavior_lvgl_get_indev();
26+
// lv_indev_set_group(indev, group);
2727

2828
return screen;
2929
}

config/boards/helloword/hw75_dynamic/app/uart_comm/handler/handler_fn_state.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ bool handle_fn_state(const uart_comm_MessageK2D *k2d)
1515

1616
if (report->pressed) {
1717
current_layer = zmk_keymap_highest_layer_active();
18-
zmk_keymap_layer_to(1);
18+
// zmk_keymap_layer_to(1);
1919
} else {
20-
zmk_keymap_layer_to(current_layer);
20+
// zmk_keymap_layer_to(current_layer);
2121
}
2222

2323
return true;

0 commit comments

Comments
 (0)