From 08a43c62926c40e0feefbebbe02be9a905aa5b84 Mon Sep 17 00:00:00 2001 From: schwarzgrau Date: Sat, 5 Nov 2022 18:53:43 +0100 Subject: [PATCH] update firmware --- config/boards/shields/totem/Kconfig.defconfig | 2 +- config/boards/shields/totem/totem.dtsi | 13 +++++++------ config/boards/shields/totem/totem_left.overlay | 11 +++++------ config/totem.keymap | 18 +----------------- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/config/boards/shields/totem/Kconfig.defconfig b/config/boards/shields/totem/Kconfig.defconfig index 69b4f8d..0bea6d1 100644 --- a/config/boards/shields/totem/Kconfig.defconfig +++ b/config/boards/shields/totem/Kconfig.defconfig @@ -4,7 +4,7 @@ if SHIELD_TOTEM_LEFT config ZMK_KEYBOARD_NAME - default "Totem" + default "TOTEM" config ZMK_SPLIT_ROLE_CENTRAL default y diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi index 3446159..48a588f 100644 --- a/config/boards/shields/totem/totem.dtsi +++ b/config/boards/shields/totem/totem.dtsi @@ -29,12 +29,13 @@ compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; diode-direction = "col2row"; - - row-gpios - = <&xiao_d 0 GPIO_ACTIVE_HIGH> - , <&xiao_d 1 GPIO_ACTIVE_HIGH> - , <&xiao_d 2 GPIO_ACTIVE_HIGH> - , <&xiao_d 3 GPIO_ACTIVE_HIGH> + + col-gpios + = <&xiao_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; }; \ No newline at end of file diff --git a/config/boards/shields/totem/totem_left.overlay b/config/boards/shields/totem/totem_left.overlay index e9d9fb2..dd94a9f 100644 --- a/config/boards/shields/totem/totem_left.overlay +++ b/config/boards/shields/totem/totem_left.overlay @@ -7,11 +7,10 @@ #include "totem.dtsi" &kscan0 { - col-gpios - = <&xiao_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + row-gpios + = <&xiao_d 0 GPIO_ACTIVE_HIGH> + , <&xiao_d 1 GPIO_ACTIVE_HIGH> + , <&xiao_d 2 GPIO_ACTIVE_HIGH> + , <&xiao_d 3 GPIO_ACTIVE_HIGH> ; }; diff --git a/config/totem.keymap b/config/totem.keymap index 259c592..ab9e992 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -3,31 +3,15 @@ #include #include #include -#include #define BASE 0 / { keymap { compatible = "zmk,keymap"; -// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ base_layer { -// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -label= "BASE" ; -// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ -// ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ -// ┃ Q ┃ W ┃ F ┃ P ┃ G ┃ ┃ J ┃ L ┃ U ┃ Y ┃ ; ┃ -// ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ -// ┃ A ┃ R ┃ S ┃ T ┃ D ┃ ┃ H ┃ N ┃ E ┃ I ┃ O ┃ -// ┏━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┓ -// ┃ ┃ Z ┃ X ┃ C ┃ V ┃ B ┃ ┃ K ┃ M ┃ , ┃ . ┃ / ┃ ┃ -// ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ -// ┃ ┃ TAB ┃ SPC ┃ ┃ ENTER ┃ BSPC ┃ ┃ -// ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ - bindings = < -// ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - + bindings = < &kp N1 &kp N4 &kp N7 &kp A &kp D &kp J &kp L &kp U &kp Y &kp SEMI &kp N2 &kp N5 &kp N8 &kp B &kp E &kp N2 &kp N5 &kp N8 &kp B &kp E &kp N0 &kp N3 &kp N6 &kp N9 &kp C &kp F &kp K &kp M &kp COMMA &kp DOT &kp FSLH &kp FSLH