diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 509479e..27e3468 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,10 @@ jobs: shield: corne_artsey_right - board: nice_nano shield: the_paintbrush + - board: nice_nano + shield: corne_5_col_artsey_left + - board: nice_nano + shield: corne_5_col_artsey_right steps: - name: Checkout uses: actions/checkout@v2 diff --git a/config/boards/shields/corne_left/corne_5_col_artsey_left.conf b/config/boards/shields/corne_left/corne_5_col_artsey_left.conf new file mode 100755 index 0000000..e7bb92f --- /dev/null +++ b/config/boards/shields/corne_left/corne_5_col_artsey_left.conf @@ -0,0 +1,17 @@ +# Copyright (c) 2021 Mike "KemoNine" Crosson +# SPDX-License-Identifier: MIT + +# Tune combos to allow proper ARTSEY support +CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=16 +CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=8 +CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8 + +# Enable display (layer in use is helpful) +CONFIG_ZMK_DISPLAY=y + +# Turn on deep sleep +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000 + +# Set screen blanking to 15s instead of 30s +#CONFIG_ZMK_IDLE_TIMEOUT=15000 diff --git a/config/boards/shields/corne_left/corne_5_col_artsey_left.keymap b/config/boards/shields/corne_left/corne_5_col_artsey_left.keymap new file mode 100644 index 0000000..7c38bf7 --- /dev/null +++ b/config/boards/shields/corne_left/corne_5_col_artsey_left.keymap @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 Mike "KemoNine" Crosson + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include + +// Enable ARTSEY Left +#define ARTSEY_LEFT 1 + +// ARTS Row +#define KEY_A 3 +#define KEY_R 2 +#define KEY_T 1 +#define KEY_S 0 +// EYIO Row +#define KEY_E 8 +#define KEY_Y 7 +#define KEY_I 6 +#define KEY_O 5 + +// Define Offsets +#define LEADING_NONES NONE(0,0, 0) +#define MIDDLE_NONES NONE(0, 0, 1) +#define TRAILING_NONES NONE(0, 0, 9) + +// Thumb buttons (used for BT combos) +#define THUMB_1 15 +#define THUMB_2 16 +#define THUMB_3 17 + +// Include main artsey.io keymap +#include "../../../artsey.dtsi" + +/ { + combos { + compatible = "zmk,combos"; + chord_bt_clr { key-positions = ; bindings = <&bt BT_CLR>; }; + chord_bt_prv { key-positions = ; bindings = <&bt BT_PRV>; }; + chord_bt_nxt { key-positions = ; bindings = <&bt BT_NXT>; }; + }; +}; diff --git a/config/boards/shields/corne_left/corne_5_col_artsey_left.overlay b/config/boards/shields/corne_left/corne_5_col_artsey_left.overlay new file mode 100644 index 0000000..4ded30b --- /dev/null +++ b/config/boards/shields/corne_left/corne_5_col_artsey_left.overlay @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2021 Mike "KemoNine" Crosson + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <6>; + rows = <4>; +// | SW2 | SW3 | SW4 | SW5 | SW6 | +// | SW8 | SW9 | SW10 | SW11 | SW12 | +// | SW14 | SW15 | SW16 | SW17 | SW18 | +// | SW19 | SW20 | SW21 | + map = < +RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) +RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) +RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) + RC(3,3) RC(3,4) RC(3,5) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + col-gpios + = <&pro_micro_a 3 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 2 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + ; + }; + + // TODO: per-key RGB node(s)? +}; + +&pro_micro_i2c { + status = "okay"; + + oled: ssd1306@3c { + compatible = "solomon,ssd1306fb"; + reg = <0x3c>; + label = "DISPLAY"; + width = <128>; + height = <32>; + segment-offset = <0>; + page-offset = <0>; + display-offset = <0>; + multiplex-ratio = <31>; + segment-remap; + com-invdir; + com-sequential; + prechargep = <0x22>; + }; +}; diff --git a/config/boards/shields/corne_right/corne_5_col_artsey_right.conf b/config/boards/shields/corne_right/corne_5_col_artsey_right.conf new file mode 100755 index 0000000..e7bb92f --- /dev/null +++ b/config/boards/shields/corne_right/corne_5_col_artsey_right.conf @@ -0,0 +1,17 @@ +# Copyright (c) 2021 Mike "KemoNine" Crosson +# SPDX-License-Identifier: MIT + +# Tune combos to allow proper ARTSEY support +CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=16 +CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=8 +CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8 + +# Enable display (layer in use is helpful) +CONFIG_ZMK_DISPLAY=y + +# Turn on deep sleep +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000 + +# Set screen blanking to 15s instead of 30s +#CONFIG_ZMK_IDLE_TIMEOUT=15000 diff --git a/config/boards/shields/corne_right/corne_5_col_artsey_right.keymap b/config/boards/shields/corne_right/corne_5_col_artsey_right.keymap new file mode 100644 index 0000000..7fec9ac --- /dev/null +++ b/config/boards/shields/corne_right/corne_5_col_artsey_right.keymap @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 Mike "KemoNine" Crosson + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include + +// Enable ARTSEY Right +#define ARTSEY_RIGHT 1 + +// ARTS Row +#define KEY_A 1 +#define KEY_R 2 +#define KEY_T 3 +#define KEY_S 4 +// EYIO Row +#define KEY_E 6 +#define KEY_Y 7 +#define KEY_I 8 +#define KEY_O 9 + +// Define Offsets +#define LEADING_NONES NONE(0,0,1) +#define MIDDLE_NONES NONE(0, 0, 1) +#define TRAILING_NONES NONE(0, 0, 8) + +// Thumb buttons (used for BT combos) +#define THUMB_1 15 +#define THUMB_2 16 +#define THUMB_3 17 + +// Include main artsey.io keymap +#include "../../../artsey.dtsi" + +/ { + combos { + compatible = "zmk,combos"; + chord_bt_clr { key-positions = ; bindings = <&bt BT_CLR>; }; + chord_bt_prv { key-positions = ; bindings = <&bt BT_PRV>; }; + chord_bt_nxt { key-positions = ; bindings = <&bt BT_NXT>; }; + }; +}; diff --git a/config/boards/shields/corne_right/corne_5_col_artsey_right.overlay b/config/boards/shields/corne_right/corne_5_col_artsey_right.overlay new file mode 100644 index 0000000..7d12d32 --- /dev/null +++ b/config/boards/shields/corne_right/corne_5_col_artsey_right.overlay @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2021 Mike "KemoNine" Crosson + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <6>; + rows = <4>; +// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | +// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | +// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | +// | SW21 | SW20 | SW19 | + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) +RC(3,0) RC(3,1) RC(3,2) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + col-gpios + = <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 2 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 3 GPIO_ACTIVE_HIGH> + ; + }; + + // TODO: per-key RGB node(s)? +}; + +&pro_micro_i2c { + status = "okay"; + + oled: ssd1306@3c { + compatible = "solomon,ssd1306fb"; + reg = <0x3c>; + label = "DISPLAY"; + width = <128>; + height = <32>; + segment-offset = <0>; + page-offset = <0>; + display-offset = <0>; + multiplex-ratio = <31>; + segment-remap; + com-invdir; + com-sequential; + prechargep = <0x22>; + }; +};