Skip to content

Commit 95d732a

Browse files
mctechnology17github-actions[bot]
authored andcommitted
Corne with display dongle full compilation
1 parent 44e0523 commit 95d732a

File tree

92 files changed

+5263
-1880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5263
-1880
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.dtsi linguist-language=C++
2+
*.keymap linguist-language=C++

.github/workflows/keymap-drawer.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# keymap -c config/config_keymap-drawer.yaml parse -c 12 -z config/corne.keymap > keymap-drawer/corne.yaml
2+
# keymap -c config/config_keymap-drawer.yaml draw keymap-drawer/corne.yaml > keymap-drawer/corne.svg
3+
4+
# Example for using the keymap-drawer ZMK user config workflow
5+
name: Draw ZMK keymaps
6+
on:
7+
workflow_dispatch: # can be triggered manually
8+
push: # automatically run on changes to following paths
9+
paths:
10+
- "config/*.keymap"
11+
- "config/config_keymap-drawer.yaml"
12+
- .github/workflows/keymap-drawer.yaml
13+
14+
jobs:
15+
draw:
16+
uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
17+
permissions:
18+
contents: write # allow workflow to commit to the repo
19+
with:
20+
amend_commit: true
21+
keymap_patterns: "config/*.keymap" # path to the keymaps to parse
22+
config_path: "config/config_keymap-drawer.yaml" # config file, ignored if not exists
23+
output_folder: "keymap-drawer" # path to save produced SVG and keymap YAML files
24+
parse_args: "" # map of extra args to pass to `keymap parse`, e.g. "corne:'-l Def Lwr Rse' cradio:''"
25+
draw_args: "" # map of extra args to pass to `keymap draw`, e.g. "corne:'-k corne_rotated' cradio:'-k paroxysm'"

.gitignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
Makefile
2-
build/justin/*
1+
# zmk
2+
zmk/
3+
4+
# sketchybar
5+
sketchybar/dotfiles/
6+
sketchybar/dotfiles
7+
sketchybar/dotfiles/*
38

49
# MacOS
510
.DS_Store
611
vim-tools_notiz.vim
712
.DS_Store
13+
./*/.DS_Store
814
.vscode
915
# .vimspector.json
1016
push.sh
@@ -72,7 +78,7 @@ node_modules
7278
*.pyc
7379
.idea/
7480
/.idea
75-
build/
81+
# build/
7682
__pycache__
7783

7884
# Rust

Makefile

Lines changed: 509 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 405 additions & 194 deletions
Large diffs are not rendered by default.

build.yaml

Lines changed: 77 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,82 @@
4949
# together by resetting them at the same time. Most commonly, this is done by
5050
# grounding the reset pins for each of your keyboard's microcontrollers or
5151
# pressing the reset buttons at the same time.
52+
#
53+
# cmake-args: -DKEYMAP_FILE=../../config/other-corne.keymap -DCONFIG_ZMK_KEYBOARD_NAME=\"other-corne\" -DEXTRA_CONF_FILE=../../config/other-corne.conf
5254
---
5355
include:
54-
- board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
55-
shield: corne_left nice_view_adapter nice_view # con display
56-
# shield: corne_left # con OLED display
57-
# - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
58-
- board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
59-
shield: corne_right nice_view_adapter nice_view # con display
60-
# shield: corne_right # con OLED display
61-
# - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
62-
# - board: puchi_ble_v1
63-
# shield: settings_reset
56+
57+
# nice
58+
- board: nice_nano_v2
59+
shield: corne_left nice_view_adapter nice_view
60+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Nice_Corne_View\"
61+
artifact-name: nice_corne_left
62+
# shield: corne_left # for OLED no nice_view
63+
- board: nice_nano_v2
64+
shield: corne_right nice_view_adapter nice_view
65+
artifact-name: nice_corne_right
66+
# shield: corne_right # for OLED no nice_view
67+
68+
# puchi
69+
- board: puchi_ble_v1
70+
shield: corne_left nice_view_adapter nice_view
71+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Puchi_Corne_View\"
72+
artifact-name: puchi_corne_left
73+
# shield: corne_left # for OLED no nice_view
74+
- board: puchi_ble_v1
75+
shield: corne_right nice_view_adapter nice_view
76+
artifact-name: puchi_corne_right
77+
# shield: corne_right # for OLED no nice_view
78+
79+
# peripheral_left
80+
- board: nice_nano_v2
81+
shield: corne_left_peripheral nice_view_adapter nice_view
82+
artifact-name: nice_corne_left_peripheral
83+
- board: puchi_ble_v1
84+
shield: corne_left_peripheral nice_view_adapter nice_view
85+
artifact-name: puchi_corne_left_peripheral
86+
87+
# Xiao_Dongle
88+
- board: seeeduino_xiao_ble
89+
shield: corne_dongle_xiao
90+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Xiao_Dongle\"
91+
artifact-name: xiao_corne_dongle_xiao
92+
snippet: zmk-usb-logging
93+
- board: seeeduino_xiao_ble
94+
shield: corne_dongle_xiao dongle_display
95+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Xiao_Dongle_O\"
96+
artifact-name: xiao_corne_dongle_xiao_dongle_display
97+
snippet: zmk-usb-logging
98+
99+
# ProMicro_Dongle
100+
- board: nice_nano_v2
101+
shield: corne_dongle_pro_micro
102+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Nice_Dongle\"
103+
artifact-name: nice_corne_dongle_pro_micro
104+
snippet: zmk-usb-logging
105+
- board: nice_nano_v2
106+
shield: corne_dongle_pro_micro dongle_display
107+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Nice_Dongle_O\"
108+
artifact-name: nice_corne_dongle_pro_micro_dongle_display
109+
snippet: zmk-usb-logging
110+
- board: puchi_ble_v1
111+
shield: corne_dongle_pro_micro
112+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Puchi_Dongle\"
113+
artifact-name: puchi_corne_dongle_pro_micro
114+
snippet: zmk-usb-logging
115+
- board: puchi_ble_v1
116+
shield: corne_dongle_pro_micro dongle_display
117+
cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Puchi_Dongle_O\"
118+
artifact-name: puchi_corne_dongle_pro_micro_dongle_display
119+
snippet: zmk-usb-logging
120+
121+
# settings_reset
122+
- board: nice_nano_v2
123+
shield: settings_reset
124+
artifact-name: nice_settings_reset
125+
- board: seeeduino_xiao_ble
126+
shield: settings_reset
127+
artifact-name: xiao_settings_reset
128+
- board: puchi_ble_v1
129+
shield: settings_reset
130+
artifact-name: puchi_settings_reset

