Nulo/zmk-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: Nulo:development
Branches Tags
Nulo:master
Nulo:one-hand
Nulo:development
..
compare: Nulo:master
Branches Tags
Nulo:master
Nulo:one-hand
Nulo:development

No commits in common. "development" and "master" have entirely different histories.
developmen ... master

15 changed files with 101 additions and 374 deletions
Show stats Expand all files Collapse all files

87
.github/workflows/build.yml vendored
View file

@ -1,90 +1,5 @@
on: [push, pull_request, workflow_dispatch] on: [push, pull_request, workflow_dispatch]
name: Build
jobs: jobs:
matrix:
runs-on: ubuntu-latest
name: Fetch Build Keyboards
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install yaml2json
run: python3 -m pip install remarshal
- id: set-matrix
name: Fetch Build Matrix
run: |
matrix=$(yaml2json build.yaml | jq -c .)
yaml2json build.yaml
echo "::set-output name=matrix::${matrix}"
build: build:
runs-on: ubuntu-latest uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
container:
image: zmkfirmware/zmk-build-arm:stable
needs: matrix
name: Build
strategy:
fail-fast: false
matrix: ${{fromJson(needs.matrix.outputs.matrix)}}
steps:
- name: Prepare variables
id: variables
run: |
if [ -n "${{ matrix.shield }}" ]; then
EXTRA_CMAKE_ARGS="-DSHIELD=${{ matrix.shield }}"
ARTIFACT_NAME="${{ matrix.shield }}-${{ matrix.board }}-zmk"
DISPLAY_NAME="${{ matrix.shield }} - ${{ matrix.board }}"
else
EXTRA_CMAKE_ARGS=
DISPLAY_NAME="${{ matrix.board }}"
ARTIFACT_NAME="${{ matrix.board }}-zmk"
fi
echo ::set-output name=extra-cmake-args::${EXTRA_CMAKE_ARGS}
echo ::set-output name=artifact-name::${ARTIFACT_NAME}
echo ::set-output name=display-name::${DISPLAY_NAME}
- name: Checkout
uses: actions/checkout@v2
- name: Cache west modules
uses: actions/cache@v2
env:
cache-name: cache-zephyr-modules
with:
path: |
modules/
tools/
zephyr/
bootloader/
zmk/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: West Init
run: west init -l config
- name: West Update
run: west update
- name: West Zephyr export
run: west zephyr-export
- name: West Build (${{ steps.variables.outputs.display-name }})
run: |
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 }} Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename artifacts
run: |
mkdir build/artifacts
if [ -f build/zephyr/zmk.uf2 ]
then
cp build/zephyr/zmk.uf2 "build/artifacts/${{ steps.variables.outputs.artifact-name }}.uf2"
elif [ -f build/zephyr/zmk.hex ]
then
cp build/zephyr/zmk.hex "build/artifacts/${{ steps.variables.outputs.artifact-name }}.hex"
fi
- name: Archive (${{ steps.variables.outputs.display-name }})
uses: actions/upload-artifact@v2
with:
name: firmware
path: build/artifacts

4
build.yaml
View file

@ -14,6 +14,6 @@
--- ---
include: include:
- board: nice_nano_v2 - board: nice_nano_v2
shield: rae_dux_left shield: cradio_left
- board: nice_nano_v2 - board: nice_nano_v2
shield: rae_dux_right shield: cradio_right

19
config/boards/shields/rae_dux/Kconfig.defconfig
View file

@ -1,19 +0,0 @@
# Copyright (c) 2022 The ZMK Contributors
# SPDX-License-Identifier: MIT
if SHIELD_RAE_DUX_LEFT
config ZMK_KEYBOARD_NAME
default "rae-dux"
config ZMK_SPLIT_BLE_ROLE_CENTRAL
default y
endif
if SHIELD_RAE_DUX_LEFT || SHIELD_RAE_DUX_RIGHT
config ZMK_SPLIT
default y
endif

8
config/boards/shields/rae_dux/Kconfig.shield
View file

