aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoreyenseo <[email protected]>2021-10-12 22:43:05 +0200
committerNick Winans <[email protected]>2021-10-13 09:51:02 -0700
commit6f294530417051da13ae2200ede3361261b32f49 (patch)
tree7177519297a7766a74e1a04553fdc2ffb52f6fe0
parent51298f1d22767df02942f65b5782a193907366de (diff)
downloadzmk-6f294530417051da13ae2200ede3361261b32f49.tar.gz
zmk-6f294530417051da13ae2200ede3361261b32f49.zip
[squash] implement feedback
Diffstat
-rw-r--r--app/boards/shields/ergodash/ergodash.dtsi1
-rw-r--r--app/boards/shields/ergodash/ergodash.keymap28
-rw-r--r--app/boards/shields/ergodash/ergodash.zmk.yml1
3 files changed, 14 insertions, 16 deletions
diff --git a/app/boards/shields/ergodash/ergodash.dtsi b/app/boards/shields/ergodash/ergodash.dtsi
index 152e9b93b3..a2b7607532 100644
--- a/app/boards/shields/ergodash/ergodash.dtsi
+++ b/app/boards/shields/ergodash/ergodash.dtsi
@@ -36,7 +36,6 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,13) RC(4,12
kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
label = "KSCAN";
- debounce-period=<20>;
diode-direction = "col2row";
diff --git a/app/boards/shields/ergodash/ergodash.keymap b/app/boards/shields/ergodash/ergodash.keymap
index 9289212261..65cc1178c7 100644
--- a/app/boards/shields/ergodash/ergodash.keymap
+++ b/app/boards/shields/ergodash/ergodash.keymap
@@ -18,7 +18,7 @@
compatible = "zmk,keymap";
default_layer {
-/* Colemak
+/* QWERTY
* .----------------------------------------------------------------------------------------------------------------------.
* | ` | 1 | 2 | 3 | 4 | 5 | [ | | ] | 6 | 7 | 8 | 9 | 0 | PScr |
* |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
@@ -32,7 +32,7 @@
* .----------------------------------------------------------------------------------------------------------------------.
*/
bindings = <
-&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LBKT &kp RBKT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp PRSC
+&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LBKT &kp RBKT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp PSCRN
&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp MINUS &kp EQUAL &kp Y &kp U &kp I &kp O &kp P &kp BSLH
&kp TAB &kp A &kp S &kp D &kp F &kp G &kp DEL &kp BSPC &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp END &kp HOME &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp RSHFT
@@ -47,38 +47,38 @@
* |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | | | | | |
+ * | Shift| Boot | Reset| | | | | | | | | | | | Shift|
* |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
- * | REST | BOOT | | | | | | | | | | | | | | | |
+ * | Ctlr | | | Win |||||||| Alt | | Lower|||||||| Raise| | RAlt |||||||| | | | RCtrl|
* .----------------------------------------------------------------------------------------------------------------------.
- */
+ */ /* FIXME boot and reset are not yet locale aware */
bindings = <
&kp F11 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp &none &kp &none &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F12
&none &none &none &none &none &none &none &none &none &none &none &none &none &none
&none &none &none &none &none &none &none &none &none &none &none &none &none &none
-&none &none &none &none &none &none &none &none &none &none &none &none &none &none
-&reset &bootloader &none &none &none &none &none &none &none &none &none &none &none &none
+&trans &bootloader &reset &none &none &none &none &none &none &none &none &none &none &trans
+&trans &none &none &trans &trans &none &trans &trans &none &trans &none &none &none &trans
>;
};
raise_layer {
/* .----------------------------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | |
+ * | | BT 0 | BT 1 | BT 2 | BT 3 | | BTCL | | | | | | | | |
* |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | | | | | |
+ * | Shift| | | | | | | | | | | | Boot | Reset| Shift|
* |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
- * | | | | | | | | | | | | | | | | BOOT | REST |
+ * | Ctlr | | | Win |||||||| Alt | | Lower|||||||| Raise| | RAlt |||||||| | | | RCtrl|
* .----------------------------------------------------------------------------------------------------------------------.
- */
+ */ /* FIXME boot and reset are not yet locale aware */
bindings = <
+&none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &none &bt BT_CLR &none &none &none &none &none &none &none
&none &none &none &none &none &none &none &none &none &none &none &none &none &none
&none &none &none &none &none &none &none &none &none &none &none &none &none &none
-&none &none &none &none &none &none &none &none &none &none &none &none &none &none
-&none &none &none &none &none &none &none &none &none &none &none &none &none &none
-&none &none &none &none &none &none &none &none &none &none &none &none &bootloader &reset
+&trans &none &none &none &none &none &none &none &none &none &none &bootloader &reset &trans
+&trans &none &none &trans &trans &none &trans &trans &none &trans &none &none &none &trans
>;
};
};
diff --git a/app/boards/shields/ergodash/ergodash.zmk.yml b/app/boards/shields/ergodash/ergodash.zmk.yml
index 23160caa6a..376831a678 100644
--- a/app/boards/shields/ergodash/ergodash.zmk.yml
+++ b/app/boards/shields/ergodash/ergodash.zmk.yml
@@ -4,7 +4,6 @@ name: Ergodash
type: shield
url: https://github.com/omkbd/ErgoDash
requires: [pro_micro]
-exposes: []
features:
- keys
siblings:
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 01:04:21 +0000