From a74133976c03f675e605edcccdbb3e2685ecf753 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Wed, 18 Jan 2023 23:31:46 -0500 Subject: [PATCH 01/20] Adding city42 readme --- keyboards/controllerworks/city42/readme.md | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 keyboards/controllerworks/city42/readme.md diff --git a/keyboards/controllerworks/city42/readme.md b/keyboards/controllerworks/city42/readme.md new file mode 100644 index 000000000000..29eb3de1a2f0 --- /dev/null +++ b/keyboards/controllerworks/city42/readme.md @@ -0,0 +1,41 @@ +# city42 + +![city42](https://i.imgur.com/xrSKhqRh.png) +![city42PCB](https://i.imgur.com/R7u1KB8h.png) + +*A pre-built, low profile, unibody split keyboard based on the RP2040 processor* + +* Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works) +* Hardware Supported: *city42 split ergonomic keyboard* +* Hardware Availability: *https://controller.works/products/city42-low-profile-ergonomic-keyboard* Hardware is available as pre-built units only. + +Make example for this keyboard (after setting up your build environment): + +```sh + make controllerworks/city42:default +``` + +Flashing example for this keyboard: + +```sh + make controllerworks/city42:default:flash +``` +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). + +## Features +- Highly integrated design with microcontroller and USB connectors on the main board +- RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory +- CNC milled aluminum case with only 8mm thickness +- 42 per-key RGB LEDs +- ESD and over-current protection on USB +- Reset and boot tactile switches +- USB C host connection +- Hot swap connectors for Kailh Chocolate PG1350 switches +- Chocolate key spacing (18mm horizontal x 17mm vertical) +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the upper left key while plugging in USB +* **Physical reset button**: Press the RST button twice, rapidly +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file From 8c0d3fed3522aaa3365a8b7639ac5ca6ee18614d Mon Sep 17 00:00:00 2001 From: Controller Works Date: Thu, 19 Jan 2023 01:00:12 -0500 Subject: [PATCH 02/20] Adding config.h info.json and rules.mk files --- keyboards/controllerworks/city42/config.h | 33 ++++++ keyboards/controllerworks/city42/info.json | 132 +++++++++++++++++++++ keyboards/controllerworks/city42/rules.mk | 4 + 3 files changed, 169 insertions(+) create mode 100644 keyboards/controllerworks/city42/config.h create mode 100644 keyboards/controllerworks/city42/info.json create mode 100644 keyboards/controllerworks/city42/rules.mk diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h new file mode 100644 index 000000000000..d03841b3fecf --- /dev/null +++ b/keyboards/controllerworks/city42/config.h @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Kevin Gee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define WS2812_PIO_USE_PIO1 +#define RGBLED_NUM 42 +#define RGB_MATRIX_LED_COUNT RGBLED_NUM + +/* Top left key */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 +/* Top right key on right half */ + +/* Cirque trackpad over SPI. */ +#define SPI_SCK_PIN GP18 +#define SPI_MOSI_PIN GP19 +#define SPI_MISO_PIN GP16 +#define POINTING_DEVICE_CS_PIN GP17 \ No newline at end of file diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json new file mode 100644 index 000000000000..0e238b04f633 --- /dev/null +++ b/keyboards/controllerworks/city42/info.json @@ -0,0 +1,132 @@ +{ + "manufacturer": "Controller Works", + "keyboard_name": "city42", + "maintainer": "controller-works", + "processor": "RP2040", + "url": "https://controller.works/products/city42-low-profile-ergonomic-keyboard", + "tags": ["RP2040", "choc v1", "choc spaced" ], + "usb": { + "device_version": "1.0.0", + "pid": "0x0005", + "vid": "0x4357" + }, + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "build": { + "lto":true + }, + "matrix_pins": { + "cols": + ["GP28", "GP27", "GP26","GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], + "rows": + ["GP12", "GP13", "GP14", "GP15"] + }, + "rgblight": { + "pin": "GP29" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 1, "matrix": [3, 2], "x": 92, "y": 64 }, + { "flags": 4, "matrix": [2, 5], "x": 82, "y": 39 }, + { "flags": 4, "matrix": [1, 5], "x": 82, "y": 22 }, + { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 }, + { "flags": 4, "matrix": [0, 4], "x": 65, "y": 2 }, + { "flags": 4, "matrix": [1, 4], "x": 65, "y": 14 }, + { "flags": 4, "matrix": [2, 4], "x": 65, "y": 37 }, + { "flags": 1, "matrix": [3, 1], "x": 78, "y": 58 }, + { "flags": 1, "matrix": [3, 0], "x": 58, "y": 55 }, + { "flags": 4, "matrix": [2, 3], "x": 49, "y": 34 }, + { "flags": 4, "matrix": [1, 3], "x": 49, "y": 17 }, + { "flags": 4, "matrix": [0, 3], "x": 49, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 33, "y": 2 }, + { "flags": 4, "matrix": [1, 2], "x": 33, "y": 19 }, + { "flags": 4, "matrix": [2, 2], "x": 33, "y": 37 }, + { "flags": 4, "matrix": [2, 1], "x": 16, "y": 41 }, + { "flags": 4, "matrix": [1, 1], "x": 16, "y": 24 }, + { "flags": 4, "matrix": [0, 1], "x": 16, "y": 7 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 7 }, + { "flags": 1, "matrix": [1, 0], "x": 17, "y": 24 }, + { "flags": 1, "matrix": [2, 0], "x": 34, "y": 41 }, + { "flags": 1, "matrix": [7, 0], "x": 132, "y": 64 }, + { "flags": 4, "matrix": [6, 0], "x": 142, "y": 39 }, + { "flags": 4, "matrix": [5, 0], "x": 142, "y": 22 }, + { "flags": 4, "matrix": [4, 0], "x": 142, "y": 5 }, + { "flags": 4, "matrix": [4, 1], "x": 159, "y": 2 }, + { "flags": 4, "matrix": [5, 1], "x": 159, "y": 19 }, + { "flags": 4, "matrix": [6, 1], "x": 159, "y": 37 }, + { "flags": 1, "matrix": [7, 1], "x": 146, "y": 58 }, + { "flags": 1, "matrix": [7, 2], "x": 166, "y": 55 }, + { "flags": 4, "matrix": [6, 2], "x": 175, "y": 34 }, + { "flags": 4, "matrix": [5, 2], "x": 175, "y": 17 }, + { "flags": 4, "matrix": [4, 2], "x": 175, "y": 0 }, + { "flags": 4, "matrix": [4, 3], "x": 191, "y": 2 }, + { "flags": 4, "matrix": [5, 3], "x": 191, "y": 19 }, + { "flags": 4, "matrix": [6, 3], "x": 191, "y": 37 }, + { "flags": 4, "matrix": [6, 4], "x": 208, "y": 41 }, + { "flags": 4, "matrix": [5, 4], "x": 208, "y": 24 }, + { "flags": 4, "matrix": [4, 4], "x": 208, "y": 7 }, + { "flags": 1, "matrix": [4, 5], "x": 224, "y": 7 }, + { "flags": 1, "matrix": [5, 5], "x": 224, "y": 24 }, + { "flags": 1, "matrix": [6, 5], "x": 224, "y": 41 } + ] + }, + "community_layouts": ["split_3x6_3"], + "layouts": { + "LAYOUT_split_3x6_3": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0.25 }, + { "matrix": [0, 1], "x": 1, "y": 0.25 }, + { "matrix": [0, 2], "x": 2, "y": 0.125 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0.125 }, + { "matrix": [0, 5], "x": 5, "y": 0.25 }, + { "matrix": [4, 0], "x": 8, "y": 0.25 }, + { "matrix": [4, 1], "x": 9, "y": 0.125 }, + { "matrix": [4, 2], "x": 10, "y": 0 }, + { "matrix": [4, 3], "x": 11, "y": 0.125 }, + { "matrix": [4, 4], "x": 12, "y": 0.25 }, + { "matrix": [4, 5], "x": 13, "y": 0.25 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.125 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1.125 }, + { "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "matrix": [5, 0], "x": 8, "y": 1.25 }, + { "matrix": [5, 1], "x": 9, "y": 1.125 }, + { "matrix": [5, 2], "x": 10, "y": 1 }, + { "matrix": [5, 3], "x": 11, "y": 1.125 }, + { "matrix": [5, 4], "x": 12, "y": 1.25 }, + { "matrix": [5, 5], "x": 13, "y": 1.25 }, + { "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.125 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2.125 }, + { "matrix": [2, 5], "x": 5, "y": 2.25 }, + { "matrix": [6, 0], "x": 8, "y": 2.25 }, + { "matrix": [6, 1], "x": 9, "y": 2.125 }, + { "matrix": [6, 2], "x": 10, "y": 2 }, + { "matrix": [6, 3], "x": 11, "y": 2.125 }, + { "matrix": [6, 4], "x": 12, "y": 2.25 }, + { "matrix": [6, 5], "x": 13, "y": 2.25 }, + { "matrix": [3, 0], "x": 3.5, "y": 3.25 }, + { "matrix": [3, 1], "x": 4.5, "y": 3.5 }, + { "matrix": [3, 2], "x": 5.5, "y": 3.75, "h":1.5 }, + { "matrix": [7, 0], "x": 7.5, "y": 3.75, "h":1.5 }, + { "matrix": [7, 1], "x": 8.5, "y": 3.5 }, + { "matrix": [7, 2], "x": 9.5, "y": 3.25 } + ] + } + } +} diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk new file mode 100644 index 000000000000..1a3426714d7c --- /dev/null +++ b/keyboards/controllerworks/city42/rules.mk @@ -0,0 +1,4 @@ +WS2812_DRIVER = vendor + +POINTING_DEVICE_ENABLE = yes +POINTING_DEVICE_DRIVER = cirque_pinnacle_spi \ No newline at end of file From 7c02a9d5be744554d68627c75b90f4e065b8b83e Mon Sep 17 00:00:00 2001 From: Controller Works Date: Fri, 20 Jan 2023 23:34:19 -0500 Subject: [PATCH 03/20] Build to test Cirque trackpad --- keyboards/controllerworks/city42/config.h | 21 ++- keyboards/controllerworks/city42/info.json | 144 +++++++++--------- .../city42/keymaps/default/config.h | 79 ++++++++++ .../city42/keymaps/default/keymap.c | 68 +++++++++ .../city42/keymaps/via/config.h | 78 ++++++++++ .../city42/keymaps/via/keymap.c | 68 +++++++++ .../city42/keymaps/via/rules.mk | 1 + keyboards/controllerworks/city42/readme.md | 1 - keyboards/controllerworks/city42/rules.mk | 1 - 9 files changed, 384 insertions(+), 77 deletions(-) create mode 100644 keyboards/controllerworks/city42/keymaps/default/config.h create mode 100644 keyboards/controllerworks/city42/keymaps/default/keymap.c create mode 100644 keyboards/controllerworks/city42/keymaps/via/config.h create mode 100644 keyboards/controllerworks/city42/keymaps/via/keymap.c create mode 100644 keyboards/controllerworks/city42/keymaps/via/rules.mk diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index d03841b3fecf..0188002c920c 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -26,8 +26,23 @@ #define BOOTMAGIC_LITE_COLUMN 0 /* Top right key on right half */ -/* Cirque trackpad over SPI. */ +/* Cirque trackpad over SPI. Production +* #define SPI_SCK_PIN GP18 +* #define SPI_MOSI_PIN GP19 /* SPIOTX +* #define SPI_MISO_PIN GP16 /* SPIORX +* #define POINTING_DEVICE_CS_PIN GP17 +*/ + + +/* Cirque trackpad over SPI. Testing*/ #define SPI_SCK_PIN GP18 #define SPI_MOSI_PIN GP19 -#define SPI_MISO_PIN GP16 -#define POINTING_DEVICE_CS_PIN GP17 \ No newline at end of file +#define SPI_MISO_PIN GP20 +#define POINTING_DEVICE_CS_PIN GP10 + +#define CIRQUE_PINNACLE_DIAMETER_MM 40 +#define POINTING_DEVICE_ROTATION_90 +#define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X +#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE +#define CIRQUE_PINNACLE_TAP_ENABLE +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index 0e238b04f633..7f0860ee99e2 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -36,96 +36,96 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 1, "matrix": [3, 2], "x": 92, "y": 64 }, - { "flags": 4, "matrix": [2, 5], "x": 82, "y": 39 }, - { "flags": 4, "matrix": [1, 5], "x": 82, "y": 22 }, - { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 }, - { "flags": 4, "matrix": [0, 4], "x": 65, "y": 2 }, - { "flags": 4, "matrix": [1, 4], "x": 65, "y": 14 }, - { "flags": 4, "matrix": [2, 4], "x": 65, "y": 37 }, - { "flags": 1, "matrix": [3, 1], "x": 78, "y": 58 }, - { "flags": 1, "matrix": [3, 0], "x": 58, "y": 55 }, - { "flags": 4, "matrix": [2, 3], "x": 49, "y": 34 }, - { "flags": 4, "matrix": [1, 3], "x": 49, "y": 17 }, - { "flags": 4, "matrix": [0, 3], "x": 49, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 33, "y": 2 }, - { "flags": 4, "matrix": [1, 2], "x": 33, "y": 19 }, - { "flags": 4, "matrix": [2, 2], "x": 33, "y": 37 }, - { "flags": 4, "matrix": [2, 1], "x": 16, "y": 41 }, - { "flags": 4, "matrix": [1, 1], "x": 16, "y": 24 }, - { "flags": 4, "matrix": [0, 1], "x": 16, "y": 7 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 7 }, - { "flags": 1, "matrix": [1, 0], "x": 17, "y": 24 }, - { "flags": 1, "matrix": [2, 0], "x": 34, "y": 41 }, - { "flags": 1, "matrix": [7, 0], "x": 132, "y": 64 }, - { "flags": 4, "matrix": [6, 0], "x": 142, "y": 39 }, - { "flags": 4, "matrix": [5, 0], "x": 142, "y": 22 }, - { "flags": 4, "matrix": [4, 0], "x": 142, "y": 5 }, - { "flags": 4, "matrix": [4, 1], "x": 159, "y": 2 }, - { "flags": 4, "matrix": [5, 1], "x": 159, "y": 19 }, - { "flags": 4, "matrix": [6, 1], "x": 159, "y": 37 }, - { "flags": 1, "matrix": [7, 1], "x": 146, "y": 58 }, - { "flags": 1, "matrix": [7, 2], "x": 166, "y": 55 }, - { "flags": 4, "matrix": [6, 2], "x": 175, "y": 34 }, - { "flags": 4, "matrix": [5, 2], "x": 175, "y": 17 }, - { "flags": 4, "matrix": [4, 2], "x": 175, "y": 0 }, - { "flags": 4, "matrix": [4, 3], "x": 191, "y": 2 }, - { "flags": 4, "matrix": [5, 3], "x": 191, "y": 19 }, - { "flags": 4, "matrix": [6, 3], "x": 191, "y": 37 }, - { "flags": 4, "matrix": [6, 4], "x": 208, "y": 41 }, - { "flags": 4, "matrix": [5, 4], "x": 208, "y": 24 }, - { "flags": 4, "matrix": [4, 4], "x": 208, "y": 7 }, - { "flags": 1, "matrix": [4, 5], "x": 224, "y": 7 }, - { "flags": 1, "matrix": [5, 5], "x": 224, "y": 24 }, - { "flags": 1, "matrix": [6, 5], "x": 224, "y": 41 } + { "flags": 4, "matrix": [0, 5], "x": 92, "y": 64 }, + { "flags": 4, "matrix": [0, 4], "x": 82, "y": 39 }, + { "flags": 4, "matrix": [0, 3], "x": 82, "y": 22 }, + { "flags": 4, "matrix": [0, 2], "x": 82, "y": 5 }, + { "flags": 4, "matrix": [0, 1], "x": 65, "y": 2 }, + { "flags": 1, "matrix": [0, 0], "x": 65, "y": 14 }, + { "flags": 1, "matrix": [1, 0], "x": 65, "y": 37 }, + { "flags": 4, "matrix": [1, 1], "x": 78, "y": 58 }, + { "flags": 4, "matrix": [1, 2], "x": 58, "y": 55 }, + { "flags": 4, "matrix": [1, 3], "x": 49, "y": 34 }, + { "flags": 4, "matrix": [1, 4], "x": 49, "y": 17 }, + { "flags": 4, "matrix": [1, 5], "x": 49, "y": 0 }, + { "flags": 4, "matrix": [2, 5], "x": 33, "y": 2 }, + { "flags": 4, "matrix": [2, 4], "x": 33, "y": 19 }, + { "flags": 4, "matrix": [2, 3], "x": 33, "y": 37 }, + { "flags": 4, "matrix": [2, 2], "x": 16, "y": 41 }, + { "flags": 4, "matrix": [2, 1], "x": 16, "y": 24 }, + { "flags": 1, "matrix": [2, 0], "x": 16, "y": 7 }, + { "flags": 1, "matrix": [3, 3], "x": 0, "y": 7 }, + { "flags": 1, "matrix": [3, 4], "x": 17, "y": 24 }, + { "flags": 1, "matrix": [3, 5], "x": 34, "y": 41 }, + { "flags": 1, "matrix": [3, 6], "x": 132, "y": 64 }, + { "flags": 1, "matrix": [3, 7], "x": 142, "y": 39 }, + { "flags": 1, "matrix": [3, 8], "x": 142, "y": 22 }, + { "flags": 1, "matrix": [2, 11], "x": 142, "y": 5 }, + { "flags": 4, "matrix": [2, 10], "x": 159, "y": 2 }, + { "flags": 4, "matrix": [2, 9], "x": 159, "y": 19 }, + { "flags": 4, "matrix": [2, 8], "x": 159, "y": 37 }, + { "flags": 4, "matrix": [2, 7], "x": 146, "y": 58 }, + { "flags": 4, "matrix": [2, 6], "x": 166, "y": 55 }, + { "flags": 4, "matrix": [1, 6], "x": 175, "y": 34 }, + { "flags": 4, "matrix": [1, 7], "x": 175, "y": 17 }, + { "flags": 4, "matrix": [1, 8], "x": 175, "y": 0 }, + { "flags": 4, "matrix": [1, 9], "x": 191, "y": 2 }, + { "flags": 4, "matrix": [1, 10], "x": 191, "y": 19 }, + { "flags": 1, "matrix": [1, 11], "x": 191, "y": 37 }, + { "flags": 1, "matrix": [0, 11], "x": 208, "y": 41 }, + { "flags": 4, "matrix": [0, 10], "x": 208, "y": 24 }, + { "flags": 4, "matrix": [0, 9], "x": 208, "y": 7 }, + { "flags": 4, "matrix": [0, 8], "x": 224, "y": 7 }, + { "flags": 4, "matrix": [0, 7], "x": 224, "y": 24 }, + { "flags": 4, "matrix": [0, 6], "x": 224, "y": 41 } ] }, "community_layouts": ["split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0.25 }, - { "matrix": [0, 1], "x": 1, "y": 0.25 }, + { "matrix": [0, 0], "x": 0, "y": 0.4 }, + { "matrix": [0, 1], "x": 1, "y": 0.4 }, { "matrix": [0, 2], "x": 2, "y": 0.125 }, { "matrix": [0, 3], "x": 3, "y": 0 }, { "matrix": [0, 4], "x": 4, "y": 0.125 }, { "matrix": [0, 5], "x": 5, "y": 0.25 }, - { "matrix": [4, 0], "x": 8, "y": 0.25 }, - { "matrix": [4, 1], "x": 9, "y": 0.125 }, - { "matrix": [4, 2], "x": 10, "y": 0 }, - { "matrix": [4, 3], "x": 11, "y": 0.125 }, - { "matrix": [4, 4], "x": 12, "y": 0.25 }, - { "matrix": [4, 5], "x": 13, "y": 0.25 }, - { "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [0, 6], "x": 8, "y": 0.25 }, + { "matrix": [0, 7], "x": 9, "y": 0.125 }, + { "matrix": [0, 8], "x": 10, "y": 0 }, + { "matrix": [0, 9], "x": 11, "y": 0.125 }, + { "matrix": [0, 10], "x": 12, "y": 0.4 }, + { "matrix": [0, 11], "x": 13, "y": 0.4 }, + { "matrix": [1, 0], "x": 0, "y": 1.4 }, + { "matrix": [1, 1], "x": 1, "y": 1.4 }, { "matrix": [1, 2], "x": 2, "y": 1.125 }, { "matrix": [1, 3], "x": 3, "y": 1 }, { "matrix": [1, 4], "x": 4, "y": 1.125 }, { "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "matrix": [5, 0], "x": 8, "y": 1.25 }, - { "matrix": [5, 1], "x": 9, "y": 1.125 }, - { "matrix": [5, 2], "x": 10, "y": 1 }, - { "matrix": [5, 3], "x": 11, "y": 1.125 }, - { "matrix": [5, 4], "x": 12, "y": 1.25 }, - { "matrix": [5, 5], "x": 13, "y": 1.25 }, - { "matrix": [2, 0], "x": 0, "y": 2.25 }, - { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [1, 6], "x": 8, "y": 1.25 }, + { "matrix": [1, 7], "x": 9, "y": 1.125 }, + { "matrix": [1, 8], "x": 10, "y": 1 }, + { "matrix": [1, 9], "x": 11, "y": 1.125 }, + { "matrix": [1, 10], "x": 12, "y": 1.4 }, + { "matrix": [1, 11], "x": 13, "y": 1.4 }, + { "matrix": [2, 0], "x": 0, "y": 2.4 }, + { "matrix": [2, 1], "x": 1, "y": 2.4 }, { "matrix": [2, 2], "x": 2, "y": 2.125 }, { "matrix": [2, 3], "x": 3, "y": 2 }, { "matrix": [2, 4], "x": 4, "y": 2.125 }, { "matrix": [2, 5], "x": 5, "y": 2.25 }, - { "matrix": [6, 0], "x": 8, "y": 2.25 }, - { "matrix": [6, 1], "x": 9, "y": 2.125 }, - { "matrix": [6, 2], "x": 10, "y": 2 }, - { "matrix": [6, 3], "x": 11, "y": 2.125 }, - { "matrix": [6, 4], "x": 12, "y": 2.25 }, - { "matrix": [6, 5], "x": 13, "y": 2.25 }, - { "matrix": [3, 0], "x": 3.5, "y": 3.25 }, - { "matrix": [3, 1], "x": 4.5, "y": 3.5 }, - { "matrix": [3, 2], "x": 5.5, "y": 3.75, "h":1.5 }, - { "matrix": [7, 0], "x": 7.5, "y": 3.75, "h":1.5 }, - { "matrix": [7, 1], "x": 8.5, "y": 3.5 }, - { "matrix": [7, 2], "x": 9.5, "y": 3.25 } + { "matrix": [2, 6], "x": 8, "y": 2.25 }, + { "matrix": [2, 7], "x": 9, "y": 2.125 }, + { "matrix": [2, 8], "x": 10, "y": 2 }, + { "matrix": [2, 9], "x": 11, "y": 2.125 }, + { "matrix": [2, 10], "x": 12, "y": 2.4 }, + { "matrix": [2, 11], "x": 13, "y": 2.4 }, + { "matrix": [3, 3], "x": 3.5, "y": 3.25 }, + { "matrix": [3, 4], "x": 4.5, "y": 3.5 }, + { "matrix": [3, 5], "x": 5.5, "y": 3.75, "h":1.5 }, + { "matrix": [3, 6], "x": 7.5, "y": 3.75, "h":1.5 }, + { "matrix": [3, 7], "x": 8.5, "y": 3.5 }, + { "matrix": [3, 8], "x": 9.5, "y": 3.25 } ] } } diff --git a/keyboards/controllerworks/city42/keymaps/default/config.h b/keyboards/controllerworks/city42/keymaps/default/config.h new file mode 100644 index 000000000000..77da61828c1d --- /dev/null +++ b/keyboards/controllerworks/city42/keymaps/default/config.h @@ -0,0 +1,79 @@ +/* + * Copyright 2022 Kevin Gee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifdef RGB_MATRIX_ENABLE +//# define SPLIT_TRANSPORT_MIRROR +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) +// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. +# define RGB_MATRIX_HUE_STEP 8 +# define RGB_MATRIX_SAT_STEP 8 +# define RGB_MATRIX_VAL_STEP 8 +# define RGB_MATRIX_SPD_STEP 10 + +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif \ No newline at end of file diff --git a/keyboards/controllerworks/city42/keymaps/default/keymap.c b/keyboards/controllerworks/city42/keymaps/default/keymap.c new file mode 100644 index 000000000000..af9a62b40046 --- /dev/null +++ b/keyboards/controllerworks/city42/keymaps/default/keymap.c @@ -0,0 +1,68 @@ +/* + * Copyright 2022 Kevin Gee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_RALT + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_ESC, KC_ENT, MO(3), KC_RALT + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, MO(3), KC_ESC, KC_DEL, _______, KC_RALT + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ) +}; diff --git a/keyboards/controllerworks/city42/keymaps/via/config.h b/keyboards/controllerworks/city42/keymaps/via/config.h new file mode 100644 index 000000000000..08b524453dd3 --- /dev/null +++ b/keyboards/controllerworks/city42/keymaps/via/config.h @@ -0,0 +1,78 @@ +/* + * Copyright 2022 Kevin Gee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once +#ifdef RGB_MATRIX_ENABLE +// # define RGB_MATRIX_SPLIT +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) +// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. +# define RGB_MATRIX_HUE_STEP 8 +# define RGB_MATRIX_SAT_STEP 8 +# define RGB_MATRIX_VAL_STEP 8 +# define RGB_MATRIX_SPD_STEP 10 + +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif \ No newline at end of file diff --git a/keyboards/controllerworks/city42/keymaps/via/keymap.c b/keyboards/controllerworks/city42/keymaps/via/keymap.c new file mode 100644 index 000000000000..af9a62b40046 --- /dev/null +++ b/keyboards/controllerworks/city42/keymaps/via/keymap.c @@ -0,0 +1,68 @@ +/* + * Copyright 2022 Kevin Gee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_RALT + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_ESC, KC_ENT, MO(3), KC_RALT + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, MO(3), KC_ESC, KC_DEL, _______, KC_RALT + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ) +}; diff --git a/keyboards/controllerworks/city42/keymaps/via/rules.mk b/keyboards/controllerworks/city42/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/controllerworks/city42/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/controllerworks/city42/readme.md b/keyboards/controllerworks/city42/readme.md index 29eb3de1a2f0..d1cfb0965261 100644 --- a/keyboards/controllerworks/city42/readme.md +++ b/keyboards/controllerworks/city42/readme.md @@ -25,7 +25,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Features - Highly integrated design with microcontroller and USB connectors on the main board - RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory -- CNC milled aluminum case with only 8mm thickness - 42 per-key RGB LEDs - ESD and over-current protection on USB - Reset and boot tactile switches diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk index 1a3426714d7c..3b030bcca05b 100644 --- a/keyboards/controllerworks/city42/rules.mk +++ b/keyboards/controllerworks/city42/rules.mk @@ -1,4 +1,3 @@ WS2812_DRIVER = vendor - POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi \ No newline at end of file From 625f1a74236a814c8ad5896794e28f5e8647e922 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Sat, 8 Apr 2023 23:07:00 -0400 Subject: [PATCH 04/20] updating config.h with some minor changes. --- keyboards/controllerworks/city42/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 0188002c920c..f5cda253e446 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -28,8 +28,8 @@ /* Cirque trackpad over SPI. Production * #define SPI_SCK_PIN GP18 -* #define SPI_MOSI_PIN GP19 /* SPIOTX -* #define SPI_MISO_PIN GP16 /* SPIORX +* #define SPI_MOSI_PIN GP19 +* #define SPI_MISO_PIN GP16 * #define POINTING_DEVICE_CS_PIN GP17 */ @@ -41,7 +41,6 @@ #define POINTING_DEVICE_CS_PIN GP10 #define CIRQUE_PINNACLE_DIAMETER_MM 40 -#define POINTING_DEVICE_ROTATION_90 #define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE From 9618419c6c19f904c7da7f8a178a9306e55a2d7a Mon Sep 17 00:00:00 2001 From: Controller Works Date: Sat, 17 Jun 2023 23:26:52 -0400 Subject: [PATCH 05/20] LED and Key Matrix updated --- keyboards/controllerworks/city42/config.h | 20 ++--- keyboards/controllerworks/city42/info.json | 87 +++++++++++----------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index f5cda253e446..70bdacc9554e 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -26,20 +26,20 @@ #define BOOTMAGIC_LITE_COLUMN 0 /* Top right key on right half */ -/* Cirque trackpad over SPI. Production +/* Cirque trackpad over SPI. Production */ +#define SPI_SCK_PIN GP18 +#define SPI_MOSI_PIN GP19 +#define SPI_MISO_PIN GP16 +#define POINTING_DEVICE_CS_PIN GP17 + + +/* Cirque trackpad over SPI. Testing * #define SPI_SCK_PIN GP18 * #define SPI_MOSI_PIN GP19 -* #define SPI_MISO_PIN GP16 -* #define POINTING_DEVICE_CS_PIN GP17 +* #define SPI_MISO_PIN GP20 +* #define POINTING_DEVICE_CS_PIN GP10 */ - -/* Cirque trackpad over SPI. Testing*/ -#define SPI_SCK_PIN GP18 -#define SPI_MOSI_PIN GP19 -#define SPI_MISO_PIN GP20 -#define POINTING_DEVICE_CS_PIN GP10 - #define CIRQUE_PINNACLE_DIAMETER_MM 40 #define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index 7f0860ee99e2..a4fba39aeabb 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -21,8 +21,9 @@ "rows": ["GP12", "GP13", "GP14", "GP15"] }, - "rgblight": { + "ws2812": { "pin": "GP29" + "driver": "vendor" }, "features": { "bootmagic": true, @@ -36,48 +37,48 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 5], "x": 92, "y": 64 }, - { "flags": 4, "matrix": [0, 4], "x": 82, "y": 39 }, - { "flags": 4, "matrix": [0, 3], "x": 82, "y": 22 }, - { "flags": 4, "matrix": [0, 2], "x": 82, "y": 5 }, - { "flags": 4, "matrix": [0, 1], "x": 65, "y": 2 }, - { "flags": 1, "matrix": [0, 0], "x": 65, "y": 14 }, - { "flags": 1, "matrix": [1, 0], "x": 65, "y": 37 }, - { "flags": 4, "matrix": [1, 1], "x": 78, "y": 58 }, - { "flags": 4, "matrix": [1, 2], "x": 58, "y": 55 }, - { "flags": 4, "matrix": [1, 3], "x": 49, "y": 34 }, - { "flags": 4, "matrix": [1, 4], "x": 49, "y": 17 }, - { "flags": 4, "matrix": [1, 5], "x": 49, "y": 0 }, - { "flags": 4, "matrix": [2, 5], "x": 33, "y": 2 }, - { "flags": 4, "matrix": [2, 4], "x": 33, "y": 19 }, - { "flags": 4, "matrix": [2, 3], "x": 33, "y": 37 }, - { "flags": 4, "matrix": [2, 2], "x": 16, "y": 41 }, - { "flags": 4, "matrix": [2, 1], "x": 16, "y": 24 }, - { "flags": 1, "matrix": [2, 0], "x": 16, "y": 7 }, - { "flags": 1, "matrix": [3, 3], "x": 0, "y": 7 }, - { "flags": 1, "matrix": [3, 4], "x": 17, "y": 24 }, - { "flags": 1, "matrix": [3, 5], "x": 34, "y": 41 }, - { "flags": 1, "matrix": [3, 6], "x": 132, "y": 64 }, - { "flags": 1, "matrix": [3, 7], "x": 142, "y": 39 }, - { "flags": 1, "matrix": [3, 8], "x": 142, "y": 22 }, - { "flags": 1, "matrix": [2, 11], "x": 142, "y": 5 }, - { "flags": 4, "matrix": [2, 10], "x": 159, "y": 2 }, - { "flags": 4, "matrix": [2, 9], "x": 159, "y": 19 }, - { "flags": 4, "matrix": [2, 8], "x": 159, "y": 37 }, - { "flags": 4, "matrix": [2, 7], "x": 146, "y": 58 }, - { "flags": 4, "matrix": [2, 6], "x": 166, "y": 55 }, - { "flags": 4, "matrix": [1, 6], "x": 175, "y": 34 }, - { "flags": 4, "matrix": [1, 7], "x": 175, "y": 17 }, - { "flags": 4, "matrix": [1, 8], "x": 175, "y": 0 }, - { "flags": 4, "matrix": [1, 9], "x": 191, "y": 2 }, - { "flags": 4, "matrix": [1, 10], "x": 191, "y": 19 }, - { "flags": 1, "matrix": [1, 11], "x": 191, "y": 37 }, - { "flags": 1, "matrix": [0, 11], "x": 208, "y": 41 }, - { "flags": 4, "matrix": [0, 10], "x": 208, "y": 24 }, - { "flags": 4, "matrix": [0, 9], "x": 208, "y": 7 }, - { "flags": 4, "matrix": [0, 8], "x": 224, "y": 7 }, - { "flags": 4, "matrix": [0, 7], "x": 224, "y": 24 }, - { "flags": 4, "matrix": [0, 6], "x": 224, "y": 41 } + { "flags": 4, "matrix": [0, 5], "x": 80, "y": 17 }, + { "flags": 4, "matrix": [0, 4], "x": 66, "y": 11 }, + { "flags": 4, "matrix": [0, 3], "x": 52, "y": 6 }, + { "flags": 4, "matrix": [0, 2], "x": 37, "y": 4 }, + { "flags": 4, "matrix": [0, 1], "x": 22, "y": 4 }, + { "flags": 1, "matrix": [0, 0], "x": 8, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 4, "y": 13 }, + { "flags": 4, "matrix": [1, 1], "x": 18, "y": 17 }, + { "flags": 4, "matrix": [1, 2], "x": 34, "y": 17 }, + { "flags": 4, "matrix": [1, 3], "x": 49, "y": 18 }, + { "flags": 4, "matrix": [1, 4], "x": 63, "y": 24 }, + { "flags": 4, "matrix": [1, 5], "x": 76, "y": 29 }, + { "flags": 4, "matrix": [2, 5], "x": 73, "y": 43 }, + { "flags": 4, "matrix": [2, 4], "x": 59, "y": 37 }, + { "flags": 4, "matrix": [2, 3], "x": 45, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 30, "y": 30 }, + { "flags": 4, "matrix": [2, 1], "x": 15, "y": 29 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 26 }, + { "flags": 1, "matrix": [3, 3], "x": 49, "y": 50 }, + { "flags": 1, "matrix": [3, 4], "x": 66, "y": 56 }, + { "flags": 1, "matrix": [3, 5], "x": 76, "y": 64 }, + { "flags": 1, "matrix": [3, 6], "x": 148, "y": 64 }, + { "flags": 1, "matrix": [3, 7], "x": 158, "y": 56 }, + { "flags": 1, "matrix": [3, 8], "x": 175, "y": 50 }, + { "flags": 1, "matrix": [2, 11], "x": 224, "y": 26 }, + { "flags": 4, "matrix": [2, 10], "x": 209, "y": 29 }, + { "flags": 4, "matrix": [2, 9], "x": 193, "y": 29 }, + { "flags": 4, "matrix": [2, 8], "x": 179, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 165, "y": 37 }, + { "flags": 4, "matrix": [2, 6], "x": 151, "y": 43 }, + { "flags": 4, "matrix": [1, 6], "x": 148, "y": 30 }, + { "flags": 4, "matrix": [1, 7], "x": 161, "y": 24 }, + { "flags": 4, "matrix": [1, 8], "x": 175, "y": 18 }, + { "flags": 4, "matrix": [1, 9], "x": 190, "y": 17 }, + { "flags": 4, "matrix": [1, 10], "x": 206, "y": 17 }, + { "flags": 1, "matrix": [1, 11], "x": 220, "y": 13 }, + { "flags": 1, "matrix": [0, 11], "x": 217, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 202, "y": 4 }, + { "flags": 4, "matrix": [0, 9], "x": 187, "y": 4 }, + { "flags": 4, "matrix": [0, 8], "x": 172, "y": 6 }, + { "flags": 4, "matrix": [0, 7], "x": 158, "y": 11 }, + { "flags": 4, "matrix": [0, 6], "x": 144, "y": 17 } ] }, "community_layouts": ["split_3x6_3"], From 57304aa8c4394c56b0c6a08542782f5d152cd82f Mon Sep 17 00:00:00 2001 From: Controller Works Date: Tue, 4 Jul 2023 10:17:01 -0400 Subject: [PATCH 06/20] Rotate the trackpad orientation --- keyboards/controllerworks/city42/config.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 70bdacc9554e..9f8e94398a9c 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -41,7 +41,8 @@ */ #define CIRQUE_PINNACLE_DIAMETER_MM 40 -#define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X +#define CIRQUE_PINNACLE_CURVED_OVERLAY #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE +#define POINTING_DEVICE_ROTATION_180 \ No newline at end of file From d2fb2bad76702247e78fc3163df14e3247e88ee4 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Wed, 9 Aug 2023 21:56:41 -0400 Subject: [PATCH 07/20] Modifying the keymaps --- keyboards/controllerworks/city42/keymaps/default/keymap.c | 8 ++++---- keyboards/controllerworks/city42/keymaps/via/keymap.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/controllerworks/city42/keymaps/default/keymap.c b/keyboards/controllerworks/city42/keymaps/default/keymap.c index af9a62b40046..dab30547ac26 100644 --- a/keyboards/controllerworks/city42/keymaps/default/keymap.c +++ b/keyboards/controllerworks/city42/keymaps/default/keymap.c @@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LGUI, _______, KC_ESC, KC_ENT, MO(3), KC_RALT //`--------------------------' `--------------------------' @@ -58,9 +58,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT //`--------------------------' `--------------------------' diff --git a/keyboards/controllerworks/city42/keymaps/via/keymap.c b/keyboards/controllerworks/city42/keymaps/via/keymap.c index af9a62b40046..dab30547ac26 100644 --- a/keyboards/controllerworks/city42/keymaps/via/keymap.c +++ b/keyboards/controllerworks/city42/keymaps/via/keymap.c @@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LGUI, _______, KC_ESC, KC_ENT, MO(3), KC_RALT //`--------------------------' `--------------------------' @@ -58,9 +58,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT //`--------------------------' `--------------------------' From 10a354d258a66842cb4a93d23f28a1cce4c527fa Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Wed, 9 Aug 2023 23:07:51 -0400 Subject: [PATCH 08/20] Update readme.md Updated board photo --- keyboards/controllerworks/city42/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/controllerworks/city42/readme.md b/keyboards/controllerworks/city42/readme.md index d1cfb0965261..1074144a484f 100644 --- a/keyboards/controllerworks/city42/readme.md +++ b/keyboards/controllerworks/city42/readme.md @@ -1,13 +1,12 @@ # city42 -![city42](https://i.imgur.com/xrSKhqRh.png) -![city42PCB](https://i.imgur.com/R7u1KB8h.png) +![city42](https://i.imgur.com/YZNW4EZ.jpg) *A pre-built, low profile, unibody split keyboard based on the RP2040 processor* * Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works) -* Hardware Supported: *city42 split ergonomic keyboard* -* Hardware Availability: *https://controller.works/products/city42-low-profile-ergonomic-keyboard* Hardware is available as pre-built units only. +* Hardware Supported: *city42 split unibody ergonomic keyboard* +* Hardware Availability: *[Controller Works Retail Site](https://controller.works/products/city42-ergonomic-keyboard)* Hardware is available as pre-built units only. Make example for this keyboard (after setting up your build environment): @@ -25,6 +24,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Features - Highly integrated design with microcontroller and USB connectors on the main board - RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory +- 40mm Cirque trackpad - 42 per-key RGB LEDs - ESD and over-current protection on USB - Reset and boot tactile switches @@ -37,4 +37,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the upper left key while plugging in USB * **Physical reset button**: Press the RST button twice, rapidly -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From e5a649afc040b3864890f6de2776f831ac30e0a3 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Thu, 10 Aug 2023 10:55:49 -0400 Subject: [PATCH 09/20] Changed orientation of trackpad --- keyboards/controllerworks/city42/config.h | 3 +-- keyboards/controllerworks/city42/readme.md | 9 --------- keyboards/controllerworks/city42/rules.mk | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 9f8e94398a9c..8d31c38f6035 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -44,5 +44,4 @@ #define CIRQUE_PINNACLE_CURVED_OVERLAY #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE -#define POINTING_DEVICE_ROTATION_180 \ No newline at end of file +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file diff --git a/keyboards/controllerworks/city42/readme.md b/keyboards/controllerworks/city42/readme.md index 1074144a484f..184fabbf74c7 100644 --- a/keyboards/controllerworks/city42/readme.md +++ b/keyboards/controllerworks/city42/readme.md @@ -1,26 +1,19 @@ # city42 - ![city42](https://i.imgur.com/YZNW4EZ.jpg) - *A pre-built, low profile, unibody split keyboard based on the RP2040 processor* - * Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works) * Hardware Supported: *city42 split unibody ergonomic keyboard* * Hardware Availability: *[Controller Works Retail Site](https://controller.works/products/city42-ergonomic-keyboard)* Hardware is available as pre-built units only. - Make example for this keyboard (after setting up your build environment): - ```sh make controllerworks/city42:default ``` - Flashing example for this keyboard: ```sh make controllerworks/city42:default:flash ``` 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). - ## Features - Highly integrated design with microcontroller and USB connectors on the main board - RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory @@ -32,9 +25,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to - Hot swap connectors for Kailh Chocolate PG1350 switches - Chocolate key spacing (18mm horizontal x 17mm vertical) ## Bootloader - Enter the bootloader in 3 ways: - * **Bootmagic reset**: Hold down the upper left key while plugging in USB * **Physical reset button**: Press the RST button twice, rapidly * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk index 3b030bcca05b..2e0f2befbf49 100644 --- a/keyboards/controllerworks/city42/rules.mk +++ b/keyboards/controllerworks/city42/rules.mk @@ -1,3 +1,2 @@ -WS2812_DRIVER = vendor POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi \ No newline at end of file From 0466cab73c9674603487ff984e6b87fb1dcd0d37 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Thu, 10 Aug 2023 11:04:44 -0400 Subject: [PATCH 10/20] Updated license date --- keyboards/controllerworks/city42/config.h | 2 +- keyboards/controllerworks/city42/info.json | 4 ++-- keyboards/controllerworks/city42/keymaps/default/config.h | 2 +- keyboards/controllerworks/city42/keymaps/default/keymap.c | 2 +- keyboards/controllerworks/city42/keymaps/via/config.h | 2 +- keyboards/controllerworks/city42/keymaps/via/keymap.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 8d31c38f6035..8eef479356bc 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 Kevin Gee + * Copyright 2023 Kevin Gee * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index a4fba39aeabb..d53719bf8dec 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -3,7 +3,7 @@ "keyboard_name": "city42", "maintainer": "controller-works", "processor": "RP2040", - "url": "https://controller.works/products/city42-low-profile-ergonomic-keyboard", + "url": "https://controller.works/products/city42-ergonomic-keyboard", "tags": ["RP2040", "choc v1", "choc spaced" ], "usb": { "device_version": "1.0.0", @@ -22,7 +22,7 @@ ["GP12", "GP13", "GP14", "GP15"] }, "ws2812": { - "pin": "GP29" + "pin": "GP29", "driver": "vendor" }, "features": { diff --git a/keyboards/controllerworks/city42/keymaps/default/config.h b/keyboards/controllerworks/city42/keymaps/default/config.h index 77da61828c1d..77770f2c05ca 100644 --- a/keyboards/controllerworks/city42/keymaps/default/config.h +++ b/keyboards/controllerworks/city42/keymaps/default/config.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 Kevin Gee + * Copyright 2023 Kevin Gee * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/controllerworks/city42/keymaps/default/keymap.c b/keyboards/controllerworks/city42/keymaps/default/keymap.c index dab30547ac26..7f46648a7e87 100644 --- a/keyboards/controllerworks/city42/keymaps/default/keymap.c +++ b/keyboards/controllerworks/city42/keymaps/default/keymap.c @@ -1,5 +1,5 @@ /* - * Copyright 2022 Kevin Gee + * Copyright 2023 Kevin Gee * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/controllerworks/city42/keymaps/via/config.h b/keyboards/controllerworks/city42/keymaps/via/config.h index 08b524453dd3..630dd9a6082a 100644 --- a/keyboards/controllerworks/city42/keymaps/via/config.h +++ b/keyboards/controllerworks/city42/keymaps/via/config.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 Kevin Gee + * Copyright 2023 Kevin Gee * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/controllerworks/city42/keymaps/via/keymap.c b/keyboards/controllerworks/city42/keymaps/via/keymap.c index dab30547ac26..7f46648a7e87 100644 --- a/keyboards/controllerworks/city42/keymaps/via/keymap.c +++ b/keyboards/controllerworks/city42/keymaps/via/keymap.c @@ -1,5 +1,5 @@ /* - * Copyright 2022 Kevin Gee + * Copyright 2023 Kevin Gee * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From be37d0fcadfe54ce82f0b14c41b53e400b46602a Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:36:11 -0400 Subject: [PATCH 11/20] Update keyboards/controllerworks/city42/config.h Co-authored-by: Joel Challis --- keyboards/controllerworks/city42/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 8eef479356bc..650af08d5523 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -21,11 +21,6 @@ #define RGBLED_NUM 42 #define RGB_MATRIX_LED_COUNT RGBLED_NUM -/* Top left key */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -/* Top right key on right half */ - /* Cirque trackpad over SPI. Production */ #define SPI_SCK_PIN GP18 #define SPI_MOSI_PIN GP19 From b1e2d24737b48867f05046b267dc715cbc76a72d Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:36:21 -0400 Subject: [PATCH 12/20] Update keyboards/controllerworks/city42/config.h Co-authored-by: Joel Challis --- keyboards/controllerworks/city42/config.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 650af08d5523..b37809dd9e57 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -27,14 +27,6 @@ #define SPI_MISO_PIN GP16 #define POINTING_DEVICE_CS_PIN GP17 - -/* Cirque trackpad over SPI. Testing -* #define SPI_SCK_PIN GP18 -* #define SPI_MOSI_PIN GP19 -* #define SPI_MISO_PIN GP20 -* #define POINTING_DEVICE_CS_PIN GP10 -*/ - #define CIRQUE_PINNACLE_DIAMETER_MM 40 #define CIRQUE_PINNACLE_CURVED_OVERLAY #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE From a7c9daf23704c5825ef3b6445a2c5e38f5925e68 Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Thu, 10 Aug 2023 16:10:41 -0400 Subject: [PATCH 13/20] Update keyboards/controllerworks/city42/config.h Co-authored-by: Joel Challis --- keyboards/controllerworks/city42/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index b37809dd9e57..ca97b38c2cf8 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -18,8 +18,7 @@ #pragma once #define WS2812_PIO_USE_PIO1 -#define RGBLED_NUM 42 -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT 42 /* Cirque trackpad over SPI. Production */ #define SPI_SCK_PIN GP18 From d0f0b4bf16773436041790507def2c29b2c8cc19 Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Thu, 10 Aug 2023 20:09:35 -0400 Subject: [PATCH 14/20] Update keyboards/controllerworks/city42/config.h Co-authored-by: Joel Challis --- keyboards/controllerworks/city42/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index ca97b38c2cf8..bd3817215d5d 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -20,7 +20,6 @@ #define WS2812_PIO_USE_PIO1 #define RGB_MATRIX_LED_COUNT 42 -/* Cirque trackpad over SPI. Production */ #define SPI_SCK_PIN GP18 #define SPI_MOSI_PIN GP19 #define SPI_MISO_PIN GP16 From c1c660f338f91afd0b82acddfe537992b6364284 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Thu, 10 Aug 2023 22:13:09 -0400 Subject: [PATCH 15/20] Moved RGB settings out of keymaps --- keyboards/controllerworks/city42/config.h | 63 ++++++++++++++- .../city42/keymaps/default/config.h | 79 ------------------- .../city42/keymaps/via/config.h | 78 ------------------ 3 files changed, 62 insertions(+), 158 deletions(-) delete mode 100644 keyboards/controllerworks/city42/keymaps/default/config.h delete mode 100644 keyboards/controllerworks/city42/keymaps/via/config.h diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index bd3817215d5d..8b3cebf84b21 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -29,4 +29,65 @@ #define CIRQUE_PINNACLE_CURVED_OVERLAY #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE +#ifdef RGB_MATRIX_ENABLE +//# define SPLIT_TRANSPORT_MIRROR +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) +// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. +# define RGB_MATRIX_HUE_STEP 8 +# define RGB_MATRIX_SAT_STEP 8 +# define RGB_MATRIX_VAL_STEP 8 +# define RGB_MATRIX_SPD_STEP 10 + +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif \ No newline at end of file diff --git a/keyboards/controllerworks/city42/keymaps/default/config.h b/keyboards/controllerworks/city42/keymaps/default/config.h deleted file mode 100644 index 77770f2c05ca..000000000000 --- a/keyboards/controllerworks/city42/keymaps/default/config.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2023 Kevin Gee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once -#ifdef RGB_MATRIX_ENABLE -//# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -# define RGB_MATRIX_HUE_STEP 8 -# define RGB_MATRIX_SAT_STEP 8 -# define RGB_MATRIX_VAL_STEP 8 -# define RGB_MATRIX_SPD_STEP 10 - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif \ No newline at end of file diff --git a/keyboards/controllerworks/city42/keymaps/via/config.h b/keyboards/controllerworks/city42/keymaps/via/config.h deleted file mode 100644 index 630dd9a6082a..000000000000 --- a/keyboards/controllerworks/city42/keymaps/via/config.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2023 Kevin Gee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once -#ifdef RGB_MATRIX_ENABLE -// # define RGB_MATRIX_SPLIT -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -# define RGB_MATRIX_HUE_STEP 8 -# define RGB_MATRIX_SAT_STEP 8 -# define RGB_MATRIX_VAL_STEP 8 -# define RGB_MATRIX_SPD_STEP 10 - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif \ No newline at end of file From 0a71dd384c57fc7618e2f9e8c370f7ef0a7d97b8 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Thu, 10 Aug 2023 22:28:24 -0400 Subject: [PATCH 16/20] Removed RGB_MATRIX_VAL_STEP to avoid CI Build warn --- keyboards/controllerworks/city42/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 8b3cebf84b21..24e5eb34b925 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -42,7 +42,7 @@ # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. # define RGB_MATRIX_HUE_STEP 8 # define RGB_MATRIX_SAT_STEP 8 -# define RGB_MATRIX_VAL_STEP 8 +// # define RGB_MATRIX_VAL_STEP 8 # define RGB_MATRIX_SPD_STEP 10 # define ENABLE_RGB_MATRIX_ALPHAS_MODS From 12c08271fbdf0c503aa0743fd5ad838a27cd38dd Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Tue, 15 Aug 2023 21:14:45 -0400 Subject: [PATCH 17/20] Update keyboards/controllerworks/city42/readme.md Co-authored-by: Duncan Sutherland --- keyboards/controllerworks/city42/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/controllerworks/city42/readme.md b/keyboards/controllerworks/city42/readme.md index 184fabbf74c7..7dc382bffc6d 100644 --- a/keyboards/controllerworks/city42/readme.md +++ b/keyboards/controllerworks/city42/readme.md @@ -1,5 +1,5 @@ # city42 -![city42](https://i.imgur.com/YZNW4EZ.jpg) +![city42](https://i.imgur.com/YZNW4EZh.jpg) *A pre-built, low profile, unibody split keyboard based on the RP2040 processor* * Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works) * Hardware Supported: *city42 split unibody ergonomic keyboard* From 3b8ddcb14dade9803bb2dcde9ca030716829d130 Mon Sep 17 00:00:00 2001 From: Controller Works <103382872+controller-works@users.noreply.github.com> Date: Tue, 15 Aug 2023 21:15:05 -0400 Subject: [PATCH 18/20] Update keyboards/controllerworks/city42/info.json Co-authored-by: Duncan Sutherland --- keyboards/controllerworks/city42/info.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index d53719bf8dec..eace7d30b07c 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -16,10 +16,8 @@ "lto":true }, "matrix_pins": { - "cols": - ["GP28", "GP27", "GP26","GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], - "rows": - ["GP12", "GP13", "GP14", "GP15"] + "cols": ["GP28", "GP27", "GP26","GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], + "rows": ["GP12", "GP13", "GP14", "GP15"] }, "ws2812": { "pin": "GP29", From a2d6125aedb502ee38750078e4066ddb3da58e92 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Wed, 16 Aug 2023 09:29:19 -0400 Subject: [PATCH 19/20] Migrated more configs to data-driven format --- keyboards/controllerworks/city42/config.h | 63 +----- keyboards/controllerworks/city42/info.json | 239 ++++++++++++--------- 2 files changed, 135 insertions(+), 167 deletions(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 24e5eb34b925..bd3817215d5d 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -29,65 +29,4 @@ #define CIRQUE_PINNACLE_CURVED_OVERLAY #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE -#ifdef RGB_MATRIX_ENABLE -//# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -# define RGB_MATRIX_HUE_STEP 8 -# define RGB_MATRIX_SAT_STEP 8 -// # define RGB_MATRIX_VAL_STEP 8 -# define RGB_MATRIX_SPD_STEP 10 - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif \ No newline at end of file +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index eace7d30b07c..7a73ce88cb05 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -2,27 +2,11 @@ "manufacturer": "Controller Works", "keyboard_name": "city42", "maintainer": "controller-works", - "processor": "RP2040", - "url": "https://controller.works/products/city42-ergonomic-keyboard", - "tags": ["RP2040", "choc v1", "choc spaced" ], - "usb": { - "device_version": "1.0.0", - "pid": "0x0005", - "vid": "0x4357" - }, "bootloader": "rp2040", - "diode_direction": "COL2ROW", "build": { - "lto":true - }, - "matrix_pins": { - "cols": ["GP28", "GP27", "GP26","GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], - "rows": ["GP12", "GP13", "GP14", "GP15"] + "lto": true }, - "ws2812": { - "pin": "GP29", - "driver": "vendor" - }, + "diode_direction": "COL2ROW", "features": { "bootmagic": true, "command": false, @@ -32,100 +16,145 @@ "nkro": true, "rgb_matrix": true }, + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], + "rows": ["GP12", "GP13", "GP14", "GP15"] + }, + "processor": "RP2040", "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "rainbow_moving_chevron": true, + "raindrops": true, + "solid_reactive": true, + "solid_reactive_multinexus": true, + "solid_reactive_simple": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 5], "x": 80, "y": 17 }, - { "flags": 4, "matrix": [0, 4], "x": 66, "y": 11 }, - { "flags": 4, "matrix": [0, 3], "x": 52, "y": 6 }, - { "flags": 4, "matrix": [0, 2], "x": 37, "y": 4 }, - { "flags": 4, "matrix": [0, 1], "x": 22, "y": 4 }, - { "flags": 1, "matrix": [0, 0], "x": 8, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 4, "y": 13 }, - { "flags": 4, "matrix": [1, 1], "x": 18, "y": 17 }, - { "flags": 4, "matrix": [1, 2], "x": 34, "y": 17 }, - { "flags": 4, "matrix": [1, 3], "x": 49, "y": 18 }, - { "flags": 4, "matrix": [1, 4], "x": 63, "y": 24 }, - { "flags": 4, "matrix": [1, 5], "x": 76, "y": 29 }, - { "flags": 4, "matrix": [2, 5], "x": 73, "y": 43 }, - { "flags": 4, "matrix": [2, 4], "x": 59, "y": 37 }, - { "flags": 4, "matrix": [2, 3], "x": 45, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 30, "y": 30 }, - { "flags": 4, "matrix": [2, 1], "x": 15, "y": 29 }, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 26 }, - { "flags": 1, "matrix": [3, 3], "x": 49, "y": 50 }, - { "flags": 1, "matrix": [3, 4], "x": 66, "y": 56 }, - { "flags": 1, "matrix": [3, 5], "x": 76, "y": 64 }, - { "flags": 1, "matrix": [3, 6], "x": 148, "y": 64 }, - { "flags": 1, "matrix": [3, 7], "x": 158, "y": 56 }, - { "flags": 1, "matrix": [3, 8], "x": 175, "y": 50 }, - { "flags": 1, "matrix": [2, 11], "x": 224, "y": 26 }, - { "flags": 4, "matrix": [2, 10], "x": 209, "y": 29 }, - { "flags": 4, "matrix": [2, 9], "x": 193, "y": 29 }, - { "flags": 4, "matrix": [2, 8], "x": 179, "y": 32 }, - { "flags": 4, "matrix": [2, 7], "x": 165, "y": 37 }, - { "flags": 4, "matrix": [2, 6], "x": 151, "y": 43 }, - { "flags": 4, "matrix": [1, 6], "x": 148, "y": 30 }, - { "flags": 4, "matrix": [1, 7], "x": 161, "y": 24 }, - { "flags": 4, "matrix": [1, 8], "x": 175, "y": 18 }, - { "flags": 4, "matrix": [1, 9], "x": 190, "y": 17 }, - { "flags": 4, "matrix": [1, 10], "x": 206, "y": 17 }, - { "flags": 1, "matrix": [1, 11], "x": 220, "y": 13 }, - { "flags": 1, "matrix": [0, 11], "x": 217, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x": 202, "y": 4 }, - { "flags": 4, "matrix": [0, 9], "x": 187, "y": 4 }, - { "flags": 4, "matrix": [0, 8], "x": 172, "y": 6 }, - { "flags": 4, "matrix": [0, 7], "x": 158, "y": 11 }, - { "flags": 4, "matrix": [0, 6], "x": 144, "y": 17 } - ] + {"matrix": [0, 5], "x": 80, "y": 17, "flags": 4}, + {"matrix": [0, 4], "x": 66, "y": 11, "flags": 4}, + {"matrix": [0, 3], "x": 52, "y": 6, "flags": 4}, + {"matrix": [0, 2], "x": 37, "y": 4, "flags": 4}, + {"matrix": [0, 1], "x": 22, "y": 4, "flags": 4}, + {"matrix": [0, 0], "x": 8, "y": 0, "flags": 1}, + {"matrix": [1, 0], "x": 4, "y": 13, "flags": 1}, + {"matrix": [1, 1], "x": 18, "y": 17, "flags": 4}, + {"matrix": [1, 2], "x": 34, "y": 17, "flags": 4}, + {"matrix": [1, 3], "x": 49, "y": 18, "flags": 4}, + {"matrix": [1, 4], "x": 63, "y": 24, "flags": 4}, + {"matrix": [1, 5], "x": 76, "y": 29, "flags": 4}, + {"matrix": [2, 5], "x": 73, "y": 43, "flags": 4}, + {"matrix": [2, 4], "x": 59, "y": 37, "flags": 4}, + {"matrix": [2, 3], "x": 45, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 30, "y": 30, "flags": 4}, + {"matrix": [2, 1], "x": 15, "y": 29, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 1}, + {"matrix": [3, 3], "x": 49, "y": 50, "flags": 1}, + {"matrix": [3, 4], "x": 66, "y": 56, "flags": 1}, + {"matrix": [3, 5], "x": 76, "y": 64, "flags": 1}, + {"matrix": [3, 6], "x": 148, "y": 64, "flags": 1}, + {"matrix": [3, 7], "x": 158, "y": 56, "flags": 1}, + {"matrix": [3, 8], "x": 175, "y": 50, "flags": 1}, + {"matrix": [2, 11], "x": 224, "y": 26, "flags": 1}, + {"matrix": [2, 10], "x": 209, "y": 29, "flags": 4}, + {"matrix": [2, 9], "x": 193, "y": 29, "flags": 4}, + {"matrix": [2, 8], "x": 179, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 165, "y": 37, "flags": 4}, + {"matrix": [2, 6], "x": 151, "y": 43, "flags": 4}, + {"matrix": [1, 6], "x": 148, "y": 30, "flags": 4}, + {"matrix": [1, 7], "x": 161, "y": 24, "flags": 4}, + {"matrix": [1, 8], "x": 175, "y": 18, "flags": 4}, + {"matrix": [1, 9], "x": 190, "y": 17, "flags": 4}, + {"matrix": [1, 10], "x": 206, "y": 17, "flags": 4}, + {"matrix": [1, 11], "x": 220, "y": 13, "flags": 1}, + {"matrix": [0, 11], "x": 217, "y": 0, "flags": 1}, + {"matrix": [0, 10], "x": 202, "y": 4, "flags": 4}, + {"matrix": [0, 9], "x": 187, "y": 4, "flags": 4}, + {"matrix": [0, 8], "x": 172, "y": 6, "flags": 4}, + {"matrix": [0, 7], "x": 158, "y": 11, "flags": 4}, + {"matrix": [0, 6], "x": 144, "y": 17, "flags": 4} + ], + "max_brightness": 150 + }, + "tags": ["RP2040", "choc v1", "choc spaced"], + "url": "https://controller.works/products/city42-ergonomic-keyboard", + "usb": { + "device_version": "1.0.0", + "pid": "0x0005", + "vid": "0x4357" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP29" }, "community_layouts": ["split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0.4 }, - { "matrix": [0, 1], "x": 1, "y": 0.4 }, - { "matrix": [0, 2], "x": 2, "y": 0.125 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0.125 }, - { "matrix": [0, 5], "x": 5, "y": 0.25 }, - { "matrix": [0, 6], "x": 8, "y": 0.25 }, - { "matrix": [0, 7], "x": 9, "y": 0.125 }, - { "matrix": [0, 8], "x": 10, "y": 0 }, - { "matrix": [0, 9], "x": 11, "y": 0.125 }, - { "matrix": [0, 10], "x": 12, "y": 0.4 }, - { "matrix": [0, 11], "x": 13, "y": 0.4 }, - { "matrix": [1, 0], "x": 0, "y": 1.4 }, - { "matrix": [1, 1], "x": 1, "y": 1.4 }, - { "matrix": [1, 2], "x": 2, "y": 1.125 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1.125 }, - { "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "matrix": [1, 6], "x": 8, "y": 1.25 }, - { "matrix": [1, 7], "x": 9, "y": 1.125 }, - { "matrix": [1, 8], "x": 10, "y": 1 }, - { "matrix": [1, 9], "x": 11, "y": 1.125 }, - { "matrix": [1, 10], "x": 12, "y": 1.4 }, - { "matrix": [1, 11], "x": 13, "y": 1.4 }, - { "matrix": [2, 0], "x": 0, "y": 2.4 }, - { "matrix": [2, 1], "x": 1, "y": 2.4 }, - { "matrix": [2, 2], "x": 2, "y": 2.125 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2.125 }, - { "matrix": [2, 5], "x": 5, "y": 2.25 }, - { "matrix": [2, 6], "x": 8, "y": 2.25 }, - { "matrix": [2, 7], "x": 9, "y": 2.125 }, - { "matrix": [2, 8], "x": 10, "y": 2 }, - { "matrix": [2, 9], "x": 11, "y": 2.125 }, - { "matrix": [2, 10], "x": 12, "y": 2.4 }, - { "matrix": [2, 11], "x": 13, "y": 2.4 }, - { "matrix": [3, 3], "x": 3.5, "y": 3.25 }, - { "matrix": [3, 4], "x": 4.5, "y": 3.5 }, - { "matrix": [3, 5], "x": 5.5, "y": 3.75, "h":1.5 }, - { "matrix": [3, 6], "x": 7.5, "y": 3.75, "h":1.5 }, - { "matrix": [3, 7], "x": 8.5, "y": 3.5 }, - { "matrix": [3, 8], "x": 9.5, "y": 3.25 } + {"matrix": [0, 0], "x": 0, "y": 0.4}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 8, "y": 0.25}, + {"matrix": [0, 7], "x": 9, "y": 0.125}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.125}, + {"matrix": [0, 10], "x": 12, "y": 0.4}, + {"matrix": [0, 11], "x": 13, "y": 0.4}, + {"matrix": [1, 0], "x": 0, "y": 1.4}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1.125}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.125}, + {"matrix": [1, 10], "x": 12, "y": 1.4}, + {"matrix": [1, 11], "x": 13, "y": 1.4}, + {"matrix": [2, 0], "x": 0, "y": 2.4}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 8, "y": 2.25}, + {"matrix": [2, 7], "x": 9, "y": 2.125}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.125}, + {"matrix": [2, 10], "x": 12, "y": 2.4}, + {"matrix": [2, 11], "x": 13, "y": 2.4}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 1.5}, + {"matrix": [3, 6], "x": 7.5, "y": 3.75, "h": 1.5}, + {"matrix": [3, 7], "x": 8.5, "y": 3.5}, + {"matrix": [3, 8], "x": 9.5, "y": 3.25} ] - } + } } -} +} \ No newline at end of file From 1d036efb8716cda4e35424b2943696f388129120 Mon Sep 17 00:00:00 2001 From: Controller Works Date: Thu, 17 Aug 2023 22:18:32 -0400 Subject: [PATCH 20/20] Adjust Cirque sensitivity for secondary tap enable --- keyboards/controllerworks/city42/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index bd3817215d5d..4e161532f2ac 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -26,7 +26,7 @@ #define POINTING_DEVICE_CS_PIN GP17 #define CIRQUE_PINNACLE_DIAMETER_MM 40 -#define CIRQUE_PINNACLE_CURVED_OVERLAY +#define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE #define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file