config/boards/.DS_Store.gz

270 Bytes
Binary file not shown.

config/boards/nice_nano.overlay

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#include <dt-bindings/led/led.h>
2+
3+
&pinctrl {
4+
spi3_default: spi3_default {
5+
group1 {
6+
psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
7+
};
8+
};
9+
10+
spi3_sleep: spi3_sleep {
11+
group1 {
12+
psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
13+
low-power-enable;
14+
};
15+
};
16+
};
17+
18+
&spi3 {
19+
compatible = "nordic,nrf-spim";
20+
status = "okay";
21+
22+
pinctrl-0 = <&spi3_default>;
23+
pinctrl-1 = <&spi3_sleep>;
24+
pinctrl-names = "default", "sleep";
25+
26+
led_strip: ws2812@0 {
27+
compatible = "worldsemi,ws2812-spi";
28+
29+
/* SPI */
30+
reg = <0>; /* ignored, but necessary for SPI bindings */
31+
spi-max-frequency = <4000000>;
32+
33+
/* WS2812 */
34+
chain-length = <10>; /* arbitrary; change at will */
35+
spi-one-frame = <0x70>;
36+
spi-zero-frame = <0x40>;
37+
38+
color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
39+
};
40+
};
41+
42+
/ {
43+
chosen {
44+
zmk,underglow = &led_strip;
45+
};
46+
};
47+
// vim: filetype=dts fdm=marker:

config/boards/nice_nano_v2.overlay

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#include <dt-bindings/led/led.h>
2+
3+
&pinctrl {
4+
spi3_default: spi3_default {
5+
group1 {
6+
psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
7+
};
8+
};
9+
10+
spi3_sleep: spi3_sleep {
11+
group1 {
12+
psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
13+
low-power-enable;
14+
};
15+
};
16+
};
17+
18+
&spi3 {
19+
compatible = "nordic,nrf-spim";
20+
status = "okay";
21+
22+
pinctrl-0 = <&spi3_default>;
23+
pinctrl-1 = <&spi3_sleep>;
24+
pinctrl-names = "default", "sleep";
25+
26+
led_strip: ws2812@0 {
27+
compatible = "worldsemi,ws2812-spi";
28+
29+
/* SPI */
30+
reg = <0>; /* ignored, but necessary for SPI bindings */
31+
spi-max-frequency = <4000000>;
32+
33+
/* WS2812 */
34+
chain-length = <10>; /* arbitrary; change at will */
35+
spi-one-frame = <0x70>;
36+
spi-zero-frame = <0x40>;
37+
38+
color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
39+
};
40+
};
41+
42+
/ {
43+
chosen {
44+
zmk,underglow = &led_strip;
45+
};
46+
};
47+
// vim: filetype=dts fdm=marker:

config/boards/nrfmicro_11.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
led_strip: ws2812@0 {
2727
compatible = "worldsemi,ws2812-spi";
28-
label = "WS2812";
2928

3029
/* SPI */
3130
reg = <0>; /* ignored, but necessary for SPI bindings */
@@ -45,3 +44,4 @@
4544
zmk,underglow = &led_strip;
4645
};
4746
};
47+
// vim: filetype=dts fdm=marker:

0 commit comments

Comments
 (0)