Compare commits

..

6 commits

Author SHA1 Message Date
kB01 1a03c5c580
Removed Zombie Code with sensor binding
Some checks failed
/ build (push) Has been cancelled
2025-01-10 00:10:21 +01:00
kB01 93c37e0987
Fixed Pipeline to use correct hardcoded Keyboard 2025-01-10 00:05:53 +01:00
kB01 05d5f2cb51
Changed RGB Chain length 2025-01-09 23:52:56 +01:00
kB01 97360c9ad9
Updated Keymap 2025-01-09 23:38:32 +01:00
kB01 35f0f4809e
Enabled RGB 2025-01-09 22:51:09 +01:00
kB01 92cf5189a3
Updated Workflow for use on Forgejo 2025-01-09 22:48:08 +01:00
5 changed files with 128 additions and 69 deletions

View file

@ -32,7 +32,12 @@ jobs:
build_matrix: ${{ env.build_matrix }} build_matrix: ${{ env.build_matrix }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 run: printf "/home/runner/externals/node20/bin\n" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: Install Dependencies
run: apt-get update
- run: apt-get -y install python3-pip jq
- name: Install yaml2json - name: Install yaml2json
run: python3 -m pip install remarshal run: python3 -m pip install remarshal
@ -53,7 +58,8 @@ jobs:
matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }} matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 run: printf "/home/runner/externals/node20/bin\n" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: Create build directory - name: Create build directory
run: | run: |
@ -94,7 +100,8 @@ jobs:
fi fi
- name: Cache west modules - name: Cache west modules
uses: actions/cache@v4 run: printf "/home/runner/externals/node20/bin\n" >> $GITHUB_PATH
- uses: actions/cache@v4
continue-on-error: true continue-on-error: true
env: env:
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
@ -164,7 +171,8 @@ jobs:
fi fi
- name: Archive (${{ env.display_name }}) - name: Archive (${{ env.display_name }})
uses: actions/upload-artifact@v3 run: printf "/home/runner/externals/node20/bin\n" >> $GITHUB_PATH
- uses: actions/upload-artifact@v3
with: with:
name: artifact-${{ env.artifact_name }} name: artifact-${{ env.artifact_name }}
path: ${{ env.build_dir }}/artifacts path: ${{ env.build_dir }}/artifacts
@ -175,8 +183,9 @@ jobs:
name: Merge Output Artifacts name: Merge Output Artifacts
steps: steps:
- name: Merge Artifacts - name: Merge Artifacts
uses: actions/upload-artifact/merge@v4 run: printf "/home/runner/externals/node20/bin\n" >> $GITHUB_PATH
- uses: actions/upload-artifact/merge@v4
with: with:
name: ${{ inputs.archive_name }} name: ${{ inputs.archive_name }}
pattern: artifact-* pattern: artifact-*
delete-merged: true delete-merged: true

View file

@ -2,5 +2,48 @@ on: [push, pull_request, workflow_dispatch]
jobs: jobs:
build: build:
uses: ./.github/workflows/build-user-config.yml runs-on: docker
container:
image: zmkfirmware/zmk-build-arm:stable
steps:
- name: Install Dependencies
run: |
apt-get update
apt-get install tree curl -y
- name: Install Node.JS Workarround, see https://github.com/nektos/act/issues/973
run: |
curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
apt install -y nodejs
node --version
- name: Git checkout
uses: actions/checkout@v4
- name: Clone ZMK Repo
run: git clone -b feat/pointers-move-scroll https://github.com/petejohanson/zmk.git
- name: Initialize ZMK
working-directory: ./zmk
run: |
west init -l app/
west update
- name: Build Left Shield
working-directory: ./zmk/app
run: west build -d build/left -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="../../config"
- name: Build Right Shield
working-directory: ./zmk/app
run: west build -d build/right -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="../../config"
- name: Rename artifacts
working-directory: .
run: |
mkdir "./artifacts"
cp ./zmk/app/build/left/zephyr/zmk.uf2 ./artifacts/corne_left-nice_nano_v2-zmk.uf2
cp ./zmk/app/build/right/zephyr/zmk.uf2 ./artifacts/corne_right-nice_nano_v2-zmk.uf2
- name: Upload Artifacts
if: ${{ true }}
uses: actions/upload-artifact@v3
with:
name: firmware
path: ./artifacts

