From 13aa919a7d6a5f0057b751afd7b443875ac32f9a Mon Sep 17 00:00:00 2001 From: schwarzgrau Date: Sun, 13 Nov 2022 22:30:12 +0100 Subject: [PATCH] fix rows --- config/boards/shields/totem/Kconfig.defconfig | 2 +- config/boards/shields/totem/Kconfig.shield | 5 ----- config/boards/shields/totem/totem.dtsi | 5 +++++ config/boards/shields/totem/totem.zmk.yml | 4 ++-- config/totem.conf | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/boards/shields/totem/Kconfig.defconfig b/config/boards/shields/totem/Kconfig.defconfig index 0bea6d1..8699cda 100644 --- a/config/boards/shields/totem/Kconfig.defconfig +++ b/config/boards/shields/totem/Kconfig.defconfig @@ -11,7 +11,7 @@ config ZMK_SPLIT_ROLE_CENTRAL endif -if SHIELD_TOTEM +if SHIELD_TOTEM_LEFT || SHIELD_TOTEM_RIGHT config ZMK_SPLIT default y diff --git a/config/boards/shields/totem/Kconfig.shield b/config/boards/shields/totem/Kconfig.shield index 9708754..7c1691d 100644 --- a/config/boards/shields/totem/Kconfig.shield +++ b/config/boards/shields/totem/Kconfig.shield @@ -1,13 +1,8 @@ # Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT -config SHIELD_TOTEM - bool - config SHIELD_TOTEM_LEFT def_bool $(shields_list_contains,totem_left) - select SHIELD_TOTEM config SHIELD_TOTEM_RIGHT def_bool $(shields_list_contains,totem_right) - select SHIELD_TOTEM diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi index f4e2b7f..54f531c 100644 --- a/config/boards/shields/totem/totem.dtsi +++ b/config/boards/shields/totem/totem.dtsi @@ -16,6 +16,10 @@ compatible = "zmk,matrix-transform"; columns = <10>; rows = <4>; +// | SW01 | SW02 | SW03 | SW04 | SW05 | | SW05 | SW04 | SW03 | SW02 | SW01 | +// | SW06 | SW07 | SW08 | SW09 | SW10 | | SW10 | SW09 | SW08 | SW07 | SW06 | +// | SW16 | SW11 | SW12 | SW13 | SW14 | SW15 | | SW15 | SW14 | SW13 | SW12 | SW11 | SW16 | +// | SW17 | SW18 | SW19 | | SW19 | SW18 | SW17 | map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) @@ -28,6 +32,7 @@ kscan0: kscan_0 { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; + diode-direction = "col2row"; row-gpios = <&xiao_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> diff --git a/config/boards/shields/totem/totem.zmk.yml b/config/boards/shields/totem/totem.zmk.yml index aced633..537a041 100644 --- a/config/boards/shields/totem/totem.zmk.yml +++ b/config/boards/shields/totem/totem.zmk.yml @@ -1,9 +1,9 @@ file_format: "1" id: totem -name: Totem +name: TOTEM type: shield url: https://github.com/GEIGEIGEIST/TOTEM -requires: [seeed_xiao] +requires: [seeeduino_xiao_ble] features: - keys siblings: diff --git a/config/totem.conf b/config/totem.conf index c747d39..5682145 100644 --- a/config/totem.conf +++ b/config/totem.conf @@ -1 +1 @@ -CONFIG_ZMK_USB_LOGGING=y \ No newline at end of file +CONFIG_ZMK_USB_LOGGING=n \ No newline at end of file