pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(displays): Adjust alignment and spacing

Browse source 
* Adjust alignment and spacing
* Fix char array lengths
This commit is contained in:
Nick Winans 2022-10-21 22:10:55 -05:00 committed by GitHub
parent c9eb63199a
commit d3d5b8eb8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ lv_obj_t *zmk_display_status_screen() {
#if IS_ENABLED(CONFIG_ZMK_WIDGET_WPM_STATUS) #if IS_ENABLED(CONFIG_ZMK_WIDGET_WPM_STATUS)
zmk_widget_wpm_status_init(&wpm_status_widget, screen); zmk_widget_wpm_status_init(&wpm_status_widget, screen);
lv_obj_align(zmk_widget_wpm_status_obj(&wpm_status_widget), NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -12, lv_obj_align(zmk_widget_wpm_status_obj(&wpm_status_widget), NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0,
0); 0);
#endif #endif
return screen; return screen;

5
app/src/display/widgets/battery_status.c
View file

@ -27,13 +27,13 @@ struct battery_status_state {
}; };
static void set_battery_symbol(lv_obj_t *label, struct battery_status_state state) { static void set_battery_symbol(lv_obj_t *label, struct battery_status_state state) {
char text[2] = " "; char text[8] = {};
uint8_t level = state.level; uint8_t level = state.level;
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
if (state.usb_present) { if (state.usb_present) {
strcpy(text, LV_SYMBOL_CHARGE); strcpy(text, LV_SYMBOL_CHARGE " ");
} }
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */
@ -49,6 +49,7 @@ static void set_battery_symbol(lv_obj_t *label, struct battery_status_state stat
strcat(text, LV_SYMBOL_BATTERY_EMPTY); strcat(text, LV_SYMBOL_BATTERY_EMPTY);
} }
lv_label_set_text(label, text); lv_label_set_text(label, text);
lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
} }
void battery_status_update_cb(struct battery_status_state state) { void battery_status_update_cb(struct battery_status_state state) {

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

@ -24,15 +24,15 @@ struct layer_status_state {
static void set_layer_symbol(lv_obj_t *label, struct layer_status_state state) { static void set_layer_symbol(lv_obj_t *label, struct layer_status_state state) {
if (state.label == NULL) { if (state.label == NULL) {
char text[6] = {}; char text[7] = {};
sprintf(text, LV_SYMBOL_KEYBOARD "%i", state.index); sprintf(text, LV_SYMBOL_KEYBOARD " %i", state.index);
lv_label_set_text(label, text); lv_label_set_text(label, text);
} else { } else {
char text[12] = {}; char text[13] = {};
snprintf(text, 12, LV_SYMBOL_KEYBOARD "%s", state.label); snprintf(text, sizeof(text), LV_SYMBOL_KEYBOARD " %s", state.label);
lv_label_set_text(label, text); lv_label_set_text(label, text);
} }

16
app/src/display/widgets/output_status.c
View file

@ -39,24 +39,24 @@ static struct output_status_state get_state(const zmk_event_t *_eh) {
} }
static void set_status_symbol(lv_obj_t *label, struct output_status_state state) { static void set_status_symbol(lv_obj_t *label, struct output_status_state state) {
char text[9] = {}; char text[10] = {};
switch (state.selected_endpoint) { switch (state.selected_endpoint) {
case ZMK_ENDPOINT_USB: case ZMK_ENDPOINT_USB:
strcat(text, LV_SYMBOL_USB " "); strcat(text, LV_SYMBOL_USB);
break; break;
case ZMK_ENDPOINT_BLE: case ZMK_ENDPOINT_BLE:
if (state.active_profile_bonded) { if (state.active_profile_bonded) {
if (state.active_profile_connected) { if (state.active_profile_connected) {
snprintf(text, sizeof(text), LV_SYMBOL_WIFI "%i " LV_SYMBOL_OK, snprintf(text, sizeof(text), LV_SYMBOL_WIFI " %i " LV_SYMBOL_OK,
state.active_profile_index); state.active_profile_index + 1);
} else { } else {
snprintf(text, sizeof(text), LV_SYMBOL_WIFI "%i " LV_SYMBOL_CLOSE, snprintf(text, sizeof(text), LV_SYMBOL_WIFI " %i " LV_SYMBOL_CLOSE,
state.active_profile_index); state.active_profile_index + 1);
} }
} else { } else {
snprintf(text, sizeof(text), LV_SYMBOL_WIFI "%i " LV_SYMBOL_SETTINGS, snprintf(text, sizeof(text), LV_SYMBOL_WIFI " %i " LV_SYMBOL_SETTINGS,
state.active_profile_index); state.active_profile_index + 1);
} }
break; break;
} }

3
app/src/display/widgets/wpm_status.c
View file

@ -28,9 +28,10 @@ void set_wpm_symbol(lv_obj_t *label, struct wpm_status_state state) {
char text[4] = {}; char text[4] = {};
LOG_DBG("WPM changed to %i", state.wpm); LOG_DBG("WPM changed to %i", state.wpm);
snprintf(text, sizeof(text), "%i ", state.wpm); snprintf(text, sizeof(text), "%i", state.wpm);
lv_label_set_text(label, text); lv_label_set_text(label, text);
lv_obj_align(label, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
} }
void wpm_status_update_cb(struct wpm_status_state state) { void wpm_status_update_cb(struct wpm_status_state state) {