BIN
config/.corne.conf.kate-swp Normal file

Binary file not shown.

View file

@ -3,4 +3,13 @@
# CONFIG_WS2812_STRIP=y # CONFIG_WS2812_STRIP=y
# Uncomment the following line to enable the Corne OLED Display # Uncomment the following line to enable the Corne OLED Display
# CONFIG_ZMK_DISPLAY=y # CONFIG_ZMK_DISPLAY=y
# RGB underglow
CONFIG_ZMK_RGB_UNDERGLOW=y
CONFIG_WS2812_STRIP=y
# RGB backlight
CONFIG_ZMK_BACKLIGHT_ON_START=y

View file

@ -5,8 +5,12 @@
*/ */
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/rgb.h>
&led_strip {
chain-length = <27>;
};
/ { / {
combos { combos {
@ -18,7 +22,7 @@
}; };
function_layer { function_layer {
bindings = <&mo 4>; bindings = <&mo 3>;
key-positions = <36 41>; key-positions = <36 41>;
}; };
}; };
@ -27,105 +31,105 @@
sym_sec: sym_sec { sym_sec: sym_sec {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp S &kp O>; bindings = <&kp SLCK &kp S &kp O>;
label = "sym_sec"; label = "sym_sec";
}; };
de_ue: de_ue { de_ue: de_ue {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp U &kp DQT>; bindings = <&kp SLCK &kp U &kp DQT>;
label = "DE_UE"; label = "DE_UE";
}; };
de_ae: de_ae { de_ae: de_ae {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp A &kp DQT>; bindings = <&kp SLCK &kp A &kp DQT>;
label = "DE_AE"; label = "DE_AE";
}; };
de_oe: de_oe { de_oe: de_oe {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp O &kp DQT>; bindings = <&kp SLCK &kp O &kp DQT>;
label = "DE_OE"; label = "DE_OE";
}; };
de_ss: de_ss { de_ss: de_ss {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp S &kp S>; bindings = <&kp SLCK &kp S &kp S>;
label = "DE_SS"; label = "DE_SS";
}; };
sym_eur: sym_eur { sym_eur: sym_eur {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp C &kp EQUAL>; bindings = <&kp SLCK &kp C &kp EQUAL>;
label = "SYM_EUR"; label = "SYM_EUR";
}; };
sym_ss1: sym_ss1 { sym_ss1: sym_ss1 {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp CARET &kp KP_NUMBER_1>; bindings = <&kp SLCK &kp CARET &kp KP_NUMBER_1>;
label = "SYM_SS1"; label = "SYM_SS1";
}; };
sym_ss2: sym_ss2 { sym_ss2: sym_ss2 {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp CARET &kp KP_NUMBER_2>; bindings = <&kp SLCK &kp CARET &kp KP_NUMBER_2>;
label = "SYM_SS2"; label = "SYM_SS2";
}; };
sym_ss3: sym_ss3 { sym_ss3: sym_ss3 {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp CARET &kp KP_NUMBER_3>; bindings = <&kp SLCK &kp CARET &kp KP_NUMBER_3>;
label = "SYM_SS3"; label = "SYM_SS3";
}; };
sym_tm: sym_tm { sym_tm: sym_tm {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp T &kp M>; bindings = <&kp SLCK &kp T &kp M>;
label = "SYM_TM"; label = "SYM_TM";
}; };
sym_reg: sym_reg { sym_reg: sym_reg {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp O &kp R>; bindings = <&kp SLCK &kp O &kp R>;
label = "SYM_REG"; label = "SYM_REG";
}; };
sym_copy: sym_copy { sym_copy: sym_copy {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp O &kp C>; bindings = <&kp SLCK &kp O &kp C>;
label = "SYM_COPY"; label = "SYM_COPY";
}; };
sym_deg: sym_deg { sym_deg: sym_deg {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp O &kp O>; bindings = <&kp SLCK &kp O &kp O>;
label = "SYM_DEG"; label = "SYM_DEG";
}; };
sym_mu: sym_mu { sym_mu: sym_mu {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp M &kp U>; bindings = <&kp SLCK &kp M &kp U>;
label = "SYM_MU"; label = "SYM_MU";
}; };
sym_acute: sym_acute { sym_acute: sym_acute {
compatible = "zmk,behavior-macro"; compatible = "zmk,behavior-macro";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp RALT &kp SQT &kp SQT>; bindings = <&kp SLCK &kp SQT &kp SQT>;
label = "SYM_ACUTE"; label = "SYM_ACUTE";
}; };
}; };
@ -234,69 +238,63 @@
keymap { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
default_layer { base_colemak-dh {
bindings = <
&kp TAB &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &de_hash &trans
&kp ESC &kp A &kp R &kp S &kp T &kp G &kp M &kp N &kp E &kp I &kp O &trans
&trans &kp Z &kp X &kp C &kp D &kp V &kp K &kp H &de_comma &de_dot &kp MINUS &trans
&mo 2 &kp LSHIFT &kp RET &kp BSPC &kp SPACE &mo 4
>;
};
base_quertz-de {
// ----------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------
// | TAB | Ü | , | . | P | Y | | F | G | C | T | Z | ? | // | ESC | Q | W | E | R | T | | Y | U | I | O | P | \ |
// | ESC | A | O | E | I | U | | H | D | R | N | S | L | // | TAB | A | S | D | F | G | | H | J | K | L | ; | ' |
// | Ä | Ö | Q | J | K | X | | B | M | , | . | # | - | // | SHIFT | Z | X | C | V | B | | N | M | , | . | / | CTRL |
// | CTRL| GUI | SPC | | ENT | RSE | ALT | // | GUI | DEL | RET | | TAB | BSPC | R-ALT |
bindings = < bindings = <
&kp TAB &de_ue &de_comma &de_dot &kp P &kp Y &kp F &kp G &kp C &kp T &kp Z &dv_qmark_ss &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P &de_ue
&kp ESC &kp A &kp O &kp E &kp I &kp U &kp H &kp D &kp R &kp N &kp S &kp L &kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &de_oe &de_ae
&de_ae &de_oe &kp Q &kp J &kp K &kp X &kp B &kp M &kp W &kp V &de_hash &kp MINUS &kp LCTRL &kp Y &kp X &kp C &kp V &kp B &kp N &kp M &de_comma &de_dot &kp MINUS &de_hash
&mo 2 &kp LSHFT &kp RET &kp BSPC &kp SPACE &mo 3 &none &mo 2 &kp LSHFT &kp SPACE &mo 4 &none
>; >;
}; };
quertz_de { extend_layer {
// -----------------------------------------------------------------------------------------
// | TAB | Q | W | E | R | T | | Z | U | I | O | P | Ü |
// | ESC | A | S | D | F | G | | H | J | K | L | Ö | Ä |
// | < | Y | X | C | V | B | | N | M | , | . | - | # |
// | EXT | SFT | ENT | | BSP | SPC | SYM |
bindings = < bindings = <
&trans &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P &de_ue &trans &kp ESC &kp K_BACK &kp TAB &kp K_FORWARD &kp INS &kp HOME &kp PG_UP &kp UP &kp PG_DN &kp CAPS &trans
&trans &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &de_oe &de_ae &trans &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &sk RALT &kp END &kp LEFT &kp DOWN &kp RIGHT &kp DEL &trans
&de_lt_mt_pipe &kp Y &kp X &kp C &kp V &kp B &kp N &kp M &de_comma &de_dot &kp MINUS &de_hash &trans &kp LC(Z) &kp LC(X) &kp LC(C) &kp LGUI &kp LC(V) &kp ENTER &kp BSPC &kp TAB &kp K_APP &kp PSCRN &trans
&trans &kp LSHFT &kp ENTER &kp BACKSPACE &kp SPACE &trans &trans &trans &trans &trans &kp RET &trans
>; >;
}; };
extend { function_layer {
bindings = < bindings = <
&trans &kp DEL &kp C_AC_BACK &kp C_AC_FIND &kp C_AC_FORWARD &kp INS &kp PG_UP &kp HOME &kp UP &kp END &none &kp BSPC &rgb_ug RGB_EFF &kp K_STOP &kp K_PREV &kp K_PLAY_PAUSE &kp K_NEXT &kp C_BRIGHTNESS_INC &kp F12 &kp F7 &kp F8 &kp F9 &kp SLCK &rgb_ug RGB_TOG
&trans &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &sk RALT &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &none &kp ENTER &rgb_ug RGB_SPI &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &kp C_BRI_DEC &kp F11 &kp F4 &kp F5 &kp F6 &to 1 &rgb_ug RGB_BRI
&none &kp LC(Z) &kp LC(X) &kp LC(C) &kp LGUI &kp LC(V) &none &none &kp TAB &kp K_APP &kp PSCRN &none &rgb_ug RGB_SPD &kp K_MUTE &kp C_VOL_DN &kp LC(LS(C)) &kp C_VOL_UP &kp LC(LS(V)) &kp F10 &kp F1 &kp F2 &kp F3 &to 0 &rgb_ug RGB_BRD
&none &trans &trans &trans &trans &none &none &trans &trans &kp ENTER &trans &none
>; >;
}; };
symbol { symbol_layer {
bindings = < bindings = <
&de_car_deg &kp LBRC &kp LBKT &kp RBKT &kp RBRC &kp DLLR &kp EXCL &kp DQT &sym_copy &sym_tm &de_plus_str_tld &de_acute_grave &trans &de_ae &kp EXCL &sym_eur &kp DOLLAR &kp PERCENT &sym_deg &kp GRAVE &de_ue &kp DQT &de_oe &trans
&none &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &sk RALT &dv_qmark_ss &sym_sec &sym_reg &kp LPAR &kp RPAR &dv_slash &trans &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &kp PIPE &kp CARET &kp LEFT_PARENTHESIS &kp LBRC &kp LBKT &kp LT &trans
&none &de_lt_mt_pipe &none &none &kp AT &sym_eur &kp PRCNT &sym_mu &kp AMPS &kp EQUAL &de_hash &kp MINUS &trans &kp AT &kp QMARK &kp BSLH &kp AMPS &trans &kp TILDE &kp RIGHT_PARENTHESIS &kp RBRC &kp RBKT &kp GT &trans
&none &kp LSHFT &trans &trans &trans &none &none &mo 3 &mo 5 &trans &none &none
>; >;
}; };
function { number_layer {
bindings = < bindings = <
&trans &kp C_STOP &kp C_PREV &kp C_PP &kp C_NEXT &kp C_BRI_UP &kp F12 &kp F7 &kp F8 &kp F9 &kp SLCK &bt BT_CLR &trans &trans &trans &trans &trans &kp LNLCK &kp EQUAL &kp N7 &kp N8 &kp N9 &kp PLUS &trans
&trans &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &kp C_BRI_DN &kp F11 &kp F4 &kp F5 &kp F6 &bt BT_SEL 0 &bt BT_SEL 1 &trans &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &sk RALT &kp STAR &kp N4 &kp N5 &kp N6 &kp MINUS &trans
&none &kp C_MUTE &kp C_VOL_DN &kp LS(LC(C)) &kp C_VOL_UP &kp LC(LS(V)) &kp F10 &kp F1 &kp F2 &kp F3 &bt BT_SEL 2 &bt BT_SEL 3 &trans &trans &kp K_APP &kp TAB &kp BSPC &kp RET &kp N0 &kp N1 &kp N2 &kp N3 &kp FSLH &trans
&none &trans &to 0 &to 1 &trans &none &none &trans &none &trans &none &none
>;
};
number {
bindings = <
&trans &de_lt_mt_pipe &de_comma &de_dot &none &none &kp EQUAL &kp N7 &kp N8 &kp N9 &kp PLUS &kp BSPC
&trans &sk LALT &sk LGUI &sk LSHFT &sk LCTRL &sk RALT &kp STAR &kp N4 &kp N5 &kp N6 &kp MINUS &kp RET
&none &none &kp Y &kp TAB &kp BSPC &kp RET &kp N0 &kp N1 &kp N2 &kp N3 &kp FSLH &none
&none &trans &trans &trans &trans &none
>; >;
}; };
}; };