From da9bc6702f1d0c928ecaac4b5a1d2242d244cb92 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Fri, 17 Mar 2023 16:00:40 -0400 Subject: [PATCH 1/7] Prepping for PR --- app/boards/shields/bb65/Kconfig.defconfig | 26 ++++ app/boards/shields/bb65/Kconfig.shield | 5 + app/boards/shields/bb65/bb65.conf | 10 ++ app/boards/shields/bb65/bb65.keymap | 119 ++++++++++++++++++ app/boards/shields/bb65/bb65.overlay | 63 ++++++++++ app/boards/shields/bb65/bb65.yml | 10 ++ app/boards/shields/bb65/boards/pillbug.conf | 3 + .../shields/bb65/boards/pillbug.overlay | 38 ++++++ 8 files changed, 274 insertions(+) create mode 100644 app/boards/shields/bb65/Kconfig.defconfig create mode 100644 app/boards/shields/bb65/Kconfig.shield create mode 100644 app/boards/shields/bb65/bb65.conf create mode 100644 app/boards/shields/bb65/bb65.keymap create mode 100644 app/boards/shields/bb65/bb65.overlay create mode 100644 app/boards/shields/bb65/bb65.yml create mode 100644 app/boards/shields/bb65/boards/pillbug.conf create mode 100644 app/boards/shields/bb65/boards/pillbug.overlay diff --git a/app/boards/shields/bb65/Kconfig.defconfig b/app/boards/shields/bb65/Kconfig.defconfig new file mode 100644 index 00000000..8e45a4d4 --- /dev/null +++ b/app/boards/shields/bb65/Kconfig.defconfig @@ -0,0 +1,26 @@ +# Copyright (c) 2023 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_BB65 + +config ZMK_KEYBOARD_NAME + default "BB65" + +if LVGL + +config LVGL_VDB_SIZE + default 64 + +config LVGL_DPI + default 148 + +config LVGL_BITS_PER_PIXEL + default 1 + +choice LVGL_COLOR_DEPTH + default LVGL_COLOR_DEPTH_1 +endchoice + +endif # LVGL + +endif diff --git a/app/boards/shields/bb65/Kconfig.shield b/app/boards/shields/bb65/Kconfig.shield new file mode 100644 index 00000000..617926f6 --- /dev/null +++ b/app/boards/shields/bb65/Kconfig.shield @@ -0,0 +1,5 @@ +# Copyright (c) 2023 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_BB65 + def_bool $(shields_list_contains,bb65) diff --git a/app/boards/shields/bb65/bb65.conf b/app/boards/shields/bb65/bb65.conf new file mode 100644 index 00000000..af141633 --- /dev/null +++ b/app/boards/shields/bb65/bb65.conf @@ -0,0 +1,10 @@ +# Uncomment to turn on logging, and set ZMK logging to debug output +# CONFIG_ZMK_USB_LOGGING=y + +# Uncomment both to enable encoder +# CONFIG_EC11=y +# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y + +# Quality of life settings +# CONFIG_ZMK_IDLE_TIMEOUT=300000 +# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/app/boards/shields/bb65/bb65.keymap b/app/boards/shields/bb65/bb65.keymap new file mode 100644 index 00000000..728be0a7 --- /dev/null +++ b/app/boards/shields/bb65/bb65.keymap @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include +#include +#include + +#define DEFAULT 0 +#define FN 1 +#define SETTINGS 2 +#define LOCK 3 + +#define TIMEOUT 300 + +&encoder_1 { + status = "okay"; +}; + +/ { + combos { + compatible = "zmk,combos"; + combo_btclr { + timeout-ms = ; + key-positions = <1 6>; + bindings = <&bt BT_CLR>; + }; + combo_lock { + timeout-ms = ; + key-positions = <1 7>; + bindings = <&tog 2>; + }; + combo_reset { + timeout-ms = ; + key-positions = <1 3>; + bindings = <&reset>; + }; + combo_bootloader { + timeout-ms = ; + key-positions = <1 15>; + bindings = <&bootloader>; + }; + combo_lock { + timeout-ms = ; + key-positions = <1 12>; + bindings = <&tog LOCK>; + }; + combo_bt_nxt { + timeout-ms = ; + key-positions = <1 4>; + bindings = <&bt BT_NXT>; + }; + }; + + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&encoder_1>; + }; + + keymap0: keymap { + compatible = "zmk,keymap"; + + default_layer { + label = "default layer"; + bindings = < + &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BSLH + &mo FN &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS &trans &kp ENTER + &kp LSHFT &trans &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT &kp UP &ext_power EP_TOG + &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo FN &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT + >; + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; + + }; + + fn_layer { + label = "fn layer"; + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &mo SETTINGS &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp PG_UP &ext_power EP_TOG + &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp END + >; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; + + }; + + setting_layer { + label = "settings layer"; + bindings = < + &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans &trans &kp DEL + &trans &trans &trans &trans &reset &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &bootloader &trans &trans &trans &trans &trans &trans &trans &rgb_ug RGB_EFF + &trans &out OUT_BLE &out OUT_USB &trans &trans &trans &trans &trans &trans &trans + >; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; + + }; + + lock_layer { + label = "fn layer"; + bindings = < + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none + >; + + }; + }; +}; diff --git a/app/boards/shields/bb65/bb65.overlay b/app/boards/shields/bb65/bb65.overlay new file mode 100644 index 00000000..e23915ec --- /dev/null +++ b/app/boards/shields/bb65/bb65.overlay @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + diode-direction = "col2row"; + row-gpios + = <&blackpill 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 39 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 17 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 25 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&blackpill 27 GPIO_ACTIVE_HIGH> + , <&blackpill 28 GPIO_ACTIVE_HIGH> + , <&blackpill 29 GPIO_ACTIVE_HIGH> + , <&blackpill 38 GPIO_ACTIVE_HIGH> + , <&blackpill 40 GPIO_ACTIVE_HIGH> + , <&blackpill 41 GPIO_ACTIVE_HIGH> + , <&blackpill 45 GPIO_ACTIVE_HIGH> + , <&blackpill 46 GPIO_ACTIVE_HIGH> + , <&blackpill 18 GPIO_ACTIVE_HIGH> + ; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; + map = < + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(5,8) RC(5,7) RC(5,6) RC(5,5) RC(5,4) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(6,8) RC(6,7) RC(6,6) RC(6,5) RC(6,4) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(7,0) RC(6,0) RC(6,1) RC(6,2) RC(6,3) + RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(7,8) RC(7,7) RC(7,6) RC(7,5) RC(7,4) RC(7,3) + RC(4,0) RC(4,1) RC(4,2) RC(4,5) RC(4,3) RC(4,4) RC(4,6) RC(4,7) RC(4,8) RC(7,2) + >; + }; + + encoder_1: encoder_1 { + compatible = "alps,ec11"; + label = "Encoder 1"; + a-gpios = <&blackpill 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + b-gpios = <&blackpill 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; +}; diff --git a/app/boards/shields/bb65/bb65.yml b/app/boards/shields/bb65/bb65.yml new file mode 100644 index 00000000..f257b27d --- /dev/null +++ b/app/boards/shields/bb65/bb65.yml @@ -0,0 +1,10 @@ +file_format: "1" +id: bb65 +name: BB65 +type: shield +url: https://mechwild.com/product/bb65/ +requires: [blackpill] +features: + - keys + - encoder + - underglow diff --git a/app/boards/shields/bb65/boards/pillbug.conf b/app/boards/shields/bb65/boards/pillbug.conf new file mode 100644 index 00000000..dda71c13 --- /dev/null +++ b/app/boards/shields/bb65/boards/pillbug.conf @@ -0,0 +1,3 @@ +# Uncomment both to enable underglow +CONFIG_ZMK_RGB_UNDERGLOW=y +CONFIG_WS2812_STRIP=y diff --git a/app/boards/shields/bb65/boards/pillbug.overlay b/app/boards/shields/bb65/boards/pillbug.overlay new file mode 100644 index 00000000..5d39b732 --- /dev/null +++ b/app/boards/shields/bb65/boards/pillbug.overlay @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include + +&spi1 { + compatible = "nordic,nrf-spim"; + status = "okay"; + mosi-pin = <5>; + // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. + sck-pin = <27>; + miso-pin = <28>; + + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + label = "WS2812"; + + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; + + /* WS2812 */ + chain-length = <10>; /* number of LEDs */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + + color-mapping = ; + }; +}; + +/ { + chosen { + zmk,underglow = &led_strip; + }; +}; \ No newline at end of file From b2cd5b5663a35a942f30afb67ac421d6230bb019 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Fri, 17 Mar 2023 17:43:26 -0400 Subject: [PATCH 2/7] Style formatting change on zmk.yml file extension --- app/boards/shields/bb65/{bb65.yml => bb65.zmk.yml} | 0 app/boards/shields/bb65/boards/pillbug.overlay | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename app/boards/shields/bb65/{bb65.yml => bb65.zmk.yml} (100%) diff --git a/app/boards/shields/bb65/bb65.yml b/app/boards/shields/bb65/bb65.zmk.yml similarity index 100% rename from app/boards/shields/bb65/bb65.yml rename to app/boards/shields/bb65/bb65.zmk.yml diff --git a/app/boards/shields/bb65/boards/pillbug.overlay b/app/boards/shields/bb65/boards/pillbug.overlay index 5d39b732..60f24fe3 100644 --- a/app/boards/shields/bb65/boards/pillbug.overlay +++ b/app/boards/shields/bb65/boards/pillbug.overlay @@ -35,4 +35,4 @@ chosen { zmk,underglow = &led_strip; }; -}; \ No newline at end of file +}; From f75828bca78dd7536371fb1be9c7cfd9208c83ba Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Fri, 17 Mar 2023 17:54:54 -0400 Subject: [PATCH 3/7] Defaulting to RGB off and keeping as much as I can in the main shield config --- app/boards/shields/bb65/bb65.conf | 4 ++++ app/boards/shields/bb65/boards/pillbug.conf | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 app/boards/shields/bb65/boards/pillbug.conf diff --git a/app/boards/shields/bb65/bb65.conf b/app/boards/shields/bb65/bb65.conf index af141633..9778bc95 100644 --- a/app/boards/shields/bb65/bb65.conf +++ b/app/boards/shields/bb65/bb65.conf @@ -1,6 +1,10 @@ # Uncomment to turn on logging, and set ZMK logging to debug output # CONFIG_ZMK_USB_LOGGING=y +# Uncomment both to enable underglow +# CONFIG_ZMK_RGB_UNDERGLOW=y +# CONFIG_WS2812_STRIP=y + # Uncomment both to enable encoder # CONFIG_EC11=y # CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y diff --git a/app/boards/shields/bb65/boards/pillbug.conf b/app/boards/shields/bb65/boards/pillbug.conf deleted file mode 100644 index dda71c13..00000000 --- a/app/boards/shields/bb65/boards/pillbug.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Uncomment both to enable underglow -CONFIG_ZMK_RGB_UNDERGLOW=y -CONFIG_WS2812_STRIP=y From 2e851fe74edbab523703e630b9948d4c0fed9f93 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Sat, 18 Mar 2023 03:30:55 -0400 Subject: [PATCH 4/7] Added conf for blackpill to help with the matrix scanning --- app/boards/shields/bb65/bb65.conf | 14 +++++++------- app/boards/shields/bb65/bb65.keymap | 4 ---- .../shields/bb65/boards/blackpill_f401ce.conf | 3 +++ app/boards/shields/bb65/boards/pillbug.overlay | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 app/boards/shields/bb65/boards/blackpill_f401ce.conf diff --git a/app/boards/shields/bb65/bb65.conf b/app/boards/shields/bb65/bb65.conf index 9778bc95..ae53c4ae 100644 --- a/app/boards/shields/bb65/bb65.conf +++ b/app/boards/shields/bb65/bb65.conf @@ -1,14 +1,14 @@ # Uncomment to turn on logging, and set ZMK logging to debug output -# CONFIG_ZMK_USB_LOGGING=y +#CONFIG_ZMK_USB_LOGGING=y # Uncomment both to enable underglow -# CONFIG_ZMK_RGB_UNDERGLOW=y -# CONFIG_WS2812_STRIP=y +#CONFIG_ZMK_RGB_UNDERGLOW=y +#CONFIG_WS2812_STRIP=y # Uncomment both to enable encoder -# CONFIG_EC11=y -# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y +#CONFIG_EC11=y +#CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # Quality of life settings -# CONFIG_ZMK_IDLE_TIMEOUT=300000 -# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +#CONFIG_ZMK_IDLE_TIMEOUT=300000 +#CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/app/boards/shields/bb65/bb65.keymap b/app/boards/shields/bb65/bb65.keymap index 728be0a7..e4094098 100644 --- a/app/boards/shields/bb65/bb65.keymap +++ b/app/boards/shields/bb65/bb65.keymap @@ -75,7 +75,6 @@ &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo FN &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT >; sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; - }; fn_layer { @@ -88,7 +87,6 @@ &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp END >; sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; - }; setting_layer { @@ -101,7 +99,6 @@ &trans &out OUT_BLE &out OUT_USB &trans &trans &trans &trans &trans &trans &trans >; sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; - }; lock_layer { @@ -113,7 +110,6 @@ &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none >; - }; }; }; diff --git a/app/boards/shields/bb65/boards/blackpill_f401ce.conf b/app/boards/shields/bb65/boards/blackpill_f401ce.conf new file mode 100644 index 00000000..2a8d16df --- /dev/null +++ b/app/boards/shields/bb65/boards/blackpill_f401ce.conf @@ -0,0 +1,3 @@ +# Necessary to stop double matrix reads on first row +CONFIG_ZMK_KSCAN_MATRIX_WAIT_BEFORE_INPUTS=150 +CONFIG_ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS=150 diff --git a/app/boards/shields/bb65/boards/pillbug.overlay b/app/boards/shields/bb65/boards/pillbug.overlay index 60f24fe3..9f19be72 100644 --- a/app/boards/shields/bb65/boards/pillbug.overlay +++ b/app/boards/shields/bb65/boards/pillbug.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ - #include +#include &spi1 { compatible = "nordic,nrf-spim"; From 994356622f726aa9379dd536f8681dc8e89addc1 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Sat, 18 Mar 2023 03:31:39 -0400 Subject: [PATCH 5/7] Added conf for blackpill to help with the matrix scanning --- app/boards/shields/bb65/bb65.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/bb65/bb65.conf b/app/boards/shields/bb65/bb65.conf index ae53c4ae..81a3fad6 100644 --- a/app/boards/shields/bb65/bb65.conf +++ b/app/boards/shields/bb65/bb65.conf @@ -1,7 +1,7 @@ # Uncomment to turn on logging, and set ZMK logging to debug output #CONFIG_ZMK_USB_LOGGING=y -# Uncomment both to enable underglow +# Uncomment both to enable underglow, will not work with blackpill (currently) #CONFIG_ZMK_RGB_UNDERGLOW=y #CONFIG_WS2812_STRIP=y From bb7de7f38962527d429b9d01fec3b7d10fe11b2c Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Mon, 1 May 2023 16:49:54 -0400 Subject: [PATCH 6/7] Updating to 3.2 --- .github/workflows/build.yml | 409 +--------------------- app/boards/shields/bb65/Kconfig.defconfig | 10 +- app/boards/shields/bb65/bb65.keymap | 9 +- 3 files changed, 9 insertions(+), 419 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82b156e1..d74fb89f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,410 +1,5 @@ -name: Build - -on: - push: - paths: - - ".github/workflows/build.yml" - - "app/**" - pull_request: - paths: - - ".github/workflows/build.yml" - - "app/**" - schedule: - - cron: "22 4 * * *" +on: [push, pull_request, workflow_dispatch] jobs: build: - if: ${{ always() }} - runs-on: ubuntu-latest - container: - image: docker.io/zmkfirmware/zmk-build-arm:3.2 - needs: compile-matrix - strategy: - matrix: - include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Cache west modules - uses: actions/cache@v3.0.2 - env: - cache-name: cache-zephyr-modules - with: - path: | - modules/ - tools/ - zephyr/ - bootloader/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - timeout-minutes: 2 - continue-on-error: true - - name: Initialize workspace (west init) - run: west init -l app - - name: Update modules (west update) - run: west update - - name: Export Zephyr CMake package (west zephyr-export) - run: west zephyr-export - - name: Use Node.js - uses: actions/setup-node@v2 - with: - node-version: "14.x" - - name: Install @actions/artifact - run: npm install @actions/artifact - - name: Build and upload artifacts - uses: actions/github-script@v4 - id: boards-list - with: - script: | - const fs = require('fs'); - const artifact = require('@actions/artifact'); - const artifactClient = artifact.create(); - - const execSync = require('child_process').execSync; - - const buildShieldArgs = JSON.parse(`${{ matrix.shieldArgs }}`); - - let error = false; - - for (const shieldArgs of buildShieldArgs) { - try { - const output = execSync(`west build -s app -p -b ${{ matrix.board }} -- ${shieldArgs.shield ? '-DSHIELD="' + shieldArgs.shield + '"' : ''} ${shieldArgs['cmake-args'] || ''}`); - - console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Build`) - console.log(output.toString()); - - const fileExtensions = ["hex", "uf2"]; - - const files = fileExtensions - .map(extension => "build/zephyr/zmk." + extension) - .filter(path => fs.existsSync(path)); - - const rootDirectory = 'build/zephyr'; - const options = { - continueOnError: true - } - - const cmakeName = shieldArgs['cmake-args'] ? '-' + (shieldArgs.nickname || shieldArgs['cmake-args'].split(' ').join('')) : ''; - const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`; - - await artifactClient.uploadArtifact(artifactName, files, rootDirectory, options); - } catch (e) { - console.error(`::error::Failed to build or upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`); - console.error(e); - error = true; - } finally { - console.log('::endgroup::'); - } - } - - if (error) { - throw new Error('Failed to build one or more configurations'); - } - compile-matrix: - if: ${{ always() }} - runs-on: ubuntu-latest - needs: [core-coverage, board-changes, nightly] - outputs: - include-list: ${{ steps.compile-list.outputs.result }} - steps: - - name: Join build lists - uses: actions/github-script@v4 - id: compile-list - with: - script: | - const coreCoverage = `${{ needs.core-coverage.outputs.core-include }}` || "[]"; - const boardChanges = `${{ needs.board-changes.outputs.boards-include }}` || "[]"; - const nightly = `${{ needs.nightly.outputs.nightly-include }}` || "[]"; - - const combined = [ - ...JSON.parse(coreCoverage), - ...JSON.parse(boardChanges), - ...JSON.parse(nightly) - ]; - const combinedUnique = [...new Map(combined.map(el => [JSON.stringify(el), el])).values()]; - - const perBoard = {}; - - for (const configuration of combinedUnique) { - if (!perBoard[configuration.board]) - perBoard[configuration.board] = []; - - perBoard[configuration.board].push({ - shield: configuration.shield, - 'cmake-args': configuration['cmake-args'], - nickname: configuration.nickname - }) - } - - return Object.entries(perBoard).map(([board, shieldArgs]) => ({ - board, - shieldArgs: JSON.stringify(shieldArgs), - })); - core-coverage: - if: ${{ needs.get-changed-files.outputs.core-changes == 'true' }} - runs-on: ubuntu-latest - needs: get-changed-files - outputs: - core-include: ${{ steps.core-list.outputs.result }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Use Node.js - uses: actions/setup-node@v2 - with: - node-version: "14.x" - - name: Install js-yaml - run: npm install js-yaml - - uses: actions/github-script@v4 - id: core-list - with: - script: | - const fs = require('fs'); - const yaml = require('js-yaml'); - - const coreCoverage = yaml.load(fs.readFileSync('app/core-coverage.yml', 'utf8')); - - let include = coreCoverage.board.flatMap(board => - coreCoverage.shield.map(shield => ({ board, shield })) - ); - - return [...include, ...coreCoverage.include]; - board-changes: - if: ${{ needs.get-changed-files.outputs.board-changes == 'true' }} - runs-on: ubuntu-latest - needs: [get-grouped-hardware, get-changed-files] - outputs: - boards-include: ${{ steps.boards-list.outputs.result }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Use Node.js - uses: actions/setup-node@v2 - with: - node-version: "14.x" - - name: Install js-yaml - run: npm install js-yaml - - uses: actions/github-script@v4 - id: boards-list - with: - script: | - const fs = require('fs'); - const yaml = require('js-yaml'); - - const changedFiles = JSON.parse(`${{ needs.get-changed-files.outputs.changed-files }}`); - const metadata = JSON.parse(`${{ needs.get-grouped-hardware.outputs.organized-metadata }}`); - const boardChanges = new Set(changedFiles.filter(f => f.startsWith('app/boards')).map(f => f.split('/').slice(0, 4).join('/'))); - - return (await Promise.all([...boardChanges].flatMap(async bc => { - const globber = await glob.create(bc + "/*.zmk.yml"); - const files = await globber.glob(); - - const aggregated = files.flatMap((f) => - yaml.loadAll(fs.readFileSync(f, "utf8")) - ); - - const boardAndShield = (b, s) => { - if (s.siblings) { - return s.siblings.map(shield => ({ - board: b.id, - shield, - })); - } else { - return { - board: b.id, - shield: s.id - }; - } - } - - return aggregated.flatMap(hm => { - switch (hm.type) { - case "board": - if (hm.features && hm.features.includes("keys")) { - if (hm.siblings) { - return hm.siblings.map(board => ({ - board, - })); - } else { - return { - board: hm.id - }; - } - } else if (hm.exposes) { - return hm.exposes.flatMap(i => - metadata.interconnects[i].shields.flatMap(s => boardAndShield(hm, s)) - ); - } else { - console.error("Board without keys or interconnect"); - } - break; - case "shield": - if (hm.features && hm.features.includes("keys")) { - return hm.requires.flatMap(i => - metadata.interconnects[i].boards.flatMap(b => boardAndShield(b, hm)) - ); - } else { - console.warn("Unhandled shield without keys"); - return []; - } - break; - case "interconnect": - return []; - } - }); - }))).flat(); - nightly: - if: ${{ github.event_name == 'schedule' }} - runs-on: ubuntu-latest - needs: get-grouped-hardware - outputs: - nightly-include: ${{ steps.nightly-list.outputs.result }} - steps: - - name: Create nightly list - uses: actions/github-script@v4 - id: nightly-list - with: - script: | - const metadata = JSON.parse(`${{ needs.get-grouped-hardware.outputs.organized-metadata }}`); - - let includeOnboard = metadata.onboard.flatMap(b => { - if (b.siblings) { - return b.siblings.map(board => ({ - board, - })); - } else { - return { - board: b.id, - }; - } - }); - - let includeInterconnect = Object.values(metadata.interconnects).flatMap(i => - i.boards.flatMap(b => - i.shields.flatMap(s => { - if (s.siblings) { - return s.siblings.map(shield => ({ - board: b.id, - shield, - })); - } else { - return { - board: b.id, - shield: s.id, - }; - } - }) - ) - ); - - return [...includeOnboard, ...includeInterconnect]; - get-grouped-hardware: - runs-on: ubuntu-latest - outputs: - organized-metadata: ${{ steps.organize-metadata.outputs.result }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Use Node.js - uses: actions/setup-node@v2 - with: - node-version: "14.x" - - name: Install js-yaml - run: npm install js-yaml - - name: Aggregate Metadata - uses: actions/github-script@v4 - id: aggregate-metadata - with: - script: | - const fs = require('fs'); - const yaml = require('js-yaml'); - - const globber = await glob.create("app/boards/**/*.zmk.yml"); - const files = await globber.glob(); - - const aggregated = files.flatMap((f) => - yaml.loadAll(fs.readFileSync(f, "utf8")) - ); - - return JSON.stringify(aggregated).replace(/\\/g,"\\\\").replace(/`/g,"\\`"); - result-encoding: string - - - name: Organize Metadata - uses: actions/github-script@v4 - id: organize-metadata - with: - script: | - const hardware = JSON.parse(`${{ steps.aggregate-metadata.outputs.result }}`); - - const grouped = hardware.reduce((agg, hm) => { - switch (hm.type) { - case "board": - if (hm.features && hm.features.includes("keys")) { - agg.onboard.push(hm); - } else if (hm.exposes) { - hm.exposes.forEach((element) => { - let ic = agg.interconnects[element] || { - boards: [], - shields: [], - }; - ic.boards.push(hm); - agg.interconnects[element] = ic; - }); - } else { - console.error("Board without keys or interconnect"); - } - break; - case "shield": - if (hm.features && hm.features.includes("keys")) { - hm.requires.forEach((id) => { - let ic = agg.interconnects[id] || { boards: [], shields: [] }; - ic.shields.push(hm); - agg.interconnects[id] = ic; - }); - } - break; - case "interconnect": - let ic = agg.interconnects[hm.id] || { boards: [], shields: [] }; - ic.interconnect = hm; - agg.interconnects[hm.id] = ic; - break; - } - return agg; - }, - { onboard: [], interconnects: {} }); - - return JSON.stringify(grouped).replace(/\\/g,"\\\\").replace(/`/g,"\\`"); - result-encoding: string - get-changed-files: - if: ${{ github.event_name != 'schedule' }} - runs-on: ubuntu-latest - outputs: - changed-files: ${{ steps.changed-files.outputs.all }} - board-changes: ${{ steps.board-changes.outputs.result }} - core-changes: ${{ steps.core-changes.outputs.result }} - steps: - - uses: Ana06/get-changed-files@v2.0.0 - id: changed-files - with: - format: "json" - - uses: actions/github-script@v4 - id: board-changes - with: - script: | - const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`); - const boardChanges = changedFiles.filter(f => f.startsWith('app/boards')); - return boardChanges.length ? 'true' : 'false'; - result-encoding: string - - uses: actions/github-script@v4 - id: core-changes - with: - script: | - const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`); - const boardChanges = changedFiles.filter(f => f.startsWith('app/boards')); - const appChanges = changedFiles.filter(f => f.startsWith('app')); - const ymlChanges = changedFiles.includes('.github/workflows/build.yml'); - return boardChanges.length < appChanges.length || ymlChanges ? 'true' : 'false'; - result-encoding: string + uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main diff --git a/app/boards/shields/bb65/Kconfig.defconfig b/app/boards/shields/bb65/Kconfig.defconfig index 8e45a4d4..7ebee4c6 100644 --- a/app/boards/shields/bb65/Kconfig.defconfig +++ b/app/boards/shields/bb65/Kconfig.defconfig @@ -8,17 +8,17 @@ config ZMK_KEYBOARD_NAME if LVGL -config LVGL_VDB_SIZE +config LV_Z_VDB_SIZE default 64 -config LVGL_DPI +config LV_DPI_DEF default 148 -config LVGL_BITS_PER_PIXEL +config LV_Z_BITS_PER_PIXEL default 1 -choice LVGL_COLOR_DEPTH - default LVGL_COLOR_DEPTH_1 +choice LV_COLOR_DEPTH + default LV_COLOR_DEPTH_1 endchoice endif # LVGL diff --git a/app/boards/shields/bb65/bb65.keymap b/app/boards/shields/bb65/bb65.keymap index e4094098..e74ea96c 100644 --- a/app/boards/shields/bb65/bb65.keymap +++ b/app/boards/shields/bb65/bb65.keymap @@ -30,15 +30,10 @@ key-positions = <1 6>; bindings = <&bt BT_CLR>; }; - combo_lock { - timeout-ms = ; - key-positions = <1 7>; - bindings = <&tog 2>; - }; combo_reset { timeout-ms = ; key-positions = <1 3>; - bindings = <&reset>; + bindings = <&sys_reset>; }; combo_bootloader { timeout-ms = ; @@ -93,7 +88,7 @@ label = "settings layer"; bindings = < &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans &trans &kp DEL - &trans &trans &trans &trans &reset &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &sys_reset &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &bootloader &trans &trans &trans &trans &trans &trans &trans &rgb_ug RGB_EFF &trans &out OUT_BLE &out OUT_USB &trans &trans &trans &trans &trans &trans &trans From bee515227e7fe78f535831ae6b9dab908355679c Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Mon, 1 May 2023 16:56:04 -0400 Subject: [PATCH 7/7] Fixed whitespace --- .../shields/bb65/boards/pillbug.overlay | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/boards/shields/bb65/boards/pillbug.overlay b/app/boards/shields/bb65/boards/pillbug.overlay index 9f19be72..be0eb580 100644 --- a/app/boards/shields/bb65/boards/pillbug.overlay +++ b/app/boards/shields/bb65/boards/pillbug.overlay @@ -7,32 +7,32 @@ #include &spi1 { - compatible = "nordic,nrf-spim"; - status = "okay"; - mosi-pin = <5>; - // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. - sck-pin = <27>; - miso-pin = <28>; + compatible = "nordic,nrf-spim"; + status = "okay"; + mosi-pin = <5>; + // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. + sck-pin = <27>; + miso-pin = <28>; - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - label = "WS2812"; + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + label = "WS2812"; - /* SPI */ - reg = <0>; /* ignored, but necessary for SPI bindings */ - spi-max-frequency = <4000000>; + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; - /* WS2812 */ - chain-length = <10>; /* number of LEDs */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; + /* WS2812 */ + chain-length = <10>; /* number of LEDs */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; - color-mapping = ; - }; + color-mapping = ; + }; }; / { - chosen { - zmk,underglow = &led_strip; - }; + chosen { + zmk,underglow = &led_strip; + }; };