diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5470febb13f..f169d5cb942 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,12 +3,12 @@ name: Build on: push: paths: - - '.github/workflows/build.yml' - - 'app/**' + - ".github/workflows/build.yml" + - "app/**" pull_request: paths: - - '.github/workflows/build.yml' - - 'app/**' + - ".github/workflows/build.yml" + - "app/**" jobs: build: @@ -62,7 +62,7 @@ jobs: - tidbit - helix_4_left - helix_4_right - cmake-args: [''] + cmake-args: [""] include: - board: bdn9_rev2 - board: dz60rgb_rev1 @@ -126,7 +126,7 @@ jobs: if: ${{ !matrix.skip-archive }} uses: actions/upload-artifact@v2 with: - name: '${{ steps.variables.outputs.artifact-name }}' + name: "${{ steps.variables.outputs.artifact-name }}" path: | build/zephyr/zmk.hex build/zephyr/zmk.uf2 diff --git a/app/src/display.c b/app/src/display.c deleted file mode 100644 index ecd19086446..00000000000 --- a/app/src/display.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include - -#include -LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); - -#include -#include - -#define ZMK_DISPLAY_NAME CONFIG_LVGL_DISPLAY_DEV_NAME - -static struct device *display; - -static lv_obj_t *screen; - -int zmk_display_init() { - lv_obj_t *hello_world_label; - lv_obj_t *count_label; - - LOG_DBG(""); - - display = device_get_binding(ZMK_DISPLAY_NAME); - if (display == NULL) { - LOG_ERR("Failed to find display device"); - return -EINVAL; - } - - screen = lv_obj_create(NULL, NULL); - lv_scr_load(screen); - - hello_world_label = lv_label_create(lv_scr_act(), NULL); - lv_label_set_text(hello_world_label, "ZMK v0.1.0"); - lv_obj_align(hello_world_label, NULL, LV_ALIGN_CENTER, 0, 0); - count_label = lv_label_create(lv_scr_act(), NULL); - lv_label_set_text(count_label, CONFIG_ZMK_KEYBOARD_NAME); - lv_obj_align(count_label, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0); - lv_task_handler(); - display_blanking_off(display); - - return 0; -} - -void zmk_display_task_handler() { - lv_tick_inc(10); - lv_task_handler(); - k_sleep(K_MSEC(10)); -}