Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Keyboard] Add city42 #21727

Merged
merged 26 commits into from
Aug 22, 2023
Merged

[Keyboard] Add city42 #21727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a741339
Adding city42 readme
controller-works Jan 19, 2023
8c0d3fe
Adding config.h info.json and rules.mk files
controller-works Jan 19, 2023
7c02a9d
Build to test Cirque trackpad
controller-works Jan 21, 2023
625f1a7
updating config.h with some minor changes.
controller-works Apr 9, 2023
5b1c055
Merge branch 'qmk:master' into city42
controller-works Jun 17, 2023
c880245
Merge branch 'qmk:master' into city42
controller-works Jun 18, 2023
9618419
LED and Key Matrix updated
controller-works Jun 18, 2023
6faa9ab
Merge branch 'qmk:master' into city42
controller-works Jul 4, 2023
57304aa
Rotate the trackpad orientation
controller-works Jul 4, 2023
c5dd36d
Merge branch 'qmk:master' into city42
controller-works Jul 22, 2023
c03c070
Merge branch 'qmk:master' into city42
controller-works Jul 25, 2023
4f8a49f
Merge branch 'qmk:master' into city42
controller-works Aug 10, 2023
d2fb2ba
Modifying the keymaps
controller-works Aug 10, 2023
10a354d
Update readme.md
controller-works Aug 10, 2023
e5a649a
Changed orientation of trackpad
controller-works Aug 10, 2023
0466cab
Updated license date
controller-works Aug 10, 2023
be37d0f
Update keyboards/controllerworks/city42/config.h
controller-works Aug 10, 2023
b1e2d24
Update keyboards/controllerworks/city42/config.h
controller-works Aug 10, 2023
a7c9daf
Update keyboards/controllerworks/city42/config.h
controller-works Aug 10, 2023
d0f0b4b
Update keyboards/controllerworks/city42/config.h
controller-works Aug 11, 2023
c1c660f
Moved RGB settings out of keymaps
controller-works Aug 11, 2023
0a71dd3
Removed RGB_MATRIX_VAL_STEP to avoid CI Build warn
controller-works Aug 11, 2023
12c0827
Update keyboards/controllerworks/city42/readme.md
controller-works Aug 16, 2023
3b8ddcb
Update keyboards/controllerworks/city42/info.json
controller-works Aug 16, 2023
a2d6125
Migrated more configs to data-driven format
controller-works Aug 16, 2023
1d036ef
Adjust Cirque sensitivity for secondary tap enable
controller-works Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions keyboards/controllerworks/city42/config.h
View file
Open in desktop
controller-works marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2023 Kevin Gee <info@controller.works>
*
* 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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#define WS2812_PIO_USE_PIO1
#define RGB_MATRIX_LED_COUNT 42

#define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19
#define SPI_MISO_PIN GP16
#define POINTING_DEVICE_CS_PIN GP17

#define CIRQUE_PINNACLE_DIAMETER_MM 40
#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
160 changes: 160 additions & 0 deletions keyboards/controllerworks/city42/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"manufacturer": "Controller Works",
"keyboard_name": "city42",
"maintainer": "controller-works",
"bootloader": "rp2040",
"build": {
"lto": true
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"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": [
{"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}
]
}
}
}
68 changes: 68 additions & 0 deletions keyboards/controllerworks/city42/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright 2023 Kevin Gee <info@controller.works>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#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, KC_VOLU, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, 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
//`--------------------------' `--------------------------'
),

[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, RGB_MOD, 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
//`--------------------------' `--------------------------'
)
};
68 changes: 68 additions & 0 deletions keyboards/controllerworks/city42/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright 2023 Kevin Gee <info@controller.works>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#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, KC_VOLU, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, 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
//`--------------------------' `--------------------------'
),

[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, RGB_MOD, 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
//`--------------------------' `--------------------------'
)
};
1 change: 1 addition & 0 deletions keyboards/controllerworks/city42/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
Loading