From a3d0c03726a0bc607d4daab7a90dda57d4ba6a6f Mon Sep 17 00:00:00 2001 From: David Barr Date: Wed, 30 Sep 2020 16:20:41 +0100 Subject: [PATCH] rename cradios to cradio --- .DS_Store | Bin 0 -> 8196 bytes app/.DS_Store | Bin 0 -> 8196 bytes app/boards/.DS_Store | Bin 0 -> 8196 bytes app/boards/shields/.DS_Store | Bin 0 -> 8196 bytes .../{cradios => cradio}/Kconfig.defconfig | 5 +- .../{cradios => cradio}/Kconfig.shield | 4 +- .../{cradios.dtsi => cradio/cradio.dtsi} | 4 -- .../{cradios.keymap => cradio/cradio.keymap} | 0 .../cradio_left.conf} | 0 .../cradio_left.overlay} | 8 +-- .../cradio_right.conf} | 0 .../cradio_right.overlay} | 5 +- .../{cradios => cradio}/default.keymap | 0 app/boards/shields/cradios/cradios.dtsi | 67 ------------------ app/boards/shields/cradios/cradios.keymap | 18 ----- app/boards/shields/cradios_left.conf | 2 - app/boards/shields/cradios_left.overlay | 15 ---- app/boards/shields/cradios_right.conf | 2 - app/boards/shields/cradios_right.overlay | 17 ----- 19 files changed, 6 insertions(+), 141 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/boards/.DS_Store create mode 100644 app/boards/shields/.DS_Store rename app/boards/shields/{cradios => cradio}/Kconfig.defconfig (92%) rename app/boards/shields/{cradios => cradio}/Kconfig.shield (50%) rename app/boards/shields/{cradios.dtsi => cradio/cradio.dtsi} (99%) rename app/boards/shields/{cradios.keymap => cradio/cradio.keymap} (100%) rename app/boards/shields/{cradios/cradios_left.conf => cradio/cradio_left.conf} (100%) rename app/boards/shields/{cradios/cradios_left.overlay => cradio/cradio_left.overlay} (81%) rename app/boards/shields/{cradios/cradios_right.conf => cradio/cradio_right.conf} (100%) rename app/boards/shields/{cradios/cradios_right.overlay => cradio/cradio_right.overlay} (86%) rename app/boards/shields/{cradios => cradio}/default.keymap (100%) delete mode 100644 app/boards/shields/cradios/cradios.dtsi delete mode 100644 app/boards/shields/cradios/cradios.keymap delete mode 100644 app/boards/shields/cradios_left.conf delete mode 100644 app/boards/shields/cradios_left.overlay delete mode 100644 app/boards/shields/cradios_right.conf delete mode 100644 app/boards/shields/cradios_right.overlay diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6b508f3d3ac3d8e154cb8b9356cbeda358ea05b0 GIT binary patch literal 8196 zcmeHMTWl3Y82Y%Mi6DcsKM4J8t2@<}4agPTcNPKrjKq%t>nhl&t^ z5P=YZ5P=YZ5P|;#0(55cBCT-l3v1Yh2!sgSmI(0oLyRhyi9pT@>AyOt@vi_R`4zw~ z)MvayG8V{0AZLXn3l$WhBt<9&R}2*4q>lxDi9pT@DZ&AR%LfKCV{k)3e|CC)%y$P& z2pP5^0wDr7BEWw>d7wcCGO5Yy@9&oBdhz(z7|F|DwR(*t%aXiKKG`$oO!j!1mvdXR z>~TIirg>wjpx^5_)#G&gP7x@nL0O`5tlHcUv_ zo_X3dva(zhY3#MNabxbzl2WFYshj4bgzsXk#LA_?T*^F?GrhB74mGw#me^Y-bXrcA zqw^=~zC~4I+a>8Z*SBU3YK2-+D|S(U*6Y%$gJo9TBg@R~eUP?OgerUQm1L&(Sz5}l z0#*HfQXLtX5NHO&5fs614T!FXYJ@^Q&!N>3! zd;#CVkMJ}63ctbc@CW>b63VDx0jjta%W)gVaX&U-BQ{|R9>Js7h27YTCvgOmsNpDP z@C;_r!}ItkK8BCullVNojIZFU_!_>6@8G+572n4X@N@hU=fwIV^JMJ`)*A@?o;tyg zk;oc+OpA=%jI7c2`<0IWhOFNfaE2DG-%z}9bNS9aHFXD?7dCO(zFkitpEZIOK3(SN z;BVei4$^L`Wy+>#AF;}qTI8_c^gP4a8qObyb3?r=x+Tgual~+2bVrm$h}&XV5#6n@ zJYufwJ69?3C|gA&71q5{C6hIa&(6x$^V>tm*6s7 zg%9CV;@ns81N;QPz@Nl784Iz5*j9#7+>Cc)1@6L1+=KhDo|xB&2e2IvVFw;2_Vr>v z4&V?DV;T)Sjbmu~+{@u4PT|9N0Usd-K7r5TbHu_Ih=rH%^<|vvT*kR8i=3P2$=a4< zkCJAdp-Y{^(Jh5Qp2((@-~ZcJ{{DYUuGBt-AZqLe%FpsJw=rl z?l&u>A3}|P9Vh8u$4M^yVMzTLx$>AqAZLXn4V8cWLqMq-p8r1b0{-y)Uj*ZJ>irGE Cjn>8h literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7b9df9785ffe429ff6989ceea0ab40fc7af0588f GIT binary patch literal 8196 zcmeHMTTC2P82kW${VP;L1B7USCx=2$tOhe2hhMt%sQ!rX(v`$2ZA61 zK?H&b1Q7@#5Jcer5CJ-~SrOJa_qjG`g9ro>xFsXN-VYI~3}Zena`avu)OaZXAxidaiU&o;{%NihhcL+@16hW=bQODCmt&ei6?c zFvc-xg9ro>SRDcO_!K|_Y)~PclfQqINSTJ?Mx$S1C@+6q!FoXy1#zQzvVY2+?RQl- zP{v6{(xlhTvq1i>*^b;BX#u+3)PYN+S>X9)scp1!@`0nlbB(>4%fHnVGhnxLll6&1A+@UA@&b`;BwDGvexVF6)gscG_+C4CAt#arFCivNLA% z4zhMe47wdNlTo}}xFx)!a&NT0>2Sx=#@mWyN!na8JYzUU!qi7qC#hSSVNDLs8k##b zM)9&-Q`0B?u>&ygjW`%f*sXwTB$k0f%PoPqXGOQIws5`)O0TtF-@aL6o&Y zQ%&fmFKRqUqGQ7|Jet0+F1Uv~(!9{otuE3k{4txOD z;6wNXK7()Id-xH4hF{=U_znI*0Y#Ls5Ea~k6}S_lco3Vg8C$Rok6{n?Vjm9RNu0nq zsyK-$JcDU;@jO0^kKm*DI6jLn;!F54zJjmgTlh9!#dq;N{1iXOB|g7Uma@J6e0{)g zsk7q2B+B|9) zN17}tye(YGMA~zuT-q8QByQ<**O|Lod!xXiVUQd3wiAl7nii*#6$fjwN zpSDcfnk0Fatt(xEtD7t8`-Y)c4xVE zgz71(tT4Mpj-CrOUOG Hi#2}&7R=yI literal 0 HcmV?d00001 diff --git a/app/boards/.DS_Store b/app/boards/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f1a7fabe09abafc68e9bade17e3a66f1e4d09db5 GIT binary patch literal 8196 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 - }; kscan0: kscan { @@ -37,11 +36,8 @@ RC(0,15) RC(0,16) RC(0,33) RC(0,32) compatible = "zmk,bt-unpair-combo"; }; - - }; - &kscan0 { input-gpios = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> diff --git a/app/boards/shields/cradios.keymap b/app/boards/shields/cradio/cradio.keymap similarity index 100% rename from app/boards/shields/cradios.keymap rename to app/boards/shields/cradio/cradio.keymap diff --git a/app/boards/shields/cradios/cradios_left.conf b/app/boards/shields/cradio/cradio_left.conf similarity index 100% rename from app/boards/shields/cradios/cradios_left.conf rename to app/boards/shields/cradio/cradio_left.conf diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradio/cradio_left.overlay similarity index 81% rename from app/boards/shields/cradios/cradios_left.overlay rename to app/boards/shields/cradio/cradio_left.overlay index b0bdc6fe..c6600724 100644 --- a/app/boards/shields/cradios/cradios_left.overlay +++ b/app/boards/shields/cradio/cradio_left.overlay @@ -3,13 +3,9 @@ * * SPDX-License-Identifier: MIT */ -#include "cradios.dtsi" - - - - - +#include "cradio.dtsi" &bt_unpair_combo { + key-positions = <0 16>; }; diff --git a/app/boards/shields/cradios/cradios_right.conf b/app/boards/shields/cradio/cradio_right.conf similarity index 100% rename from app/boards/shields/cradios/cradios_right.conf rename to app/boards/shields/cradio/cradio_right.conf diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradio/cradio_right.overlay similarity index 86% rename from app/boards/shields/cradios/cradios_right.overlay rename to app/boards/shields/cradio/cradio_right.overlay index ef920ac3..3469199b 100644 --- a/app/boards/shields/cradios/cradios_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -3,15 +3,12 @@ * * SPDX-License-Identifier: MIT */ -#include "cradios.dtsi" +#include "cradio.dtsi" &default_transform { col-offset = <17>; }; - - - &bt_unpair_combo { key-positions = <21 32>; }; diff --git a/app/boards/shields/cradios/default.keymap b/app/boards/shields/cradio/default.keymap similarity index 100% rename from app/boards/shields/cradios/default.keymap rename to app/boards/shields/cradio/default.keymap diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi deleted file mode 100644 index 68d1fc57..00000000 --- a/app/boards/shields/cradios/cradios.dtsi +++ /dev/null @@ -1,67 +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 = <34>; - rows = <1>; - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) -RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) -RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) -RC(0,15) RC(0,16) RC(0,33) RC(0,32) ->; - - - }; - - kscan0: kscan { - compatible = "zmk,kscan-gpio-direct"; - label = "KSCAN"; - }; - - - - - bt_unpair_combo: bt_unpair_combo { - compatible = "zmk,bt-unpair-combo"; - }; - - - - }; - - - &kscan0 { - input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; -}; - - diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap deleted file mode 100644 index c46468dd..00000000 --- a/app/boards/shields/cradios/cradios.keymap +++ /dev/null @@ -1,18 +0,0 @@ -#include -#include - - -/ { - keymap { - compatible = "zmk,keymap"; - - default_layer { - bindings = < - &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH - &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 - >; - }; - }; -}; diff --git a/app/boards/shields/cradios_left.conf b/app/boards/shields/cradios_left.conf deleted file mode 100644 index 1e028a78..00000000 --- a/app/boards/shields/cradios_left.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SPLIT=y -CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/cradios_left.overlay b/app/boards/shields/cradios_left.overlay deleted file mode 100644 index b0bdc6fe..00000000 --- a/app/boards/shields/cradios_left.overlay +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ -#include "cradios.dtsi" - - - - - - -&bt_unpair_combo { - key-positions = <0 16>; -}; diff --git a/app/boards/shields/cradios_right.conf b/app/boards/shields/cradios_right.conf deleted file mode 100644 index 990cf7c0..00000000 --- a/app/boards/shields/cradios_right.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SPLIT=y -CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/cradios_right.overlay b/app/boards/shields/cradios_right.overlay deleted file mode 100644 index ef920ac3..00000000 --- a/app/boards/shields/cradios_right.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ -#include "cradios.dtsi" - -&default_transform { - col-offset = <17>; -}; - - - - -&bt_unpair_combo { - key-positions = <21 32>; -};