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

Update to latest lvgl/zmk/zephyr ; remove version text from oled per PR

Browse source
This commit is contained in:
KemoNine 2020-12-28 16:27:23 +00:00
parent 8c22cdba29
commit f91ec79252
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,9 +51,6 @@ lv_obj_t *zmk_display_status_screen() {
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);
#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;

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

@ -6,8 +6,8 @@ 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
depends on !ZMK_SPLIT || ZMK_SPLIT_BLE_ROLE_CENTRAL
select LVGL_FONT_MONTSERRAT_12
config ZMK_WIDGET_BATTERY_STATUS
bool "Widget for battery charge information, using small icons"

17
app/src/display/widgets/layer_status.c
View file

@ -16,16 +16,19 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);
static lv_style_t label_style;
static bool style_initialized = false;
void layer_status_init() {
if (label_style.text.font != NULL) {
if (style_initialized) {
return;
}
lv_style_copy(&label_style, &lv_style_plain);
label_style.text.color = LV_COLOR_BLACK;
label_style.text.font = &lv_font_roboto_12;
label_style.text.letter_space = 1;
label_style.text.line_space = 1;
style_initialized = true;
lv_style_init(&label_style);
lv_style_set_text_color(&label_style, LV_STATE_DEFAULT, LV_COLOR_BLACK);
lv_style_set_text_font(&label_style, LV_STATE_DEFAULT, &lv_font_montserrat_12);
lv_style_set_text_letter_space(&label_style, LV_STATE_DEFAULT, 1);
lv_style_set_text_line_space(&label_style, LV_STATE_DEFAULT, 1);
}
void set_layer_symbol(lv_obj_t *label) {
@ -41,7 +44,7 @@ void set_layer_symbol(lv_obj_t *label) {
int zmk_widget_layer_status_init(struct zmk_widget_layer_status *widget, lv_obj_t *parent) {
layer_status_init();
widget->obj = lv_label_create(parent, NULL);
lv_label_set_style(widget->obj, LV_LABEL_STYLE_MAIN, &label_style);
lv_obj_add_style(widget->obj, LV_LABEL_PART_MAIN, &label_style);
lv_obj_set_size(widget->obj, 40, 15);
set_layer_symbol(widget->obj);