summaryrefslogtreecommitdiff
path: root/app/boards/shields
diff options
context:
space:
mode:
Diffstat (limited to 'app/boards/shields')
-rw-r--r--app/boards/shields/qaz/Kconfig.defconfig3
-rw-r--r--app/boards/shields/qaz/Kconfig.shield5
-rw-r--r--app/boards/shields/qaz/boards/nice_nano.overlay22
-rw-r--r--app/boards/shields/qaz/qaz.conf26
-rw-r--r--app/boards/shields/qaz/qaz.keymap49
-rw-r--r--app/boards/shields/qaz/qaz.overlay7
6 files changed, 19 insertions, 93 deletions
diff --git a/app/boards/shields/qaz/Kconfig.defconfig b/app/boards/shields/qaz/Kconfig.defconfig
index 18cceaa..f82f458 100644
--- a/app/boards/shields/qaz/Kconfig.defconfig
+++ b/app/boards/shields/qaz/Kconfig.defconfig
@@ -1,3 +1,6 @@
+ # Copyright (c) 2020 TJ Campie
+ # SPDX-License-Identifier: MIT
+
if SHIELD_QAZ
config ZMK_KEYBOARD_NAME
diff --git a/app/boards/shields/qaz/Kconfig.shield b/app/boards/shields/qaz/Kconfig.shield
index 1e1112a..9da6077 100644
--- a/app/boards/shields/qaz/Kconfig.shield
+++ b/app/boards/shields/qaz/Kconfig.shield
@@ -1,2 +1,5 @@
-config SHIELD_MY_BOARD
+# Copyright (c) 2020 TJ Campie
+# SPDX-License-Identifier: MIT
+
+ config SHIELD_MY_BOARD
def_bool $(shields_list_contains,qaz)
diff --git a/app/boards/shields/qaz/boards/nice_nano.overlay b/app/boards/shields/qaz/boards/nice_nano.overlay
deleted file mode 100644
index 2927d0d..0000000
--- a/app/boards/shields/qaz/boards/nice_nano.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-&spi1 {
- compatible = "nordic,nrf-spi";
- status = "okay";
- mosi-pin = <47>;
- // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
- sck-pin = <5>;
- miso-pin = <7>;
-
- led_strip: ws2812@0 {
- compatible = "worldsemi,ws2812-spi";
- label = "WS2812";
-
- /* SPI */
- reg = <0>; /* ignored, but necessary for SPI bindings */
- spi-max-frequency = <4000000>;
-
- /* WS2812 */
- chain-length = <21>; /* number of LEDs */
- spi-one-frame = <0x70>;
- spi-zero-frame = <0x40>;
- };
-}; \ No newline at end of file
diff --git a/app/boards/shields/qaz/qaz.conf b/app/boards/shields/qaz/qaz.conf
deleted file mode 100644
index 7d6da43..0000000
--- a/app/boards/shields/qaz/qaz.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-CONFIG_ZMK_RGB_UNDERGLOW=n
-# Use the STRIP config specific to the LEDs you're using
-CONFIG_WS2812_STRIP=n
-# 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"
-CONFIG_USB_UART_DTR_WAIT=n \ No newline at end of file
diff --git a/app/boards/shields/qaz/qaz.keymap b/app/boards/shields/qaz/qaz.keymap
index fa4ede1..cebcd4b 100644
--- a/app/boards/shields/qaz/qaz.keymap
+++ b/app/boards/shields/qaz/qaz.keymap
@@ -1,46 +1,9 @@
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/rgb.h>
#define DEFAULT 0
#define NUM_SYM 1
#define NAV 2
-
-/ {
- behaviors {
- rst: behavior_tap_hold1 {
- compatible = "zmk,behavior-tap-hold";
- label = "Bootloader Tap - Reset Hold";
- #binding-cells = <0>;
- hold_ms = <200>;
- bindings = <&bootloader>, <&reset>, <&kp BKSP>;
- };
-
- num_spc: behavior_tap_hold2 {
- compatible = "zmk,behavior-tap-hold";
- label = "Space Tap - Num/Sym Hold";
- #binding-cells = <0>;
- hold_ms = <300>;
- bindings = <&kp SPC>, <&mo NUM_SYM>;
- };
-
- ent_nav: behavior_tap_hold{
- compatible = "zmk,behavior-tap-hold";
- label = "Return Tap - Nav Hold";
- #binding-cells = <0>;
- hold_ms = <100>;
- bindings = <&kp RET>, <&mo NAV>;
- };
-
- com_col: behavior_tap_hold10 {
- compatible = "zmk,behavior-tap-hold";
- label = ", tap, hold";
- #binding-cells = <0>;
- hold_ms = <200>;
- bindings = <&kp CMMA>, <&kp SCLN>, <&kp BKSP>;
- };
- };
- };
/ {
keymap {
@@ -48,10 +11,10 @@
default_layer {
bindings = <
- &kp Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp QUOT
- &kp A &kp R &kp S &kp T &kp D &kp H &kp N &kp E &kp I &kp O
- &kp Z &kp X &kp C &kp V &kp B &kp K &kp M &com_col &kp DOT
- &kp LSFT &kp LGUI &kp TAB &ent_nav &num_spc &kp LCTL &kp LALT &kp FSLH
+ &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 RET
+ &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT
+ &kp LSFT &kp LGUI &kp LALT &mo NAV &kp SPC &mo NUM_SYM &kp QUOT &kp FSLH
>;
};
num_sym {
@@ -59,7 +22,7 @@
&kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0
&trans &trans &trans &trans &trans &trans &trans &trans &kp EQL &kp MINUS
&kp DEL &none &none &none &none &none &none &none &kp DOT
- &rst &none &none &trans &trans &kp RET &trans &kp FSLH
+ &bootloader &reset &none &trans &trans &kp RET &trans &kp FSLH
>;
};
@@ -68,7 +31,7 @@
&none &none &none &none &none &none &none &kp UARW &none &kp BKSP
&trans &trans &trans &trans &none &none &kp LARW &kp DARW &kp RARW &none
&none &none &none &none &none &none &none &none &none
- &rgb_ug RGB_TOG &rgb_ug RGB_EFF &none &trans &trans &kp RET &trans &kp FSLH
+ &none &none &none &none &none &trans &trans &kp RET &trans &kp FSLH
>;
};
};
diff --git a/app/boards/shields/qaz/qaz.overlay b/app/boards/shields/qaz/qaz.overlay
index 3dae7dd..472005b 100644
--- a/app/boards/shields/qaz/qaz.overlay
+++ b/app/boards/shields/qaz/qaz.overlay
@@ -1,10 +1,15 @@
+/*
+ * Copyright (c) 2020 TJ Campie
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
#include <dt-bindings/zmk/matrix-transform.h>
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
- zmk,underglow = &led_strip;
};
default_transform: keymap_transform_0 {