From 48cc40dbb83f5ba19ebfbbca558cdbddd928cd3c Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 15:33:13 +0000 Subject: [PATCH 01/20] initial commit --- keyboards/keycapsss/3w6_2040/config.h | 24 ++++ keyboards/keycapsss/3w6_2040/info.json | 104 ++++++++++++++++++ .../3w6_2040/keymaps/default/keymap.c | 56 ++++++++++ .../keycapsss/3w6_2040/keymaps/via/keymap.c | 44 ++++++++ .../keycapsss/3w6_2040/keymaps/via/rules.mk | 2 + keyboards/keycapsss/3w6_2040/rules.mk | 3 + 6 files changed, 233 insertions(+) create mode 100644 keyboards/keycapsss/3w6_2040/config.h create mode 100644 keyboards/keycapsss/3w6_2040/info.json create mode 100644 keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c create mode 100644 keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c create mode 100644 keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk create mode 100644 keyboards/keycapsss/3w6_2040/rules.mk diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h new file mode 100644 index 000000000000..edb4b9e37c80 --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/config.h @@ -0,0 +1,24 @@ +// Copyright 2022 Conor Burns (@Conor-Burns) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. +#define SERIAL_USART_TX_PIN GP0 // USART TX pin +#define SERIAL_USART_RX_PIN GP1 // USART RX pin +#define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. +#define SERIAL_USART_SPEED 921600 // Sped :) +#define USB_VBUS_PIN GP19 // for rp2040 | When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used. +#define EE_HANDS // Split handedness via eeprom +#define SPLIT_LED_STATE_ENABLE // Sync host leds (caps lock, ...) +#define SPLIT_LAYER_STATE_ENABLE // Enables syncing of the layer state between both halves +#define SPLIT_POINTING_ENABLE // Transmitting the pointing device status to the master side +#define POINTING_DEVICE_RIGHT // Pointing device on the right side (Required - pick one only) +//#define POINTING_DEVICE_LEFT // Pointing device on the left side (Required - pick one only) + +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2 +#define RGBLIGHT_DEFAULT_HUE 152 +#define RGBLIGHT_DEFAULT_SAT 232 +#define RGBLIGHT_DEFAULT_VAR 255 +#define RGBLIGHT_DEFAULT_SPD 2 + +#define DYNAMIC_KEYMAP_LAYER_COUNT 9 diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json new file mode 100644 index 000000000000..5ecab6c6e304 --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -0,0 +1,104 @@ +{ + "manufacturer": "Keycapsss", + "keyboard_name": "3w6 RP2040", + "maintainer": "Keycapsss", + "bootloader": "rp2040", + "bootloader_instructions": "Press and hold the boot button while plugging in the keyboard", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "pointing_device": true, + "rgblight": true + }, + "indicators": { + "caps_lock": "GP17" + }, + "matrix_pins": { + "cols": ["GP8", "GP9", "GP10", "GP11", "GP12"], + "rows": ["GP4", "GP5", "GP6", "GP7"] + }, + "processor": "RP2040", + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "brightness_steps": 8, + "hue_steps": 8, + "led_count": 2, + "max_brightness": 100, + "saturation_steps": 8, + "split_count": [1, 1] + }, + "split": { + "enabled": true, + "transport": { + "protocol": "serial" + } + }, + "url": "https://keycapsss.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x3357", + "vid": "0x7983" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP25" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.75}, + {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25}, + {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0.25}, + {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.5}, + {"label": "R04", "matrix": [4, 4], "x": 8.75, "y": 0.5}, + {"label": "R03", "matrix": [4, 3], "x": 9.75, "y": 0.25}, + {"label": "R02", "matrix": [4, 2], "x": 10.75, "y": 0}, + {"label": "R01", "matrix": [4, 1], "x": 11.75, "y": 0.25}, + {"label": "R00", "matrix": [4, 0], "x": 12.75, "y": 0.75}, + {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.75}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "R14", "matrix": [5, 4], "x": 8.75, "y": 1.5}, + {"label": "R13", "matrix": [5, 3], "x": 9.75, "y": 1.25}, + {"label": "R12", "matrix": [5, 2], "x": 10.75, "y": 1}, + {"label": "R11", "matrix": [5, 1], "x": 11.75, "y": 1.25}, + {"label": "R10", "matrix": [5, 0], "x": 12.75, "y": 1.75}, + {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.75}, + {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25}, + {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2.25}, + {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.5}, + {"label": "R24", "matrix": [6, 4], "x": 8.75, "y": 2.5}, + {"label": "R23", "matrix": [6, 3], "x": 9.75, "y": 2.25}, + {"label": "R22", "matrix": [6, 2], "x": 10.75, "y": 2}, + {"label": "R21", "matrix": [6, 1], "x": 11.75, "y": 2.25}, + {"label": "R20", "matrix": [6, 0], "x": 12.75, "y": 2.75}, + {"label": "L32", "matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3.75}, + {"label": "L34", "matrix": [3, 4], "x": 5.25, "y": 3.5, "h": 1.5}, + {"label": "R34", "matrix": [7, 4], "x": 7.5, "y": 3.5, "h": 1.5}, + {"label": "R33", "matrix": [7, 3], "x": 8.75, "y": 3.75}, + {"label": "R32", "matrix": [7, 2], "x": 10, "y": 3.5} + ] + } + } +} diff --git a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c new file mode 100644 index 000000000000..4953fc3d7ad5 --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c @@ -0,0 +1,56 @@ +// Copyright 2021 weteor | 2022 Conor Burns (@Conor-Burns) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +enum layers { + _ALPHA_QWERTY = 0, + _ALPHA_COLEMAK, + _SYM, + _NAV, + _NUM, + _CFG, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // clang-format off + + [_ALPHA_QWERTY] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), + + LCTL_T(KC_ESC), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) + ), + [_ALPHA_COLEMAK] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, + LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SCLN), + LCTL_T(KC_ENT), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) + ), + [_SYM] = LAYOUT_split_3x5_3( + KC_GRV , KC_CIRC, KC_AT, KC_DLR, KC_TILD, KC_AMPR, KC_EXLM, KC_PIPE, KC_UNDS, KC_HASH, + KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, + _______, KC_QUES, KC_PLUS, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, _______, + XXXXXXX, MO(_CFG), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + [_NAV] = LAYOUT_split_3x5_3( + XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP, KC_PGUP, KC_DEL, + KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(_CFG), XXXXXXX + ), + [_NUM] = LAYOUT_split_3x5_3( + XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PSLS, + XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_P0, KC_P4, KC_P5, KC_P6, KC_PDOT, + XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P1, KC_P2, KC_P3, KC_PAST, + XXXXXXX, XXXXXXX, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX + ), + [_CFG] = LAYOUT_split_3x5_3( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,DF(_ALPHA_QWERTY), DF(_ALPHA_COLEMAK), + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + // clang-format on +}; diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c new file mode 100644 index 000000000000..a029aac6e6ed --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -0,0 +1,44 @@ +// Copyright 2021 weteor | 2022 Conor Burns (@Conor-Burns) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +enum layers { + _ALPHA_QWERTY = 0, + _ALPHA_COLEMAK, + _SYM, + _NAV, + _NUM, + _CFG, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // clang-format off + + [_ALPHA_QWERTY] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), + + LCTL_T(KC_ESC), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) + ), + [_ALPHA_COLEMAK] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, + LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SCLN), + LCTL_T(KC_ENT), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) + ), + [_SYM] = LAYOUT_split_3x5_3( + KC_GRV , KC_CIRC, KC_AT, KC_DLR, KC_TILD, KC_AMPR, KC_EXLM, KC_PIPE, KC_UNDS, KC_HASH, + KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, + _______, KC_QUES, KC_PLUS, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, _______, + XXXXXXX, MO(_CFG), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + [_NAV] = LAYOUT_split_3x5_3( + XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP, KC_PGUP, KC_DEL, + KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(_CFG), XXXXXXX + ), + // clang-format on +}; diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk b/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk new file mode 100644 index 000000000000..b60410dc1a12 --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes diff --git a/keyboards/keycapsss/3w6_2040/rules.mk b/keyboards/keycapsss/3w6_2040/rules.mk new file mode 100644 index 000000000000..b91fc468c1e3 --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/rules.mk @@ -0,0 +1,3 @@ +SERIAL_DRIVER = vendor +POINTING_DEVICE_DRIVER = pimoroni_trackball +PIMORONI_TRACKBALL_ADDRESS = 0x0A From d3bfefcbd07d909bf81da09e1161515e9a39b4ce Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 16:01:07 +0000 Subject: [PATCH 02/20] tidy info.json, add readme.md --- keyboards/keycapsss/3w6_2040/info.json | 4 ++-- keyboards/keycapsss/3w6_2040/readme.md | 27 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 keyboards/keycapsss/3w6_2040/readme.md diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index 5ecab6c6e304..3fbf749b3972 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -1,7 +1,7 @@ { "manufacturer": "Keycapsss", - "keyboard_name": "3w6 RP2040", - "maintainer": "Keycapsss", + "keyboard_name": "3w6_2040", + "maintainer": "@ben_roe Keycapsss", "bootloader": "rp2040", "bootloader_instructions": "Press and hold the boot button while plugging in the keyboard", "diode_direction": "COL2ROW", diff --git a/keyboards/keycapsss/3w6_2040/readme.md b/keyboards/keycapsss/3w6_2040/readme.md new file mode 100644 index 000000000000..1c41809972e4 --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/readme.md @@ -0,0 +1,27 @@ +# 3w6_2040 + + + +A split keyboard with 3x5 vertically staggered keys and 3 thumb keys, with support for pimoroni trackball modules on each half. + +* Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) +* Hardware Supported: On board rp2040 microcontrollers. +* Hardware Availability: [keycapsss.com](https://keycapsss.com) + +Make firmware .hex for this keyboard (after setting up your build environment): + + qmk compile -kb keycapsss/3w6_2040 -km default + +Example of flashing this keyboard (or use [QMK Toolbox](https://github.com/qmk/qmk_toolbox)): + + qmk flash -kb keycapsss/3w6_2040 -km default (or drag and drop the uf2 from the above into the mass storage device that appears when in bootloader mode) + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Press and hold the button on the front of the PCB when plugging in. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 4b7f8f1e1564c98c47f7fd04f61616c793578dd1 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 16:03:39 +0000 Subject: [PATCH 03/20] correct license headers --- keyboards/keycapsss/3w6_2040/config.h | 4 +++- keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c | 2 ++ keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h index edb4b9e37c80..1b15909f2be7 100644 --- a/keyboards/keycapsss/3w6_2040/config.h +++ b/keyboards/keycapsss/3w6_2040/config.h @@ -1,4 +1,6 @@ // Copyright 2022 Conor Burns (@Conor-Burns) +// Copyright 2023 Ben Roe (@keycapsss) +// Copyright 2023 Tom Barnes (@keyboard-magpie) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -8,7 +10,7 @@ #define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. #define SERIAL_USART_SPEED 921600 // Sped :) #define USB_VBUS_PIN GP19 // for rp2040 | When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used. -#define EE_HANDS // Split handedness via eeprom +//#define EE_HANDS // Split handedness via eeprom #define SPLIT_LED_STATE_ENABLE // Sync host leds (caps lock, ...) #define SPLIT_LAYER_STATE_ENABLE // Enables syncing of the layer state between both halves #define SPLIT_POINTING_ENABLE // Transmitting the pointing device status to the master side diff --git a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c index 4953fc3d7ad5..fa6f461a4efd 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c @@ -1,4 +1,6 @@ // Copyright 2021 weteor | 2022 Conor Burns (@Conor-Burns) +// Copyright 2023 Ben Roe (@keycapsss) +// Copyright 2023 Tom Barnes (@keyboard-magpie) // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c index a029aac6e6ed..b2f7ff032f14 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -1,4 +1,6 @@ // Copyright 2021 weteor | 2022 Conor Burns (@Conor-Burns) +// Copyright 2023 Ben Roe (@keycapsss) +// Copyright 2023 Tom Barnes (@keyboard-magpie) // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H From f77db5faa294d6ea828013520566959d19be1ffd Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 16:06:05 +0000 Subject: [PATCH 04/20] fix some minor typos --- keyboards/keycapsss/3w6_2040/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/readme.md b/keyboards/keycapsss/3w6_2040/readme.md index 1c41809972e4..176d044457ab 100644 --- a/keyboards/keycapsss/3w6_2040/readme.md +++ b/keyboards/keycapsss/3w6_2040/readme.md @@ -8,13 +8,13 @@ A split keyboard with 3x5 vertically staggered keys and 3 thumb keys, with suppo * Hardware Supported: On board rp2040 microcontrollers. * Hardware Availability: [keycapsss.com](https://keycapsss.com) -Make firmware .hex for this keyboard (after setting up your build environment): +Make firmware .uf2 for this keyboard (after setting up your build environment): qmk compile -kb keycapsss/3w6_2040 -km default -Example of flashing this keyboard (or use [QMK Toolbox](https://github.com/qmk/qmk_toolbox)): +Example of flashing this keyboard: - qmk flash -kb keycapsss/3w6_2040 -km default (or drag and drop the uf2 from the above into the mass storage device that appears when in bootloader mode) + qmk flash -kb keycapsss/3w6_2040 -km default (or drag and drop the uf2 from the above command into the mass storage device that appears when in bootloader mode) See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 0f40e0a16f628d0f99b3a2d15361064b5486794f Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 16:08:51 +0000 Subject: [PATCH 05/20] additions to readme --- keyboards/keycapsss/3w6_2040/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/keycapsss/3w6_2040/readme.md b/keyboards/keycapsss/3w6_2040/readme.md index 176d044457ab..0cb7dfec95e5 100644 --- a/keyboards/keycapsss/3w6_2040/readme.md +++ b/keyboards/keycapsss/3w6_2040/readme.md @@ -4,6 +4,8 @@ A split keyboard with 3x5 vertically staggered keys and 3 thumb keys, with support for pimoroni trackball modules on each half. +This version is distinct from keyboards/3w6 and is exclusive to [keycapsss.com](https://keycapsss.com). + * Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) * Hardware Supported: On board rp2040 microcontrollers. * Hardware Availability: [keycapsss.com](https://keycapsss.com) From 01aa13a4199ef56d5691d3f925e36ca7a6ed0252 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 16:15:33 +0000 Subject: [PATCH 06/20] try and conform to standards --- keyboards/keycapsss/3w6_2040/config.h | 7 ++----- keyboards/keycapsss/3w6_2040/info.json | 11 ++++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h index 1b15909f2be7..efe39f18e07b 100644 --- a/keyboards/keycapsss/3w6_2040/config.h +++ b/keyboards/keycapsss/3w6_2040/config.h @@ -10,11 +10,10 @@ #define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. #define SERIAL_USART_SPEED 921600 // Sped :) #define USB_VBUS_PIN GP19 // for rp2040 | When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used. -//#define EE_HANDS // Split handedness via eeprom -#define SPLIT_LED_STATE_ENABLE // Sync host leds (caps lock, ...) -#define SPLIT_LAYER_STATE_ENABLE // Enables syncing of the layer state between both halves + #define SPLIT_POINTING_ENABLE // Transmitting the pointing device status to the master side #define POINTING_DEVICE_RIGHT // Pointing device on the right side (Required - pick one only) +//#define EE_HANDS // Split handedness via eeprom //#define POINTING_DEVICE_LEFT // Pointing device on the left side (Required - pick one only) #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2 @@ -22,5 +21,3 @@ #define RGBLIGHT_DEFAULT_SAT 232 #define RGBLIGHT_DEFAULT_VAR 255 #define RGBLIGHT_DEFAULT_SPD 2 - -#define DYNAMIC_KEYMAP_LAYER_COUNT 9 diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index 3fbf749b3972..1d0c7df6038e 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -37,6 +37,11 @@ "twinkle": true }, "brightness_steps": 8, + "default": { + "hue": 152, + "sat": 232, + "speed": 2 + }, "hue_steps": 8, "led_count": 2, "max_brightness": 100, @@ -46,7 +51,11 @@ "split": { "enabled": true, "transport": { - "protocol": "serial" + "protocol": "serial", + "sync": { + "indicators": true, + "layer_state": true + } } }, "url": "https://keycapsss.com", From 0f114d4c722c65a2d686f4b3a09a9dd0ca7fe03b Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Sat, 9 Dec 2023 16:19:17 +0000 Subject: [PATCH 07/20] remove duplicates from config.h --- keyboards/keycapsss/3w6_2040/config.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h index efe39f18e07b..9c44fada777a 100644 --- a/keyboards/keycapsss/3w6_2040/config.h +++ b/keyboards/keycapsss/3w6_2040/config.h @@ -14,10 +14,4 @@ #define SPLIT_POINTING_ENABLE // Transmitting the pointing device status to the master side #define POINTING_DEVICE_RIGHT // Pointing device on the right side (Required - pick one only) //#define EE_HANDS // Split handedness via eeprom -//#define POINTING_DEVICE_LEFT // Pointing device on the left side (Required - pick one only) - -#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2 -#define RGBLIGHT_DEFAULT_HUE 152 -#define RGBLIGHT_DEFAULT_SAT 232 -#define RGBLIGHT_DEFAULT_VAR 255 -#define RGBLIGHT_DEFAULT_SPD 2 +//#define POINTING_DEVICE_LEFT // Pointing device on the left side (Required - pick one only)≈ From 0541988b52061366d663cdd98765ce59290a869f Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 11:51:34 +0000 Subject: [PATCH 08/20] remove unneccessary line from rules.mk --- keyboards/keycapsss/3w6_2040/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keycapsss/3w6_2040/rules.mk b/keyboards/keycapsss/3w6_2040/rules.mk index b91fc468c1e3..7b11b23005a5 100644 --- a/keyboards/keycapsss/3w6_2040/rules.mk +++ b/keyboards/keycapsss/3w6_2040/rules.mk @@ -1,3 +1,2 @@ SERIAL_DRIVER = vendor POINTING_DEVICE_DRIVER = pimoroni_trackball -PIMORONI_TRACKBALL_ADDRESS = 0x0A From 18dad96b0081018b89319588d5ebe6c684a739c1 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 12:18:01 +0000 Subject: [PATCH 09/20] further tidying --- keyboards/keycapsss/3w6_2040/config.h | 18 ++++++++---------- keyboards/keycapsss/3w6_2040/info.json | 2 +- .../keycapsss/3w6_2040/keymaps/via/rules.mk | 1 - keyboards/keycapsss/3w6_2040/readme.md | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h index 9c44fada777a..f7b059d6500d 100644 --- a/keyboards/keycapsss/3w6_2040/config.h +++ b/keyboards/keycapsss/3w6_2040/config.h @@ -4,14 +4,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. -#define SERIAL_USART_TX_PIN GP0 // USART TX pin -#define SERIAL_USART_RX_PIN GP1 // USART RX pin -#define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. -#define SERIAL_USART_SPEED 921600 // Sped :) -#define USB_VBUS_PIN GP19 // for rp2040 | When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used. +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN GP0 +#define SERIAL_USART_RX_PIN GP1 +#define SERIAL_USART_PIN_SWAP +#define SERIAL_USART_SPEED 921600 +#define USB_VBUS_PIN GP19 -#define SPLIT_POINTING_ENABLE // Transmitting the pointing device status to the master side -#define POINTING_DEVICE_RIGHT // Pointing device on the right side (Required - pick one only) -//#define EE_HANDS // Split handedness via eeprom -//#define POINTING_DEVICE_LEFT // Pointing device on the left side (Required - pick one only)≈ +#define SPLIT_POINTING_ENABLE +#define POINTING_DEVICE_RIGHT diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index 1d0c7df6038e..ba5e269c407b 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -110,4 +110,4 @@ ] } } -} +} \ No newline at end of file diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk b/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk index b60410dc1a12..74d66eb22cab 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes diff --git a/keyboards/keycapsss/3w6_2040/readme.md b/keyboards/keycapsss/3w6_2040/readme.md index 0cb7dfec95e5..e8611f184861 100644 --- a/keyboards/keycapsss/3w6_2040/readme.md +++ b/keyboards/keycapsss/3w6_2040/readme.md @@ -6,7 +6,7 @@ A split keyboard with 3x5 vertically staggered keys and 3 thumb keys, with suppo This version is distinct from keyboards/3w6 and is exclusive to [keycapsss.com](https://keycapsss.com). -* Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss) +* Keyboard Maintainer: [@keyboard-magpie] * Hardware Supported: On board rp2040 microcontrollers. * Hardware Availability: [keycapsss.com](https://keycapsss.com) From c1fc8e2336893075cb927e8a10f882154590d783 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 12:56:44 +0000 Subject: [PATCH 10/20] some small misses --- keyboards/keycapsss/3w6_2040/info.json | 4 ++-- keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index ba5e269c407b..9586b5f69561 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -1,7 +1,7 @@ { "manufacturer": "Keycapsss", "keyboard_name": "3w6_2040", - "maintainer": "@ben_roe Keycapsss", + "maintainer": "@keyboard_magpie", "bootloader": "rp2040", "bootloader_instructions": "Press and hold the boot button while plugging in the keyboard", "diode_direction": "COL2ROW", @@ -110,4 +110,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c index b2f7ff032f14..6bd8136853a0 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -9,8 +9,6 @@ enum layers { _ALPHA_COLEMAK, _SYM, _NAV, - _NUM, - _CFG, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From a9d65ba2a3611635488b42bdc3b4925aa287a2c5 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 12:59:18 +0000 Subject: [PATCH 11/20] some small misses --- keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c | 1 - keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c | 1 - 2 files changed, 2 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c index fa6f461a4efd..3b47b8d41200 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c @@ -21,7 +21,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), - LCTL_T(KC_ESC), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) ), [_ALPHA_COLEMAK] = LAYOUT_split_3x5_3( diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c index 6bd8136853a0..fbf2a603fa1a 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -19,7 +19,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), - LCTL_T(KC_ESC), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) ), [_ALPHA_COLEMAK] = LAYOUT_split_3x5_3( From 3768da0aaa9bd175a4d75ab26b7a0bfc55475b61 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 13:16:36 +0000 Subject: [PATCH 12/20] repair via keymap --- keyboards/keycapsss/3w6_2040/keymaps/via/config.h | 4 ++++ keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 keyboards/keycapsss/3w6_2040/keymaps/via/config.h diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/config.h b/keyboards/keycapsss/3w6_2040/keymaps/via/config.h new file mode 100644 index 000000000000..0f5043d440fc --- /dev/null +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/config.h @@ -0,0 +1,4 @@ +// Copyright 2023 Tom Barnes (@keyboard-magpie) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once +#define DYNAMIC_KEYMAP_LAYER_COUNT 6 diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c index fbf2a603fa1a..bfdb3ca14a65 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -3,12 +3,13 @@ // Copyright 2023 Tom Barnes (@keyboard-magpie) // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H enum layers { _ALPHA_QWERTY = 0, _ALPHA_COLEMAK, _SYM, _NAV, + _NUM, + _CFG, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -39,5 +40,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(_CFG), XXXXXXX ), + [_NUM] = LAYOUT_split_3x5_3( + XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PSLS, + XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_P0, KC_P4, KC_P5, KC_P6, KC_PDOT, + XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P1, KC_P2, KC_P3, KC_PAST, + XXXXXXX, XXXXXXX, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX + ), + [_CFG] = LAYOUT_split_3x5_3( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,DF(_ALPHA_QWERTY), DF(_ALPHA_COLEMAK), + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), // clang-format on }; From dc422b7dad650e451e803ed6659d170030d05cee Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 13:26:15 +0000 Subject: [PATCH 13/20] actually fixed, d'oh --- keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c index bfdb3ca14a65..3b47b8d41200 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -3,6 +3,7 @@ // Copyright 2023 Tom Barnes (@keyboard-magpie) // SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H enum layers { _ALPHA_QWERTY = 0, _ALPHA_COLEMAK, From 429d476c9219ce3f7043b225b019cffb94bf9129 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 18:43:39 +0000 Subject: [PATCH 14/20] Update keyboards/keycapsss/3w6_2040/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/keycapsss/3w6_2040/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index 9586b5f69561..d19afee82165 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -51,7 +51,6 @@ "split": { "enabled": true, "transport": { - "protocol": "serial", "sync": { "indicators": true, "layer_state": true From 368b22f9bd005a04d51fc129f530e4bb2ff01f62 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 18:43:48 +0000 Subject: [PATCH 15/20] Update keyboards/keycapsss/3w6_2040/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/keycapsss/3w6_2040/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index d19afee82165..7253d5eb6cef 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -67,6 +67,7 @@ "driver": "vendor", "pin": "GP25" }, + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ From 503b5df74a7a2fd5f4c878e88fb745502339ff56 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 18:43:57 +0000 Subject: [PATCH 16/20] Update keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c index 3b47b8d41200..0c195be62f3c 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c @@ -33,25 +33,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV , KC_CIRC, KC_AT, KC_DLR, KC_TILD, KC_AMPR, KC_EXLM, KC_PIPE, KC_UNDS, KC_HASH, KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, _______, KC_QUES, KC_PLUS, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, _______, - XXXXXXX, MO(_CFG), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, MO(_CFG), XXXXXXX, _______, XXXXXXX, XXXXXXX ), [_NAV] = LAYOUT_split_3x5_3( XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP, KC_PGUP, KC_DEL, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(_CFG), XXXXXXX + XXXXXXX, XXXXXXX, _______, XXXXXXX, MO(_CFG), XXXXXXX ), [_NUM] = LAYOUT_split_3x5_3( XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PSLS, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_P0, KC_P4, KC_P5, KC_P6, KC_PDOT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P1, KC_P2, KC_P3, KC_PAST, - XXXXXXX, XXXXXXX, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX + XXXXXXX, _______, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX ), [_CFG] = LAYOUT_split_3x5_3( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,DF(_ALPHA_QWERTY), DF(_ALPHA_COLEMAK), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), + XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX + ) // clang-format on }; From d6afc9453b9a68aaf602d922f4938425aca9fca2 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 18:44:04 +0000 Subject: [PATCH 17/20] Update keyboards/keycapsss/3w6_2040/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/keycapsss/3w6_2040/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json index 7253d5eb6cef..88bc275a6900 100644 --- a/keyboards/keycapsss/3w6_2040/info.json +++ b/keyboards/keycapsss/3w6_2040/info.json @@ -67,6 +67,9 @@ "driver": "vendor", "pin": "GP25" }, + "dynamic_keymap": { + "layer_count": 6 + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { From 82e3e2a1e7bdad1df532ce293ea22cce0850957a Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 18:44:19 +0000 Subject: [PATCH 18/20] Update keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c index 3b47b8d41200..0c195be62f3c 100644 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c +++ b/keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c @@ -33,25 +33,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV , KC_CIRC, KC_AT, KC_DLR, KC_TILD, KC_AMPR, KC_EXLM, KC_PIPE, KC_UNDS, KC_HASH, KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, _______, KC_QUES, KC_PLUS, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, _______, - XXXXXXX, MO(_CFG), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, MO(_CFG), XXXXXXX, _______, XXXXXXX, XXXXXXX ), [_NAV] = LAYOUT_split_3x5_3( XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP, KC_PGUP, KC_DEL, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(_CFG), XXXXXXX + XXXXXXX, XXXXXXX, _______, XXXXXXX, MO(_CFG), XXXXXXX ), [_NUM] = LAYOUT_split_3x5_3( XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PSLS, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_P0, KC_P4, KC_P5, KC_P6, KC_PDOT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P1, KC_P2, KC_P3, KC_PAST, - XXXXXXX, XXXXXXX, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX + XXXXXXX, _______, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX ), [_CFG] = LAYOUT_split_3x5_3( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,DF(_ALPHA_QWERTY), DF(_ALPHA_COLEMAK), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), + XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX + ) // clang-format on }; From f78b0f6c45beff533f9ae3021bb3fccc5961e132 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 11 Dec 2023 18:44:27 +0000 Subject: [PATCH 19/20] Update keyboards/keycapsss/3w6_2040/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/keycapsss/3w6_2040/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keycapsss/3w6_2040/readme.md b/keyboards/keycapsss/3w6_2040/readme.md index e8611f184861..2c43daa12bf2 100644 --- a/keyboards/keycapsss/3w6_2040/readme.md +++ b/keyboards/keycapsss/3w6_2040/readme.md @@ -1,6 +1,6 @@ # 3w6_2040 - +![image](https://i.imgur.com/QAL63nyh.jpg) A split keyboard with 3x5 vertically staggered keys and 3 thumb keys, with support for pimoroni trackball modules on each half. From 732e4b67033c876e350dcbb7eb3eaae603354fce Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Wed, 13 Dec 2023 08:18:06 +0000 Subject: [PATCH 20/20] remove via config.h --- keyboards/keycapsss/3w6_2040/keymaps/via/config.h | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 keyboards/keycapsss/3w6_2040/keymaps/via/config.h diff --git a/keyboards/keycapsss/3w6_2040/keymaps/via/config.h b/keyboards/keycapsss/3w6_2040/keymaps/via/config.h deleted file mode 100644 index 0f5043d440fc..000000000000 --- a/keyboards/keycapsss/3w6_2040/keymaps/via/config.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2023 Tom Barnes (@keyboard-magpie) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 6