kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update layer widget to only be enabled on primary half of a split keyboard and shuffle some of the options specific to the widget to be enabled via the widget

Browse source
This commit is contained in:
KemoNine 2020-12-13 20:41:49 +00:00
parent 2332f28a59
commit 8c22cdba29
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/display/Kconfig
View file

@ -8,7 +8,6 @@ menuconfig ZMK_DISPLAY
select LVGL select LVGL
select LVGL_THEMES select LVGL_THEMES
select LVGL_THEME_MONO select LVGL_THEME_MONO
select LVGL_BUILD_IN_FONT_ROBOTO_12
if ZMK_DISPLAY if ZMK_DISPLAY

7
app/src/display/status_screen.c
View file

@ -20,7 +20,9 @@ static struct zmk_widget_battery_status battery_status_widget;
static struct zmk_widget_output_status output_status_widget; static struct zmk_widget_output_status output_status_widget;
#endif #endif
#if IS_ENABLED(CONFIG_ZMK_WIDGET_LAYER_STATUS)
static struct zmk_widget_layer_status layer_status_widget; static struct zmk_widget_layer_status layer_status_widget;
#endif
lv_obj_t *zmk_display_status_screen() { lv_obj_t *zmk_display_status_screen() {
lv_obj_t *screen; lv_obj_t *screen;
@ -42,12 +44,17 @@ lv_obj_t *zmk_display_status_screen() {
0); 0);
#endif #endif
#if IS_ENABLED(CONFIG_ZMK_WIDGET_LAYER_STATUS)
zmk_widget_layer_status_init(&layer_status_widget, screen); zmk_widget_layer_status_init(&layer_status_widget, screen);
lv_obj_align(zmk_widget_layer_status_obj(&layer_status_widget), NULL, LV_ALIGN_IN_BOTTOM_LEFT, lv_obj_align(zmk_widget_layer_status_obj(&layer_status_widget), NULL, LV_ALIGN_IN_BOTTOM_LEFT,
0, 0); 0, 0);
lv_label_set_text(zmk_version_label, "ZMK v0.1.0"); lv_label_set_text(zmk_version_label, "ZMK v0.1.0");
lv_obj_align(zmk_version_label, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); lv_obj_align(zmk_version_label, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
#else
lv_label_set_text(zmk_version_label, "ZMK v0.1.0");
lv_obj_align(zmk_version_label, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
#endif
return screen; return screen;
} }

3
app/src/display/widgets/CMakeLists.txt
View file

@ -3,5 +3,4 @@
target_sources_ifdef(CONFIG_ZMK_WIDGET_BATTERY_STATUS app PRIVATE battery_status.c) target_sources_ifdef(CONFIG_ZMK_WIDGET_BATTERY_STATUS app PRIVATE battery_status.c)
target_sources_ifdef(CONFIG_ZMK_WIDGET_OUTPUT_STATUS app PRIVATE output_status.c) target_sources_ifdef(CONFIG_ZMK_WIDGET_OUTPUT_STATUS app PRIVATE output_status.c)
target_sources_ifdef(CONFIG_ZMK_WIDGET_LAYER_STATUS app PRIVATE layer_status.c)
target_sources(app PRIVATE layer_status.c)

6
app/src/display/widgets/Kconfig
View file

@ -3,6 +3,12 @@
menu "ZMK Display Widgets" menu "ZMK Display Widgets"
config ZMK_WIDGET_LAYER_STATUS
bool "Widget for highest, active layer using small icons"
default y
depends on !ZMK_SPLIT_PERIPHERAL
select LVGL_BUILD_IN_FONT_ROBOTO_12
config ZMK_WIDGET_BATTERY_STATUS config ZMK_WIDGET_BATTERY_STATUS
bool "Widget for battery charge information, using small icons" bool "Widget for battery charge information, using small icons"
depends on BT depends on BT