@ -1,8 +0,0 @@
# Copyright (c) 2022 The ZMK Contributors
# SPDX-License-Identifier: MIT
config SHIELD_RAE_DUX_LEFT
def_bool $(shields_list_contains,rae_dux_left)
config SHIELD_RAE_DUX_RIGHT
def_bool $(shields_list_contains,rae_dux_right)

6
config/boards/shields/rae_dux/README.md
View file

@ -1,6 +0,0 @@
# Rae-Dux
Shield configuration for [rae-dux][1], a 36-key diodeless interpretation of the [A. Dux by Tapi][2].
[1]: https://github.com/andrewjrae/rae-dux
[2]: https://github.com/tapioki/cephalopoda/tree/main/Architeuthis%20dux

2
config/boards/shields/rae_dux/rae_dux.conf
View file

@ -1,2 +0,0 @@
# Copyright (c) 2022 The ZMK Contributors
# SPDX-License-Identifier: MIT

53
config/boards/shields/rae_dux/rae_dux.dtsi
View file

@ -1,53 +0,0 @@
/*
* Copyright (c) 2022 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <dt-bindings/zmk/matrix_transform.h>
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
columns = <36>;
rows = <1>;
map = <
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,22) RC(0,21) RC(0,20) RC(0,19) RC(0,18)
RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,27) RC(0,26) RC(0,25) RC(0,24) RC(0,23)
RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,32) RC(0,31) RC(0,30) RC(0,29) RC(0,28)
RC(0,15) RC(0,16) RC(0,17) RC(0,35) RC(0,34) RC(0,33)
>;
};
kscan0: kscan {
compatible = "zmk,kscan-gpio-direct";
label = "KSCAN";
input-gpios =
<&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
<&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
;
};
};

7
config/boards/shields/rae_dux/rae_dux_left.overlay
View file

@ -1,7 +0,0 @@
/*
* Copyright (c) 2022 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include "rae_dux.dtsi"

11
config/boards/shields/rae_dux/rae_dux_right.overlay
View file

@ -1,11 +0,0 @@
/*
* Copyright (c) 2022 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include "rae_dux.dtsi"
&default_transform {
col-offset = <18>;
};

1
config/cradio.conf Normal file
View file

@ -0,0 +1 @@
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

95
config/cradio.keymap Normal file
View file

@ -0,0 +1,95 @@
// Copyright (c) 2022 The ZMK Contributors
// SPDX-License-Identifier: MIT
// https://nickcoutsos.github.io/keymap-editor/
#include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h>
&lt {
flavor = "tap-preferred";
tapping-term-ms = <150>;
quick-tap-ms = <0>;
};
/ {
behaviors {
lhm: left_hand_positional_hold_tap {
compatible = "zmk,behavior-hold-tap";
label = "LEFT_POSITIONAL_HOLD_TAP";
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <150>;
quick-tap-ms = <0>;
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 10 11 12 13 15 16 17 18 19 25 26 27 28 29 30 31 32 33 34 35>;
};
rhm: right_hand_positional_hold_tap {
compatible = "zmk,behavior-hold-tap";
label = "RIGHT_POSITIONAL_HOLD_TAP";
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <150>;
quick-tap-ms = <0>;
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 16 17 18 19 20 21 22 23 24 30 31 32 33 34 35>;
};
};
conditional_layers {
compatible = "zmk,conditional-layers";
tri_layer {
if-layers = <1 2>;
then-layer = <3>;
};
};
keymap {
compatible = "zmk,keymap";
default_layer {
bindings = <
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
&lhm LSHFT A &lhm LALT S &lhm LCTRL D &lhm LGUI F &lhm RALT G &rhm RALT H &rhm LGUI J &rhm LCTRL K &rhm LALT L &rhm LSHFT SEMICOLON
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
&lt 2 TAB &kp ENTER &kp SPACE &lt 1 BSPC
>;
};
right_layer {
bindings = <
&kp ESC &kp LBKT &kp LBRC &kp LPAR &kp TILDE &kp CARET &kp RPAR &kp RBRC &kp RBKT &kp GRAVE
&kp MINUS &kp STAR &kp EQUAL &kp UNDERSCORE &kp DOLLAR &rhm RALT HASH &kp LGUI &kp LCTRL &kp LALT &kp LSHFT
&kp PLUS &kp PIPE &kp AT &kp SINGLE_QUOTE &kp PERCENT &kp AMPERSAND &kp BACKSLASH &kp RA(SLASH) &kp QUESTION &kp EXCLAMATION
&trans &trans &trans &trans
>;
};
left_layer {
bindings = <
&kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0
&kp LSHFT &kp LALT &kp LCTRL &kp LGUI &kp BACKSPACE &kp LEFT &kp DOWN &kp UP &kp RIGHT &none
&trans &kp C_MUTE &kp C_VOLUME_UP &kp C_VOLUME_DOWN &kp PRINTSCREEN &kp HOME &kp PG_DN &kp PG_UP &kp END &none
&trans &trans &trans &trans
>;
};
tri_layer {
bindings = <
&sys_reset &trans &trans &trans &bt BT_SEL 0 &trans &trans &trans &trans &sys_reset
&bootloader &trans &trans &trans &bt BT_SEL 1 &trans &trans &trans &trans &bootloader
&trans &trans &trans &bt BT_CLR &bt BT_SEL 2 &trans &trans &trans &trans &trans
&trans &trans &trans &trans
>;
};
};
};

10
config/rae_dux.conf
View file

@ -1,10 +0,0 @@
# Use higher power BT for better connection
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
# Enable deep sleep support (default n)
CONFIG_ZMK_SLEEP=y
# Milliseconds of inactivity before entering deep sleep (default 900000)
#CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=5400000
#CONFIG_ZMK_MOUSE=y

153
config/rae_dux.keymap
View file

@ -1,153 +0,0 @@
/*
* Copyright (c) 2021 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/outputs.h>
// #include <dt-bindings/zmk/mouse.h>
#define BASE_L 0
#define SYM_L 1
#define NAV_L 2
#define NUM_L 3
#define FUN_L 4
// #define MOUSE_L 5
&lt {
flavor = "tap-preferred";
tapping-term-ms = <150>;
quick-tap-ms = <0>;
};
/ {
combos {
compatible = "zmk,combos";
#define COMBO(NAME, BINDINGS, KEYPOS, TIMEOUT) \
combo_##NAME { \
timeout-ms = <TIMEOUT>; \
bindings = <BINDINGS>; \
key-positions = <KEYPOS>; \
};
/* KEY POSITIONS
╭────────────────────╮ ╭────────────────────╮
│ 0 1 2 3 4 │ │ 5 6 7 8 9 │
│ 10 11 12 13 14 │ │ 15 16 17 18 19 │
│ 20 21 22 23 24 │ │ 25 26 27 28 29 │
╰───────╮ 30 31 32 │ │ 33 34 35 ╭───────╯
╰────────────╯ ╰────────────╯ */
//COMBO(colon, &kp COLON, 7 8, 60)
//COMBO(semicolon, &kp SEMI, 27 28, 60)
//COMBO(slash, &kp FSLH, 1 2, 60)
//COMBO(minus, &kp MINUS, 31 32, 100)
//COMBO(underscore, &kp UNDER, 33 34, 100)
//COMBO(equal, &kp EQUAL, 12 23, 100)
//COMBO(enter, &kp ENTER, 17 26, 60)
COMBO(reset_left, &bootloader, 0 1 2 3, 100)
COMBO(reset_right, &bootloader, 6 7 8 9, 100)
COMBO(caps_word, &caps_word, 10 19, 40)
};
behaviors {
lhm: left_hand_positional_hold_tap {
compatible = "zmk,behavior-hold-tap";
label = "LEFT_POSITIONAL_HOLD_TAP";
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <150>;
quick-tap-ms = <0>;
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 10 11 12 13 15 16 17 18 19 25 26 27 28 29 30 31 32 33 34 35>;
};
rhm: right_hand_positional_hold_tap {
compatible = "zmk,behavior-hold-tap";
label = "RIGHT_POSITIONAL_HOLD_TAP";
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <150>;
quick-tap-ms = <0>;
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 16 17 18 19 20 21 22 23 24 30 31 32 33 34 35>;
};
conditional_layers {
compatible = "zmk,conditional-layers";
tri_layer {
if-layers = <NUM_L SYM_L>;
then-layer = <FUN_L>;
};
};
};
keymap {
compatible = "zmk,keymap";
base_layer {
bindings = <
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
&lhm LSHFT A &lhm LALT S &lhm LCTRL D &lhm LGUI F &lhm RALT G &rhm RALT H &rhm LGUI J &rhm LCTRL K &rhm LALT L &rhm LSHFT SEMI
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SINGLE_QUOTE
&mo NAV_L &none/*mo MOUSE_L*/ &none &none &lt NUM_L SPACE &mo SYM_L
>;
};
sym_layer {
bindings = <
&kp ESC &kp LBKT &kp LBRC &kp LPAR &kp TILDE &kp CARET &kp RPAR &kp RBRC &kp RBKT &kp GRAVE
&kp MINUS &kp STAR &kp EQUAL &kp UNDERSCORE &kp DOLLAR &rhm RALT HASH &kp LGUI &kp LCTRL &kp LALT &kp LSHFT
&kp PLUS &kp PIPE &kp AT &kp SLASH &kp PERCENT &kp AMPERSAND &kp BACKSLASH &kp RA(SLASH) &kp QUESTION &kp EXCLAMATION
&trans &trans &trans &trans &trans &trans
>;
};
nav_layer {
bindings = <
&none &none &kp C_VOL_UP &kp C_VOL_DN &kp C_MUTE &none &none &kp TAB &none &bootloader
&kp LSHFT &kp LALT &kp LCTRL &kp LGUI &kp BACKSPACE &kp LEFT &kp DOWN &kp UP &kp RIGHT &none
&out OUT_TOG &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_CLR &kp PRINTSCREEN &kp HOME &kp PG_DN &kp PG_UP &kp END &kp RETURN
&trans &trans &trans &trans &trans &trans
>;
};
num_layer {
bindings = <
&none &none &none &none &none &none &kp N7 &kp N8 &kp N9 &none
&kp LSHFT &kp LALT &kp LCTRL &kp LGUI &kp RALT &none &kp N4 &kp N5 &kp N6 &kp N0
&none &none &none &none &none &none &kp N1 &kp N2 &kp N3 &none
&trans &trans &trans &trans &trans &trans
>;
};
fun_layer {
bindings = <
&none &none &none &none &none &none &kp F7 &kp F8 &kp F9 &kp F12
&kp LSHFT &kp LALT &kp LCTRL &kp LGUI &kp RALT &none &kp F4 &kp F5 &kp F6 &kp F11
&none &none &none &none &none &none &kp F1 &kp F2 &kp F3 &kp F10
&trans &trans &trans &trans &trans &trans
>;
};
// mouse_layer {
// bindings = <
// &none &none &none &none &none &none &mkp LCLK &mkp RCLK &none &none
// &kp LSHFT &kp LALT &kp LCTRL &mkp LCLK &mkp RCLK &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT &none
// &none &none &none &none &none &mmv SCROLL_LEFT &mwh SCROLL_DOWN &mwh SCROLL_UP &mmv SCROLL_RIGHT &none
// &trans &trans &trans &trans &trans &trans
// >;
// };
};
};

11
config/rae_dux.zmk.yml
View file

@ -1,11 +0,0 @@
file_format: "1"
id: rae_dux
name: rae-dux
type: shield
url: https://github.com/andrewjrae/rae-dux
requires: [pro_micro]
features:
- keys
siblings:
- rae_dux_left
- rae_dux_right

8
config/west.yml
View file

@ -2,14 +2,10 @@ manifest:
remotes: remotes:
- name: zmkfirmware - name: zmkfirmware
url-base: https://github.com/zmkfirmware url-base: https://github.com/zmkfirmware
- name: andrewjrae
url-base: https://github.com/andrewjrae
- name: ftc
url-base: https://github.com/ftc
projects: projects:
- name: zmk - name: zmk
remote: ftc remote: zmkfirmware
revision: mouse-ftc revision: main
import: app/west.yml import: app/west.yml
self: self:
path: config path: config