Updating to zephyr 3.0.

This commit is contained in:
Andrew Rae 2022-04-03 12:30:14 -04:00
parent 3dd40c40c1
commit 28c1d3c484
3 changed files with 6 additions and 9 deletions

View file

@ -71,11 +71,6 @@ jobs:
- name: West Build (${{ steps.variables.outputs.display-name }}) - name: West Build (${{ steps.variables.outputs.display-name }})
run: | run: |
west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/config ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }} west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/config ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }}
- name: ${{ steps.variables.outputs.display-name }} DTS File
if: ${{ always() }}
run: |
if [ -f "build/zephyr/${{ matrix.board }}.dts.pre.tmp" ]; then cat -n build/zephyr/${{ matrix.board }}.dts.pre.tmp; fi
if [ -f "build/zephyr/zephyr.dts" ]; then cat -n build/zephyr/zephyr.dts; fi
- name: ${{ steps.variables.outputs.display-name }} Kconfig file - name: ${{ steps.variables.outputs.display-name }} Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename artifacts - name: Rename artifacts

View file

@ -1,6 +1,8 @@
# Copyright (c) 2022 The ZMK Contributors # Copyright (c) 2022 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
CONFIG_BUILD_OUTPUT_UF2=y
if SHIELD_RAE_DUX_LEFT if SHIELD_RAE_DUX_LEFT
config ZMK_KEYBOARD_NAME config ZMK_KEYBOARD_NAME

View file

@ -58,8 +58,8 @@
COMBO(semicolon, &kp SEMI, 27 28, 60) COMBO(semicolon, &kp SEMI, 27 28, 60)
COMBO(slash, &kp FSLH, 1 2, 60) COMBO(slash, &kp FSLH, 1 2, 60)
COMBO(underscore, &kp UNDER, 31 32, 100) COMBO(minus, &kp MINUS, 31 32, 100)
COMBO(minus, &kp MINUS, 33 34, 100) COMBO(underscore, &kp UNDER, 33 34, 100)
COMBO(equal, &kp EQUAL, 12 23, 100) COMBO(equal, &kp EQUAL, 12 23, 100)
COMBO(enter, &kp ENTER, 17 26, 60) COMBO(enter, &kp ENTER, 17 26, 60)
@ -75,7 +75,7 @@
#binding-cells = <2>; #binding-cells = <2>;
flavor = "tap-preferred"; flavor = "tap-preferred";
tapping-term-ms = <200>; tapping-term-ms = <200>;
quick-tap-ms = <100>; quick-tap-ms = <125>;
global-quick-tap; global-quick-tap;
bindings = <&kp>, <&kp>; bindings = <&kp>, <&kp>;
// hold-trigger-key-positions = <5 6 7 8 9 15 16 17 18 19 25 26 27 28 29 30 31 32 33 34 35>; // hold-trigger-key-positions = <5 6 7 8 9 15 16 17 18 19 25 26 27 28 29 30 31 32 33 34 35>;
@ -88,7 +88,7 @@
#binding-cells = <2>; #binding-cells = <2>;
flavor = "tap-preferred"; flavor = "tap-preferred";
tapping-term-ms = <200>; tapping-term-ms = <200>;
quick-tap-ms = <100>; quick-tap-ms = <125>;
global-quick-tap; global-quick-tap;
bindings = <&kp>, <&kp>; bindings = <&kp>, <&kp>;
// hold-trigger-key-positions = <0 1 2 3 4 10 11 12 13 14 20 21 22 23 24 30 31 32 33 34 35>; // hold-trigger-key-positions = <0 1 2 3 4 10 11 12 13 14 20 21 22 23 24 30 31 32 33 34 35>;