From 3d3ea42390b56f7ff7809fecbaafcb9aca965bdb Mon Sep 17 00:00:00 2001 From: KemoNine Date: Fri, 25 Dec 2020 23:02:17 +0000 Subject: [PATCH] Adjust pockettype setup --- .../shields/pockettype/Kconfig.defconfig | 2 +- .../boards/shields/pockettype/Kconfig.shield | 2 +- .../shields/pockettype/pockettype.overlay | 119 +++++++++--------- keyboards/zmk-config/config/pockettype.conf | 43 +++++++ 4 files changed, 105 insertions(+), 61 deletions(-) mode change 100755 => 100644 keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay create mode 100644 keyboards/zmk-config/config/pockettype.conf diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.defconfig b/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.defconfig index 16d55189..49cf7087 100755 --- a/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.defconfig +++ b/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.defconfig @@ -4,6 +4,6 @@ if SHIELD_POCKETTYPE config ZMK_KEYBOARD_NAME - default "Pockettype!" + default "Pockettype" endif diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.shield b/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.shield index 8cbd2ff8..1bfa5ee0 100755 --- a/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.shield +++ b/keyboards/zmk-config/config/boards/shields/pockettype/Kconfig.shield @@ -2,4 +2,4 @@ # SPDX-License-Identifier: MIT config SHIELD_POCKETTYPE - def_bool $(shields_list_contains,pockettype) + def_bool $(shields_list_contains,pockettype) diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay old mode 100755 new mode 100644 index 3e2963cf..c40af1b3 --- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay +++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay @@ -1,59 +1,60 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include - -// TODO: LEDs -// pro micro A3 -// pro micro A2 - -/ { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <12>; - rows = <4>; - - map = < -RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) -RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) -RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) -RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) - >; - }; - - kscan0: kscan_0 { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; - diode-direction = "col2row"; - - col-gpios - = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 10 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 8 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 7 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 5 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 4 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 3 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 0 GPIO_ACTIVE_HIGH> - ; - - row-gpios - = <&pro_micro_d 1 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 2 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 6 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 9 GPIO_ACTIVE_HIGH> - ; - }; -}; +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +// TODO: LEDs +// pro micro A3 +// pro micro A2 + +/ { + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + + col-gpios + = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + row-gpios + = <&pro_micro_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; + + map = < +RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) RC(0,0) +RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) RC(1,0) +RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) RC(2,0) +RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) RC(3,0) + >; + }; + + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; +}; diff --git a/keyboards/zmk-config/config/pockettype.conf b/keyboards/zmk-config/config/pockettype.conf new file mode 100644 index 00000000..eb075fcc --- /dev/null +++ b/keyboards/zmk-config/config/pockettype.conf @@ -0,0 +1,43 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +# Number of BT Profiles +CONFIG_BT_MAX_CONN=6 + +# Set screen blanking to 15s instead of 30s +CONFIG_ZMK_IDLE_TIMEOUT=15000 + +# Save settings after 10s instaed of 60s +#CONFIG_ZMK_SETTINGS_SAVE_DEBOUNCE=10000 + +################################################################################ +# Debugging +################################################################################ + +# Turn on logging, and set ZMK logging to debug output +CONFIG_LOG=y +CONFIG_ZMK_LOG_LEVEL_DBG=y + +# Turn on USB CDC ACM device +CONFIG_USB=y +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_CDC_ACM=y +CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024 +CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM" +CONFIG_USB_CDC_ACM_DEVICE_COUNT=1 + +# Enable serial console +CONFIG_SERIAL=y +CONFIG_CONSOLE=y +CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_UART_LINE_CTRL=y + +# Enable USB UART, and set the console device +CONFIG_UART_CONSOLE=y +CONFIG_USB_UART_CONSOLE=y +CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0" + +# Sensor logging +CONFIG_SENSOR_LOG_LEVEL_DBG=y +#CONFIG_SENSOR_LOG_LEVEL=4 +CONFIG_SENSOR_INIT_PRIORITY=90 \ No newline at end of file