From 960aaed85b0136b03e522af98e4ec90c00ec83f5 Mon Sep 17 00:00:00 2001 From: OGRE Date: Tue, 15 Aug 2023 17:24:40 -0400 Subject: [PATCH] removing files that for some reason lost git history in fork sync --- .../shields/ergos1_oe/Kconfig.defconfig | 18 ------ app/boards/shields/ergos1_oe/Kconfig.shield | 7 --- .../ergos1_oe/boards/nice_nano.overlay | 38 ------------- app/boards/shields/ergos1_oe/ergos1_oe.conf | 3 - app/boards/shields/ergos1_oe/ergos1_oe.dtsi | 50 ----------------- app/boards/shields/ergos1_oe/ergos1_oe.keymap | 56 ------------------- .../shields/ergos1_oe/ergos1_oe.zmk.yml | 11 ---- .../shields/ergos1_oe/ergos1_oe_left.overlay | 20 ------- .../shields/ergos1_oe/ergos1_oe_right.overlay | 24 -------- 9 files changed, 227 deletions(-) delete mode 100644 app/boards/shields/ergos1_oe/Kconfig.defconfig delete mode 100644 app/boards/shields/ergos1_oe/Kconfig.shield delete mode 100644 app/boards/shields/ergos1_oe/boards/nice_nano.overlay delete mode 100644 app/boards/shields/ergos1_oe/ergos1_oe.conf delete mode 100644 app/boards/shields/ergos1_oe/ergos1_oe.dtsi delete mode 100644 app/boards/shields/ergos1_oe/ergos1_oe.keymap delete mode 100644 app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml delete mode 100644 app/boards/shields/ergos1_oe/ergos1_oe_left.overlay delete mode 100644 app/boards/shields/ergos1_oe/ergos1_oe_right.overlay diff --git a/app/boards/shields/ergos1_oe/Kconfig.defconfig b/app/boards/shields/ergos1_oe/Kconfig.defconfig deleted file mode 100644 index 59c51e33..00000000 --- a/app/boards/shields/ergos1_oe/Kconfig.defconfig +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2021 The ZMK Contributors -# SPDX-License-Identifier: MIT -if SHIELD_ERGOS1_OE_LEFT - -config ZMK_KEYBOARD_NAME - default "Ergo S-1" - -config ZMK_SPLIT_ROLE_CENTRAL - default y - -endif - -if SHIELD_ERGOS1_OE_LEFT || SHIELD_ERGOS1_OE_RIGHT - -config ZMK_SPLIT - default y - -endif \ No newline at end of file diff --git a/app/boards/shields/ergos1_oe/Kconfig.shield b/app/boards/shields/ergos1_oe/Kconfig.shield deleted file mode 100644 index e67dce26..00000000 --- a/app/boards/shields/ergos1_oe/Kconfig.shield +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 The ZMK Contributors -# SPDX-License-Identifier: MIT -config SHIELD_ERGOS1_OE_LEFT - def_bool $(shields_list_contains,ergos1_oe_left) - -config SHIELD_ERGOS1_OE_RIGHT - def_bool $(shields_list_contains,ergos1_oe_right) diff --git a/app/boards/shields/ergos1_oe/boards/nice_nano.overlay b/app/boards/shields/ergos1_oe/boards/nice_nano.overlay deleted file mode 100644 index 6aa1e861..00000000 --- a/app/boards/shields/ergos1_oe/boards/nice_nano.overlay +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2021 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - - #include - -&spi1 { - compatible = "nordic,nrf-spim"; - status = "okay"; - mosi-pin = <6>; - // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. - sck-pin = <5>; - miso-pin = <7>; - - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - label = "WS2812"; - - /* SPI */ - reg = <0>; /* ignored, but necessary for SPI bindings */ - spi-max-frequency = <4000000>; - - /* WS2812 */ - chain-length = <5>; /* number of LEDs */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; - - color-mapping = ; - }; -}; - -/ { - chosen { - zmk,underglow = &led_strip; - }; -}; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.conf b/app/boards/shields/ergos1_oe/ergos1_oe.conf deleted file mode 100644 index 71ff719f..00000000 --- a/app/boards/shields/ergos1_oe/ergos1_oe.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Uncommenting the following lines won't do anything because the Ergo S-1 OE doesn't have LEDs -# CONFIG_ZMK_RGB_UNDERGLOW=y -# CONFIG_WS2812_STRIP=y \ No newline at end of file diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.dtsi b/app/boards/shields/ergos1_oe/ergos1_oe.dtsi deleted file mode 100644 index 309ee7ea..00000000 --- a/app/boards/shields/ergos1_oe/ergos1_oe.dtsi +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2021 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include - -/ { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <16>; - rows = <6>; -// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | -// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | SW13 | | SW13 | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | -// | SW14 | SW15 | SW16 | SW17 | SW18 | SW19 | SW20 | | SW20 | SW19 | SW18 | SW17 | SW16 | SW15 | SW14 | -// | SW21 | SW22 | SW23 | SW24 | SW25 | SW26 | SW27 | SW28 | | SW28 | SW27 | SW26 | SW25 | SW24 | SW23 | SW22 | SW21 | -// | SW29 | SW30 | SW31 | SW32 | SW33 | SW34 | SW35 | | SW35 | SW34 | SW33 | SW32 | SW31 | SW30 | SW29 | - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15) -RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) RC(3,14) RC(3,15) - RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14) - RC(5,7) RC(5,8) - >; - }; - - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; - - diode-direction = "col2row"; - row-gpios - = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - - }; - -}; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.keymap b/app/boards/shields/ergos1_oe/ergos1_oe.keymap deleted file mode 100644 index e6baa1c1..00000000 --- a/app/boards/shields/ergos1_oe/ergos1_oe.keymap +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2021 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include -#include -#include - - #define DEFAULT 0 - #define FN 1 - -/ { - keymap { - compatible = "zmk,keymap"; - - default_layer { -// --------------------------------------------------------------------------------------------------------------------------------- -// | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BSPC | -// | WIN | Q | W | E | R | T | | Y | U | I | O | P | EQL | -// | TAB | A | S | D | F | G | | H | J | K | L | SCLN | QUOT | -// | LCTL | Z | X | C | V | B | | CTL | ALT | | CAPS | CTL | | N | M | COMM | DOT | SLSH | MINS | -// | GRV | BSLS | LEFT | RGHT | | SHFT | FN | HOME | | PGUP | ENT | SPC | | UP | DN | LBKT | RBKT | -// | END | | PGDN | - bindings = < - &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &kp LGUI &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp EQUAL - &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp DEL &kp Z &kp X &kp C &kp V &kp B &kp LCTRL &kp LALT &kp CAPS &kp RCTRL &kp N &kp M &kp COMMA &kp PERIOD &kp SLASH &kp MINUS - &kp GRAVE &kp BSLH &kp LEFT &kp RIGHT &kp LSHFT &mo 1 &kp HOME &kp PG_UP &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT - &kp END &kp PG_DN - >; - }; - fn_layer { -// --------------------------------------------------------------------------------------------------------------------------------- -// |BT_CLR| F1 | F2 | F3 | F4 | F5 | | | NLCK | = | / | * | | -// | | F6 | F7 | F8 | F9 | F10 | | | 7 | 8 | 9 | - | | -// | | | | | | | | | 4 | 5 | 6 | + | | -// | | | | | | PTSC | | | | | | | | | 1 | 2 | 3 | ENT | | -// | | INS | | | | | FN | | | | | | | | | . | ENT | -// | | | | - bindings = < - &bt BT_CLR &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &trans &kp KP_NUM&kp EQL &kp SLASH &kp STAR &trans - &trans &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans &kp N7 &kp N8 &kp N9 &kp MINUS &trans - &trans &trans &trans &trans &trans &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &trans - &trans &trans &trans &trans &kp PSCRN &trans &kp F11 &kp F12 &trans &trans &trans &kp N1 &kp N2 &kp N3 &kp ENTER &trans - &trans &kp INS &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DOT &kp ENTER - &trans &trans - >; - }; - - }; -}; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml b/app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml deleted file mode 100644 index 2d6ebabd..00000000 --- a/app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml +++ /dev/null @@ -1,11 +0,0 @@ -file_format: "1" -id: ergos1_oe -name: Ergo S-1 OE -type: shield -url: https://github.com/wizarddata/Ergo-S-1 -requires: [pro_micro] -features: - - keys -siblings: - - ergo_s1_oe_left - - ergo_s1_oe_right diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay b/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay deleted file mode 100644 index 49def51c..00000000 --- a/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2021 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include "ergos1_oe.dtsi" - -&kscan0 { - col-gpios - = <&pro_micro 14 GPIO_ACTIVE_HIGH> - , <&pro_micro 16 GPIO_ACTIVE_HIGH> - , <&pro_micro 8 GPIO_ACTIVE_HIGH> - , <&pro_micro 7 GPIO_ACTIVE_HIGH> - , <&pro_micro 6 GPIO_ACTIVE_HIGH> - , <&pro_micro 5 GPIO_ACTIVE_HIGH> - , <&pro_micro 4 GPIO_ACTIVE_HIGH> - , <&pro_micro 3 GPIO_ACTIVE_HIGH> - ; -}; diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay b/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay deleted file mode 100644 index c3db30bc..00000000 --- a/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2021 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include "ergos1_oe.dtsi" - -&default_transform { - col-offset = <8>; -}; - -&kscan0 { - col-gpios - = <&pro_micro 3 GPIO_ACTIVE_HIGH> - , <&pro_micro 4 GPIO_ACTIVE_HIGH> - , <&pro_micro 5 GPIO_ACTIVE_HIGH> - , <&pro_micro 6 GPIO_ACTIVE_HIGH> - , <&pro_micro 7 GPIO_ACTIVE_HIGH> - , <&pro_micro 8 GPIO_ACTIVE_HIGH> - , <&pro_micro 16 GPIO_ACTIVE_HIGH> - , <&pro_micro 14 GPIO_ACTIVE_HIGH> - ; -};