From 525e4f84c58d59ccda1a600364779c442946f796 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Fri, 19 Feb 2021 00:27:25 +0000 Subject: [PATCH] Move artsey implemenations that are sound to main artseyio github repo --- zmk-config/README.md | 6 +- zmk-config/config/artsey_v0_7.dtsi | 399 ------------------ .../corne_artsey_left/Kconfig.defconfig | 34 -- .../shields/corne_artsey_left/Kconfig.shield | 5 - .../corne_artsey_left/corne_artsey_left.conf | 25 -- .../corne_artsey_left.keymap | 45 -- .../corne_artsey_left.overlay | 74 ---- .../corne_artsey_right/Kconfig.defconfig | 34 -- .../shields/corne_artsey_right/Kconfig.shield | 5 - .../corne_artsey_right.conf | 25 -- .../corne_artsey_right.keymap | 45 -- .../corne_artsey_right.overlay | 74 ---- 12 files changed, 4 insertions(+), 767 deletions(-) delete mode 100644 zmk-config/config/artsey_v0_7.dtsi delete mode 100644 zmk-config/config/boards/shields/corne_artsey_left/Kconfig.defconfig delete mode 100755 zmk-config/config/boards/shields/corne_artsey_left/Kconfig.shield delete mode 100755 zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.conf delete mode 100644 zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.keymap delete mode 100644 zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.overlay delete mode 100644 zmk-config/config/boards/shields/corne_artsey_right/Kconfig.defconfig delete mode 100755 zmk-config/config/boards/shields/corne_artsey_right/Kconfig.shield delete mode 100755 zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.conf delete mode 100644 zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.keymap delete mode 100644 zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.overlay diff --git a/zmk-config/README.md b/zmk-config/README.md index 05704bd9..b6acb546 100644 --- a/zmk-config/README.md +++ b/zmk-config/README.md @@ -29,13 +29,15 @@ rm foo ``` sh +-DCMAKE_EXPORT_COMPILE_COMMANDS=1 + west build --board nice_nano -d build/nibble -- -DSHIELD=nibble -DZMK_CONFIG=/workspaces/zmk-config/zmk-config/config west build --board nice_nano -d build/tidbit -- -DSHIELD=tidbit -DZMK_CONFIG=/workspaces/zmk-config/zmk-config/config -west build --board nice_nano -d build/corne_artsey_left -- -DSHIELD=corne_artsey_left -DZMK_CONFIG=/workspaces/zmk-config/zmk-config/config +west build --board nice_nano -d build/corne_artsey_left -- -DSHIELD=corne_artsey_left -DZMK_CONFIG=/workspaces/zmk-artsey/config -west build --board nice_nano -d build/corne_artsey_right -- -DSHIELD=corne_artsey_right -DZMK_CONFIG=/workspaces/zmk-config/zmk-config/config +west build --board nice_nano -d build/corne_artsey_right -- -DSHIELD=corne_artsey_right -DZMK_CONFIG=/workspaces/zmk-artsey/config west build --board nrf52840_mdk_dongle -d build/pockettype/central -- -DSHIELD=pockettype_central -DZMK_CONFIG=/workspaces/zmk-config/zmk-config/config diff --git a/zmk-config/config/artsey_v0_7.dtsi b/zmk-config/config/artsey_v0_7.dtsi deleted file mode 100644 index fcad8850..00000000 --- a/zmk-config/config/artsey_v0_7.dtsi +++ /dev/null @@ -1,399 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include - -/***************************************** - * Macros for filling in "&none" in the right places in the keymap for re-use needs - *****************************************/ -#define NONE0(X) -#define NONE1(X) X -#define NONE2(X) NONE1(X) X -#define NONE3(X) NONE2(X) X -#define NONE4(X) NONE3(X) X -#define NONE5(X) NONE4(X) X -#define NONE6(X) NONE5(X) X -#define NONE7(X) NONE6(X) X -#define NONE8(X) NONE7(X) X -#define NONE9(X) NONE8(X) X -#define NONE10(X) NONE9(X) X - -#define NONE(HUNDREDS,TENS,ONES) \ - NONE##HUNDREDS(NONE10(NONE10(&none))) \ - NONE##TENS(NONE10(&none)) \ - NONE##ONES(&none) - -/***************************************** - * ARTSEY website : https://www.artsey.io - * Primary reference : https://www.artsey.io/_FILES/images/ARTSEY.jpg -*****************************************/ - -/***************************************** - * Setting up ARTSEY comboing - * - Enabled right OR left handed orientation - * - Please note: A/E key positions should be on your INDEX finger - * - The online reference is for right handed use - * - When using the ARTSEY layout left handed you'll want to ensure your keypositions are flipped along the Y axis - * - Update/adjust the key positions using your boards keymap - * - See below for additional details - * - YOU MUST SET THE FOLLOWING CONFIG VALUES FOR THIS SETUP TO WORK PROPERLY IN YOUR BOARDS .conf FILE - * - CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=16 - * - CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=8 - * - CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8 - *****************************************/ - -/***************************************** - * Define which layout you want to use - * ONLY ENABLE ONE OF THESE -*****************************************/ -//#define ARTSEY_RIGHT 1 -//#define ARTSEY_LEFT 1 - -/***************************************** - * Define key positions used for combos - * These definitions are used to define the various ARTSEY combos - * - * Please see the documentation on "combos" for details on how to find the proper key positions - * - * Default key positions are for a generic 4x2 keyboard and should NOT be used outright - * DEFINE these definitions in your boards keymap BEFORE including artsey.dtsi -*****************************************/ -// ARTS Row -// #define KEY_A 0 -// #define KEY_R 1 -// #define KEY_T 2 -// #define KEY_S 3 -// EYIO Row -// #define KEY_E 4 -// #define KEY_Y 5 -// #define KEY_I 6 -// #define KEY_O 7 - -/***************************************** - * Define key position offsets in main keymap - * - * In order to make this keymap flexible, you must setup the number of &none "offsets" to use - * The defines below should be set in your LOCAL keymap and using the above "NONE([hundreds],[tens],[ones])" macro for filling in the gaps -*****************************************/ -// #define LEADING_NONES NONE(0,1,0) -// #define MIDDLE_NONES NONE(0, 0, 3) -// #define TRAILING_NONES NONE(0, 1, 0) - -/***************************************** - * Layer IDs used by the ARTSEY keymap - * Do NOT change these and do NOT change the order of the layers as shown below - *****************************************/ -#define LAYER_ID_BASE 0 -#define LAYER_ID_NUMBERS 1 -#define LAYER_ID_SYMBOLS 2 -#define LAYER_ID_PARENTHETICALS 3 -#define LAYER_ID_NAVIGATION 4 -#define LAYER_ID_F_ONE_SIX 5 -#define LAYER_ID_F_SEVEN_TWELVE 6 -#define LAYER_ID_MOUSE 7 - -/***************************************** - * Define how long it takes for the combos/holds to 'time out' - * See documentation on "combos" for more detail - *****************************************/ -#define TIMEOUT_COMBO 250 -#define TIMEOUT_LAYER_HOLD 500 -&sk { - release-after-ms = <1000>; -}; -&sl { - release-after-ms = <2000>; -}; - -/***************************************** - * Standard ARTSEY combo definitions - * These should NOT be changed and are global in scope - *****************************************/ -/ { - combos { - compatible = "zmk,combos"; - combo_b { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp B>; }; - combo_m { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp M>; }; - combo_c { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp C>; }; - combo_n { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp N>; }; - combo_d { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp D>; }; - combo_p { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp P>; }; - combo_f { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp F>; }; - combo_q { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp Q>; }; - combo_g { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp G>; }; - combo_u { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp U>; }; - combo_h { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp H>; }; - combo_v { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp V>; }; - combo_j { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp J>; }; - combo_w { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp W>; }; - combo_k { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp K>; }; - combo_x { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp X>; }; - combo_l { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp L>; }; - combo_z { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp Z>; }; - combo_enter { timeout-ms = ; key-positions = ; bindings = <&kp ENTER>; }; - combo_esc { timeout-ms = ; key-positions = ; bindings = <&kp ESC>; }; - combo_single_quote { timeout-ms = ; key-positions = ; bindings = <&kp SQT>; }; - combo_tab { timeout-ms = ; key-positions = ; bindings = <&kp TAB>; }; - combo_dot { timeout-ms = ; key-positions = ; bindings = <&kp PERIOD>; }; - combo_control { timeout-ms = ; key-positions = ; bindings = <&sk LCTRL>; }; - combo_comma { timeout-ms = ; key-positions = ; bindings = <&kp COMMA>; }; - combo_gui { timeout-ms = ; key-positions = ; bindings = <&sk LGUI>; }; - combo_slash { timeout-ms = ; key-positions = ; bindings = <&kp SLASH>; }; - combo_alt { timeout-ms = ; key-positions = ; bindings = <&sk LALT>; }; - combo_backspace { timeout-ms = ; key-positions = ; bindings = <&kp BACKSPACE>; }; - combo_shift { timeout-ms = ; key-positions = ; bindings = <&sk LSHFT>; }; - combo_space { timeout-ms = ; key-positions = ; bindings = <&kp SPACE>; }; - combo_shift_lock { timeout-ms = ; key-positions = ; bindings = <&kp CAPS>; }; - combo_seven { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp N7>; }; - combo_eight { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp N8>; }; - combo_nine { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp N9>; }; - combo_zero { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp N0>; }; - /* TODO: Setup/Enable once Mouse Keys feature(s) are added to ZMK */ - //combo_mouse { timeout-ms = ; key-positions = ; bindings = <&none>; }; - }; -}; - -/***************************************** - * Standard ARTSEY layer activation definitions - * These should NOT be changed and are global in scope - *****************************************/ -/ { - behaviors { - layer_base_none: layer_base_none { compatible = "zmk,behavior-hold-tap"; label = "layer_base_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; - layer_base_kp: layer_base_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_base_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_base_sl: layer_base_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_base_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_numbers_none: layer_numbers_none { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; - layer_numbers_kp: layer_numbers_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_numbers_sl: layer_numbers_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_symbols_none: layer_symbols_none { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; - layer_symbols_kp: layer_symbols_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_symbols_sl: layer_symbols_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_parentheticals_none: layer_parentheticals_none { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; - layer_parentheticals_kp: layer_parentheticals_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_parentheticals_sl: layer_parentheticals_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_navigation_none: layer_navigation_none { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; - layer_navigation_kp: layer_navigation_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_navigation_sl: layer_navigation_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_mouse_none: layer_mouse_none { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&tog>, <&none>; }; - layer_mouse_kp: layer_mouse_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&tog>, <&kp>; }; - layer_mouse_sl: layer_mouse_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&tog>, <&sl>; }; - }; -}; - -/***************************************** - * Standard ARTSEY layer definitions - * !!!!!!!!!! FOR RIGHT HANDED USE !!!!!!!!!! - *****************************************/ -#if defined ARTSEY_RIGHT -/ { - keymap { - compatible = "zmk,keymap"; - base { - label = "ARTSEY"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS A &kp R &kp T &layer_numbers_kp LAYER_ID_NUMBERS S - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS E &kp Y &kp I &layer_navigation_kp LAYER_ID_NAVIGATION O - TRAILING_NONES - >; - }; - numbers { - label = "Number"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS N1 &kp N2 &kp N3 &layer_base_sl LAYER_ID_BASE LAYER_ID_F_ONE_SIX - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS N4 &kp N5 &kp N6 &layer_navigation_sl LAYER_ID_NAVIGATION LAYER_ID_F_SEVEN_TWELVE - TRAILING_NONES - >; - }; - symbols { - label = "Symbol"; - bindings = < - LEADING_NONES - &layer_parentheticals_none LAYER_ID_PARENTHETICALS 0 &kp BSLH &kp SEMI &layer_numbers_kp LAYER_ID_NUMBERS GRAVE - MIDDLE_NONES - &layer_base_none LAYER_ID_BASE 0 &kp MINUS &kp EQUAL &layer_navigation_none LAYER_ID_NAVIGATION 0 - TRAILING_NONES - >; - }; - parentheticals { - label = "Paren"; - bindings = < - LEADING_NONES - &layer_base_none LAYER_ID_BASE 0 &kp LPAR &kp RPAR &layer_numbers_kp LAYER_ID_NUMBERS LBRC - MIDDLE_NONES - &layer_symbols_none LAYER_ID_SYMBOLS 0 &kp LBKT &kp RBKT &layer_navigation_kp LAYER_ID_NAVIGATION RBRC - TRAILING_NONES - >; - }; - navigation { - label = "Nav"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS HOME &kp UP &kp END &layer_numbers_none LAYER_ID_NUMBERS PG_UP - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS LEFT &kp DOWN &kp RIGHT &layer_base_none LAYER_ID_BASE PG_DN - TRAILING_NONES - >; - }; - f_one_to_six{ - label = "F1-F6"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F1 &kp F2 &kp F3 &layer_numbers_none LAYER_ID_NUMBERS 0 - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS F4 &kp F5 &kp F6 &layer_navigation_none LAYER_ID_NAVIGATION 0 - TRAILING_NONES - >; - }; - f_seven_to_twelve { - label = "F7-F12"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F7 &kp F8 &kp F9 &layer_numbers_none LAYER_ID_NUMBERS 0 - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS F10 &kp F11 &kp F12 &layer_navigation_none LAYER_ID_NAVIGATION 0 - TRAILING_NONES - >; - }; - // mouse { /* TODO: Not implemented yet, needs mouse keys in upstream */ - // label = "Mouse"; - // bindings = < - // &none &none &none &none - // &none &none &none &none - // >; - // }; - }; -}; -#endif - -/***************************************** - * Standard ARTSEY layer definitions - * !!!!!!!!!! FOR LEFT HANDED USE !!!!!!!!!! - *****************************************/ -#if defined ARTSEY_LEFT -/ { - keymap { - compatible = "zmk,keymap"; - base { - label = "ARTSEY"; - bindings = < - LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS S &kp T &kp R &layer_parentheticals_kp LAYER_ID_PARENTHETICALS A - MIDDLE_NONES - &layer_navigation_kp LAYER_ID_NAVIGATION O &kp I &kp Y &layer_symbols_kp LAYER_ID_SYMBOLS E - TRAILING_NONES - >; - }; - numbers { - label = "Number"; - bindings = < - LEADING_NONES - &layer_base_sl LAYER_ID_BASE LAYER_ID_F_ONE_SIX &kp N3 &kp N2 &layer_parentheticals_kp LAYER_ID_PARENTHETICALS N1 - MIDDLE_NONES - &layer_navigation_sl LAYER_ID_NAVIGATION LAYER_ID_F_SEVEN_TWELVE &kp N6 &kp N5 &layer_symbols_kp LAYER_ID_SYMBOLS N4 - TRAILING_NONES - >; - }; - symbols { - label = "Symbol"; - bindings = < - LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS GRAVE &kp SEMI &kp BSLH &layer_parentheticals_none LAYER_ID_PARENTHETICALS 0 - MIDDLE_NONES - &layer_navigation_none LAYER_ID_NAVIGATION 0 &kp EQUAL &kp MINUS &layer_base_none LAYER_ID_BASE 0 - TRAILING_NONES - >; - }; - parentheticals { - label = "Paren"; - bindings = < - LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS LBRC &kp LPAR &kp RPAR &layer_base_none LAYER_ID_BASE 0 - MIDDLE_NONES - &layer_navigation_kp LAYER_ID_NAVIGATION RBRC &kp LBKT &kp RBKT &layer_symbols_none LAYER_ID_SYMBOLS 0 - TRAILING_NONES - >; - }; - navigation { - label = "Nav"; - bindings = < - LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS PG_UP &kp HOME &kp UP &layer_parentheticals_kp LAYER_ID_PARENTHETICALS END - MIDDLE_NONES - &layer_base_kp LAYER_ID_BASE PG_DN &kp LEFT &kp DOWN &layer_symbols_kp LAYER_ID_SYMBOLS RIGHT - TRAILING_NONES - >; - }; - f_one_to_six{ - label = "F1-F6"; - bindings = < - LEADING_NONES - &layer_numbers_none LAYER_ID_NUMBERS 0 &kp F3 &kp F2 &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F1 - MIDDLE_NONES - &layer_navigation_none LAYER_ID_NAVIGATION 0 &kp F6 &kp F5 &layer_symbols_kp LAYER_ID_SYMBOLS F4 - TRAILING_NONES - >; - }; - f_seven_to_twelve { - label = "F7-F12"; - bindings = < - LEADING_NONES - &layer_numbers_none LAYER_ID_NUMBERS 0 &kp F9 &kp F8 &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F7 - MIDDLE_NONES - &layer_navigation_none LAYER_ID_NAVIGATION 0 &kp F12 &kp F11 &layer_symbols_kp LAYER_ID_SYMBOLS F10 - TRAILING_NONES - >; - }; - // mouse { /* TODO: Not implemented yet, needs mouse keys in upstream */ - // label = "Mouse"; - // bindings = < - // &none &none &none &none - // &none &none &none &none - // >; - // }; - }; -}; -#endif diff --git a/zmk-config/config/boards/shields/corne_artsey_left/Kconfig.defconfig b/zmk-config/config/boards/shields/corne_artsey_left/Kconfig.defconfig deleted file mode 100644 index 52203d08..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_left/Kconfig.defconfig +++ /dev/null @@ -1,34 +0,0 @@ -if SHIELD_CORNE_ARTSEY_LEFT - -config ZMK_KEYBOARD_NAME - default "ARTSEY L" - -config I2C - default y - -config SSD1306 - default y - -config SSD1306_REVERSE_MODE - default y - -config LVGL_HOR_RES_MAX - default 128 - -config LVGL_VER_RES_MAX - default 32 - -config LVGL_VDB_SIZE - default 64 - -config LVGL_DPI - default 148 - -config LVGL_BITS_PER_PIXEL - default 1 - -choice LVGL_COLOR_DEPTH - default LVGL_COLOR_DEPTH_1 -endchoice - -endif diff --git a/zmk-config/config/boards/shields/corne_artsey_left/Kconfig.shield b/zmk-config/config/boards/shields/corne_artsey_left/Kconfig.shield deleted file mode 100755 index 2934aa84..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_left/Kconfig.shield +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2020 Pete Johanson -# SPDX-License-Identifier: MIT - -config SHIELD_CORNE_ARTSEY_LEFT - def_bool $(shields_list_contains,corne_artsey_left) diff --git a/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.conf b/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.conf deleted file mode 100755 index 64d65542..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# 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 Encoders -#CONFIG_EC11=y -#CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y - -# Enable display (layer in use is helpful) -CONFIG_ZMK_DISPLAY=y - -# Enable WPM widget -#CONFIG_ZMK_WPM=y -CONFIG_ZMK_WIDGET_WPM_STATUS=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=30000 diff --git a/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.keymap b/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.keymap deleted file mode 100644 index 565aefce..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.keymap +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include - -// Enable ARTSEY Left -#define ARTSEY_LEFT 1 - -// ARTS Row -#define KEY_A 4 -#define KEY_R 3 -#define KEY_T 2 -#define KEY_S 1 -// EYIO Row -#define KEY_E 10 -#define KEY_Y 9 -#define KEY_I 8 -#define KEY_O 7 - -// Define Offsets -#define LEADING_NONES NONE(0,0,1) -#define MIDDLE_NONES NONE(0, 0, 2) -#define TRAILING_NONES NONE(0, 1, 0) - -// Thumb buttons (used for BT combos) -#define THUMB_1 18 -#define THUMB_2 19 -#define THUMB_3 20 - -// Include main artsey.io keymap -#include "../../../artsey_v0_7.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/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.overlay b/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.overlay deleted file mode 100644 index d3007dce..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_left/corne_artsey_left.overlay +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * 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>; -// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | -// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | -// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | -// | SW19 | SW20 | SW21 | - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) -RC(2,0) 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/zmk-config/config/boards/shields/corne_artsey_right/Kconfig.defconfig b/zmk-config/config/boards/shields/corne_artsey_right/Kconfig.defconfig deleted file mode 100644 index 84f0baab..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_right/Kconfig.defconfig +++ /dev/null @@ -1,34 +0,0 @@ -if SHIELD_CORNE_ARTSEY_RIGHT - -config ZMK_KEYBOARD_NAME - default "ARTSEY R" - -config I2C - default y - -config SSD1306 - default y - -config SSD1306_REVERSE_MODE - default y - -config LVGL_HOR_RES_MAX - default 128 - -config LVGL_VER_RES_MAX - default 32 - -config LVGL_VDB_SIZE - default 64 - -config LVGL_DPI - default 148 - -config LVGL_BITS_PER_PIXEL - default 1 - -choice LVGL_COLOR_DEPTH - default LVGL_COLOR_DEPTH_1 -endchoice - -endif diff --git a/zmk-config/config/boards/shields/corne_artsey_right/Kconfig.shield b/zmk-config/config/boards/shields/corne_artsey_right/Kconfig.shield deleted file mode 100755 index f3733bfa..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_right/Kconfig.shield +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2020 Pete Johanson -# SPDX-License-Identifier: MIT - -config SHIELD_CORNE_ARTSEY_RIGHT - def_bool $(shields_list_contains,corne_artsey_right) diff --git a/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.conf b/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.conf deleted file mode 100755 index 64d65542..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# 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 Encoders -#CONFIG_EC11=y -#CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y - -# Enable display (layer in use is helpful) -CONFIG_ZMK_DISPLAY=y - -# Enable WPM widget -#CONFIG_ZMK_WPM=y -CONFIG_ZMK_WIDGET_WPM_STATUS=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=30000 diff --git a/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.keymap b/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.keymap deleted file mode 100644 index 1771b4ab..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.keymap +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * 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 7 -#define KEY_Y 8 -#define KEY_I 9 -#define KEY_O 10 - -// Define Offsets -#define LEADING_NONES NONE(0,0,1) -#define MIDDLE_NONES NONE(0, 0, 2) -#define TRAILING_NONES NONE(0, 1, 0) - -// Thumb buttons (used for BT combos) -#define THUMB_1 18 -#define THUMB_2 19 -#define THUMB_3 20 - -// Include main artsey.io keymap -#include "../../../artsey_v0_7.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/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.overlay b/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.overlay deleted file mode 100644 index c0b6f5d7..00000000 --- a/zmk-config/config/boards/shields/corne_artsey_right/corne_artsey_right.overlay +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * 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(0,5) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) -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>; - }; -};