From ae05383ee92586d4771593f81bafcd3b45c56f2a Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Sat, 25 May 2024 22:44:56 -0400 Subject: [PATCH 01/20] Added a cleaned-up set of files for ThumbsUp! v9. --- .../default_4x12_v9_no_plover_via/keymap.c | 216 ++++++++++++++++++ .../default_4x12_v9_no_plover_via/readme.md | 5 + .../default_4x12_v9_no_plover_via/rules.mk | 1 + .../thumbsup/rev9_promicro_4x12/config.h | 53 +++++ .../thumbsup/rev9_promicro_4x12/info.json | 79 +++++++ .../thumbsup/rev9_promicro_4x12/readme.md | 28 +++ .../thumbsup/rev9_promicro_4x12/rules.mk | 9 + 7 files changed, 391 insertions(+) create mode 100644 keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/keymap.c create mode 100644 keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/readme.md create mode 100644 keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/rules.mk create mode 100644 keyboards/thumbsup/rev9_promicro_4x12/config.h create mode 100644 keyboards/thumbsup/rev9_promicro_4x12/info.json create mode 100644 keyboards/thumbsup/rev9_promicro_4x12/readme.md create mode 100644 keyboards/thumbsup/rev9_promicro_4x12/rules.mk diff --git a/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/keymap.c b/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/keymap.c new file mode 100644 index 000000000000..88bd9b000c81 --- /dev/null +++ b/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/keymap.c @@ -0,0 +1,216 @@ +/* Copyright 2022 + * + * 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 + + + +// Defines names for use in layer keycodes and the keymap +enum layer_names { +// The first four layers are used for the tri-layer controls, so their order is important. + _QWERTY, + _CURSORLEFT, + _CURSORRGHT, + _NUMBERS, + _NUMPAD, + _EXTRARIGHT +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + QWERTY = SAFE_RANGE, + NUMPAD, + NUMBERS +}; + +// Aliases for this command to make the thumb keys work as LOWER/RAISE on hold and as space on hit. +#define CURSORRGHT LT(_CURSORRGHT,KC_SPC) +#define CURSORLEFT LT(_CURSORLEFT,KC_SPC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + +/* Qwerty + * ,-----------------------------------------+ +-----------------------------------------. + * | Esc | Q | W | E | R | T | | Y | U | I | O | P |BSpc | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | Tab | A | S | D | F | G | | H | J | K | L | ; |Enter | +Hold: + Extra-Rt + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Ctrl | Z | X | C | V | B | | N | M | , | . | / |RCtrl | + * +------+------+------+------+------+------+ +------+------+------+------+------+------+ + . | GUI | Alt | | | | | | RAlt | Menu | . + | +------+------+ | | | | +------+------+ | +Hold: | | LSft |CursLt| |CursRt| RSft | | +Single hit: | | |Space | |Space | | | + | +------+------| |------+------+ | + +------------------------------> SPACE SPACE <-----------------------------+ + + */ +[_QWERTY] = LAYOUT_ortho_4x12( \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT , \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, \ + KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_RALT, KC_APP, KC_SPC \ +), + + + +/* + +Layers below are used on top of QWERTY layer defined above. +(Except the PLOVER/STENO layers.) + +-------+ +The keys which are shown empty, like this: | |, represent a transparent key, + +-------+ +meaning the key from the underlaying layer (i.e. QWERTY) will be used. +In the keymaps those keys are defined as "_______". + + +-------+ +-------+ +The keys which are shown solid, like this: | XXXXX | or this | ... |, represent an opaque/blocking key? + +-------+ +-------+ +Such key is not doing anything in that layer nor allowing the key from the underlaying layer +to be invoked. +In the keymaps those keys are defined as "XXXXXXX". + +Most of the modifiers are the same in all layers. +So in most layers they are defined as transparent keys, +letting the keys from QWERTY layer to do the work. + +With that idea all the layers below leave the unmodified keys as transparent keys. +In the same time - the layers block the keys that have no sense to be used +in that given layer. For instance in the cursor control layers +some of the keys are not used in the layer, but they are blocked to avoid +alpha-keys from QWERTY layer to appear. + +For the same reason the keymaps below are shown simplified, +without separate thumbcluster. + +*/ + + + +/* Cursor Control on the right (Right Space) + * ,-----------------------------------------------------------------------------------. + * | Esc |Break |WheelD|MousUp|WheelU| Del | Ins | Home | Up | End | ` | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | |SelAll|MousLt|MousDn|MousRt| ... | PgUp | Left | Down |Right | ... | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | Undo | Cut | Copy | Paste| ... | PgDn |MsBtLe|MsBtMi|MsBtRt| ... | | + * `------+------+------+------+------+------+------+------+------+------+------+------. + * | | | | | X | | | | + * `-------------------------------------------------------' + */ +[_CURSORRGHT] = LAYOUT_ortho_4x12( \ + _______, KC_BRK, KC_WH_D, KC_MS_U, KC_WH_U, KC_DEL, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_GRV, KC_DEL, \ + KC_ENT, LCTL(KC_A), KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, _______, \ + _______, LCTL(KC_Z), LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, KC_INS, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), + + + + /* Cursor Control on the left (Left Space) + * ,-----------------------------------------------------------------------------------. + * | |Break | Home | Up | End | Ins | Del |WheelU|MousUp|WheelD| ` | Del | + * |------+------+------+------+------+------+-------------+------+------+------+------| + * | Enter|SelAll|Right | Down | Left | PgUp | xxx |MousLt|MousDn|MousRt| xxx |Enter | + * |------+------+------+------+------+------+------|------+------+------+------+------| + * | | xxx |MsBtRt|MsBtMi|MsBtLe| PgDn | xxx | Cut | Copy | Paste| xxx | | + * `------+------+------+------+------+------+------+------+------+------+------+------. + * | | | | X | | | | | + * `-------------------------------------------------------' + */ +[_CURSORLEFT] = LAYOUT_ortho_4x12( \ + _______, KC_BRK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_DEL, KC_WH_U, KC_MS_U, KC_WH_D, KC_GRV, KC_DEL , \ + KC_ENT, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, _______, \ + _______, XXXXXXX, KC_BTN2, KC_BTN3, KC_BTN1, KC_INS, XXXXXXX, LCTL(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + +), + + + /* Numbers on the home row, FNs on the top row, symbols in the second row + * (Lower or Raise) + * ,-----------------------------------------------------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |BackSp| + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| Enter| +h * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | F11 | F12 | LAlt |LShift| LAlt | RAlt |RShift| , | . | / | | + * `------+------+------+------+------+------+------+------+------+------+------+------. + * | | | | | | | | | + * `-------------------------------------------------------' + */ +[_NUMBERS] = LAYOUT_ortho_4x12( \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + LT(_EXTRARIGHT,KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, \ + _______, KC_F11, KC_F12, KC_LALT, KC_LSFT, KC_LALT, KC_RALT, KC_RSFT, KC_COMM, KC_DOT, KC_SLSH, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), + +/* ExtraRightSide (the keys from the right side which did not fit into the matrix) + * ,-----------------------------------------------------------------------------------. + * | Esc |BREAK |PLOVR2|PLOVER|TxBOLT|TxBlt2| ` | = | ( | ) | - | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * |******| | | | | |PrtScr| | | | ' | | + This is the + key turning + this layer on + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | |NumPad| | | | | [ | ] | \ | | + * `------+------+------+------+------+------+------+------+------+------+------+------. + * | | | | | | | | | + * `-------------------------------------------------------' + */ +[_EXTRARIGHT] = LAYOUT_ortho_4x12( \ + _______, KC_BRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_EQL, KC_LPRN, KC_RPRN, KC_MINS, _______, \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, KC_QUOT, _______, \ + _______, XXXXXXX, XXXXXXX, TG(_NUMPAD), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + +), + +/* The right side turned into a numpad, set as default layer. + * + * ,-----------------------------------------||-----------------------------------------. + * | Esc | | | | | || / | 7 | 8 | 9 | - |BackSp| + * |------+------+------+------+------+------||------|------+------+------+------+------| + * | | | | | | || * | 4 | 5 | 6 | + |Enter | +Hold: + Extra-Rt + * |------+------+------+------+------+------||-------------+------+------+------+------| + * | Ctrl | | | | | || , | 1 | 2 | 3 | . | Ctrl | + * `------+------+------+------+------+------||------+------+------+------+------+------. + | GUI | Alt | | || | | 0 | . | + +------+------+ | || | +------+------+ +Hold: | LSft |CursLt||CursRt| RSft | +Single hit: | |Space ||Space | | + +------+------||------+------+ + */ +[_NUMPAD] = LAYOUT_ortho_4x12( \ + KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_SLASH, KC_7, KC_8, KC_9, KC_KP_MINUS, KC_BSPC, \ + LT(_EXTRARIGHT,KC_TAB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_PENT, \ + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_1, KC_2, KC_3, KC_DOT, KC_RCTL, \ + KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_0, KC_DOT, KC_SPC \ +) +}; + + + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state (state, _CURSORRGHT, _CURSORLEFT, _NUMBERS); +}; diff --git a/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/readme.md b/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/readme.md new file mode 100644 index 000000000000..97b7c1a62bb2 --- /dev/null +++ b/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/readme.md @@ -0,0 +1,5 @@ +# The default keymap for ThumbsUp! v9 + +Three key thumb cluster. +Toggled numbpad layer. +No Plover support. diff --git a/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/rules.mk b/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/thumbsup/rev9_promicro_4x12/config.h b/keyboards/thumbsup/rev9_promicro_4x12/config.h new file mode 100644 index 000000000000..bcb23ffafede --- /dev/null +++ b/keyboards/thumbsup/rev9_promicro_4x12/config.h @@ -0,0 +1,53 @@ +/* +Copyright 2024 Alexander (Sasha) Karmanov (ak66666) + +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 + + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +//The number of layers for VIA/REMAP +#define DYNAMIC_KEYMAP_LAYER_COUNT 6 + +//This disables the auto-repeat for the double-action keys (e.g. S+LAlt) +#define QUICK_TAP_TERM 0 + +//This defines mousekey speed, a bit slower than by default +#define MOUSEKEY_DELAY 150 //200 +#define MOUSEKEY_INTERVAL 60 //50 +#define MOUSEKEY_MAX_SPEED 5 //10 +#define MOUSEKEY_TIME_TO_MAX 7 //20 +#define MOUSEKEY_WHEEL_MAX_SPEED 5 //8 +#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 + + +//Cirque ProGlide Touchpad configuration +#define POINTING_DEVICE_ROTATION_90 +#define CIRQUE_PINNACLE_TAP_ENABLE +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE +#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE + +//#define CIRQUE_PINNACLE_ATTENUATION ADC_ATTENUATE_2X +//#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE +#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE + +//#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE +//#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE +//#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE + diff --git a/keyboards/thumbsup/rev9_promicro_4x12/info.json b/keyboards/thumbsup/rev9_promicro_4x12/info.json new file mode 100644 index 000000000000..2fe5be4ec89b --- /dev/null +++ b/keyboards/thumbsup/rev9_promicro_4x12/info.json @@ -0,0 +1,79 @@ +{ + "manufacturer": "Alexander (Sasha) Karmanov", + "keyboard_name": "ThumbsUp! v9", + "maintainer": "u/ak66666", + "bootloader": "caterina", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false, + "steno": false + }, + "matrix_pins": { + "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "B3", "F4", "F5", "F6", "F7", "B1"], + "rows": ["D3", "D2", "D4", "C6"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0090", + "vid": "0x5361" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "BKSPC", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "TAB", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": ";", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "ENTER", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "LCTRL", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "RCTRL", "matrix": [2, 11], "x": 11, "y": 2}, + {"label": "SPACE", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "WIN", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "LALT", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "LSHIFT", "matrix": [3, 5], "x": 4, "y": 3}, + {"label": "RAISE", "matrix": [3, 4], "x": 5, "y": 3}, + {"label": "LOWER", "matrix": [3, 7], "x": 6, "y": 3}, + {"label": "RSHIFT", "matrix": [3, 6], "x": 7, "y": 3}, + {"label": "RALT", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": "MENU", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "SPACE", "matrix": [3, 10], "x": 10, "y": 3} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/thumbsup/rev9_promicro_4x12/readme.md b/keyboards/thumbsup/rev9_promicro_4x12/readme.md new file mode 100644 index 000000000000..ca0c5918569b --- /dev/null +++ b/keyboards/thumbsup/rev9_promicro_4x12/readme.md @@ -0,0 +1,28 @@ +# ThumbsUp! v9 + +![ThumbsUp! v9](https://imgur.com/a/B93pDJF) + +A yet another version of the ThumbsUp! keyboard, a three-level PCB-based keyboard supporting Kailh Choc (1350) switches. +This v9 version got 4x12 key layout with 2- or 3-key thumbcluster and an optional touchpad. + + +* Keyboard Maintainer: [Alexander (Sasha) Karmanov](https://github.com/ak66666) +* Hardware Supported: AtMega32u4 ProMicro-compatibles +* Hardware Availability: https://www.etsy.com/ca/listing/1641077896/thumbsup-v9-ergonomic-mechanical + +Make example for this keyboard (after setting up your build environment): + + make thumbsup/rev9_promicro_4x12:default_4x12_v9_no_plover_via + +Flashing example for this keyboard: + + make %KEYBOARD%:default:flash + make thumbsup/rev9_promicro_4x12:default_4x12_v9_no_plover_via: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). + +## Bootloader + +Enter the bootloader: + +* **Physical reset button**: Press twice the button on the bottom side of the middle PCB. diff --git a/keyboards/thumbsup/rev9_promicro_4x12/rules.mk b/keyboards/thumbsup/rev9_promicro_4x12/rules.mk new file mode 100644 index 000000000000..94bdd0194af6 --- /dev/null +++ b/keyboards/thumbsup/rev9_promicro_4x12/rules.mk @@ -0,0 +1,9 @@ + + +# Enable Pinnacle Cirque 40mm touchpad +POINTING_DEVICE_ENABLE = yes +POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c + +CIRQUE_PINNACLE_ATTENUATION = EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X + +TRI_LAYER_ENABLE = yes \ No newline at end of file From 1535d21bbeccdd053d7e248b55d5f993dc24e6db Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Sat, 25 May 2024 23:25:41 -0400 Subject: [PATCH 02/20] Renamed the keymap for v9 as default --- .../{default_4x12_v9_no_plover_via => default}/keymap.c | 0 .../{default_4x12_v9_no_plover_via => default}/readme.md | 0 .../{default_4x12_v9_no_plover_via => default}/rules.mk | 0 keyboards/thumbsup/rev9_promicro_4x12/readme.md | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename keyboards/thumbsup/keymaps/{default_4x12_v9_no_plover_via => default}/keymap.c (100%) rename keyboards/thumbsup/keymaps/{default_4x12_v9_no_plover_via => default}/readme.md (100%) rename keyboards/thumbsup/keymaps/{default_4x12_v9_no_plover_via => default}/rules.mk (100%) diff --git a/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c similarity index 100% rename from keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/keymap.c rename to keyboards/thumbsup/keymaps/default/keymap.c diff --git a/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/readme.md b/keyboards/thumbsup/keymaps/default/readme.md similarity index 100% rename from keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/readme.md rename to keyboards/thumbsup/keymaps/default/readme.md diff --git a/keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/rules.mk b/keyboards/thumbsup/keymaps/default/rules.mk similarity index 100% rename from keyboards/thumbsup/keymaps/default_4x12_v9_no_plover_via/rules.mk rename to keyboards/thumbsup/keymaps/default/rules.mk diff --git a/keyboards/thumbsup/rev9_promicro_4x12/readme.md b/keyboards/thumbsup/rev9_promicro_4x12/readme.md index ca0c5918569b..0d71c1d9a555 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/readme.md +++ b/keyboards/thumbsup/rev9_promicro_4x12/readme.md @@ -12,12 +12,12 @@ This v9 version got 4x12 key layout with 2- or 3-key thumbcluster and an optiona Make example for this keyboard (after setting up your build environment): - make thumbsup/rev9_promicro_4x12:default_4x12_v9_no_plover_via + make thumbsup/rev9_promicro_4x12:default Flashing example for this keyboard: make %KEYBOARD%:default:flash - make thumbsup/rev9_promicro_4x12:default_4x12_v9_no_plover_via:flash + make thumbsup/rev9_promicro_4x12: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). From 1a4db316caa9ffbd0987d7a3a25f6d212aef38a0 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:24:46 -0400 Subject: [PATCH 03/20] Update keyboards/thumbsup/keymaps/default/keymap.c As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/keymaps/default/keymap.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 88bd9b000c81..c38d131ca1d6 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -28,13 +28,6 @@ enum layer_names { _EXTRARIGHT }; -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NUMPAD, - NUMBERS -}; - // Aliases for this command to make the thumb keys work as LOWER/RAISE on hold and as space on hit. #define CURSORRGHT LT(_CURSORRGHT,KC_SPC) #define CURSORLEFT LT(_CURSORLEFT,KC_SPC) From 4bb076e3b7c4004ef0b3df3c9deda0fb289b1c8c Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:25:18 -0400 Subject: [PATCH 04/20] Update keyboards/thumbsup/keymaps/default/keymap.c As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index c38d131ca1d6..7c4b9142b936 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -53,11 +53,11 @@ Single hit: | | |Space | |Space | | | +------------------------------> SPACE SPACE <-----------------------------+ */ -[_QWERTY] = LAYOUT_ortho_4x12( \ - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT , \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, \ - KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_RALT, KC_APP, KC_SPC \ +[_QWERTY] = LAYOUT_ortho_4x12( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_RALT, KC_APP, KC_SPC ), From b023dbd3ac1395da6f0d2090db33edb9d3cce04c Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:25:31 -0400 Subject: [PATCH 05/20] Update keyboards/thumbsup/keymaps/default/keymap.c As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 7c4b9142b936..db0f6cb64cf6 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -107,11 +107,11 @@ without separate thumbcluster. * | | | | | X | | | | * `-------------------------------------------------------' */ -[_CURSORRGHT] = LAYOUT_ortho_4x12( \ - _______, KC_BRK, KC_WH_D, KC_MS_U, KC_WH_U, KC_DEL, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_GRV, KC_DEL, \ - KC_ENT, LCTL(KC_A), KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, _______, \ - _______, LCTL(KC_Z), LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, KC_INS, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +[_CURSORRGHT] = LAYOUT_ortho_4x12( + _______, KC_BRK, KC_WH_D, KC_MS_U, KC_WH_U, KC_DEL, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_GRV, KC_DEL, + KC_ENT, LCTL(KC_A), KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, _______, + _______, LCTL(KC_Z), LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, KC_INS, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), From d525cdf067d3f5188c5492d233e3d863d15a88e2 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:25:47 -0400 Subject: [PATCH 06/20] Update keyboards/thumbsup/keymaps/default/keymap.c As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/keymaps/default/keymap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index db0f6cb64cf6..09a0da4577c0 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -127,12 +127,11 @@ without separate thumbcluster. * | | | | X | | | | | * `-------------------------------------------------------' */ -[_CURSORLEFT] = LAYOUT_ortho_4x12( \ - _______, KC_BRK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_DEL, KC_WH_U, KC_MS_U, KC_WH_D, KC_GRV, KC_DEL , \ - KC_ENT, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, _______, \ - _______, XXXXXXX, KC_BTN2, KC_BTN3, KC_BTN1, KC_INS, XXXXXXX, LCTL(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - +[_CURSORLEFT] = LAYOUT_ortho_4x12( + _______, KC_BRK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_DEL, KC_WH_U, KC_MS_U, KC_WH_D, KC_GRV, KC_DEL, + KC_ENT, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, _______, + _______, XXXXXXX, KC_BTN2, KC_BTN3, KC_BTN1, KC_INS, XXXXXXX, LCTL(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), From 172a9b3c3d1772bcafefe02e9b6d7d9dcc915975 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:26:09 -0400 Subject: [PATCH 07/20] Update keyboards/thumbsup/keymaps/default/keymap.c As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 09a0da4577c0..525abfec16ae 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -147,11 +147,11 @@ h * |------+------+------+------+------+-------------+------+------+------+----- * | | | | | | | | | * `-------------------------------------------------------' */ -[_NUMBERS] = LAYOUT_ortho_4x12( \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ - LT(_EXTRARIGHT,KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, \ - _______, KC_F11, KC_F12, KC_LALT, KC_LSFT, KC_LALT, KC_RALT, KC_RSFT, KC_COMM, KC_DOT, KC_SLSH, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +[_NUMBERS] = LAYOUT_ortho_4x12( + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + LT(_EXTRARIGHT,KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_F11, KC_F12, KC_LALT, KC_LSFT, KC_LALT, KC_RALT, KC_RSFT, KC_COMM, KC_DOT, KC_SLSH, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* ExtraRightSide (the keys from the right side which did not fit into the matrix) From 233538ed76343e86ed216ad41cc3bd71b643d165 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:29:33 -0400 Subject: [PATCH 08/20] Update keyboards/thumbsup/rev9_promicro_4x12/info.json As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/rev9_promicro_4x12/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/thumbsup/rev9_promicro_4x12/info.json b/keyboards/thumbsup/rev9_promicro_4x12/info.json index 2fe5be4ec89b..a58fc1cec8ab 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/info.json +++ b/keyboards/thumbsup/rev9_promicro_4x12/info.json @@ -25,7 +25,7 @@ "vid": "0x5361" }, "layouts": { - "LAYOUT_ortho_4x12": { + "LAYOUT": { "layout": [ {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, From 71e737e09500feec2d8094598bef8156a33c70af Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:29:43 -0400 Subject: [PATCH 09/20] Update keyboards/thumbsup/rev9_promicro_4x12/readme.md As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/rev9_promicro_4x12/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/thumbsup/rev9_promicro_4x12/readme.md b/keyboards/thumbsup/rev9_promicro_4x12/readme.md index 0d71c1d9a555..1394e6b8244c 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/readme.md +++ b/keyboards/thumbsup/rev9_promicro_4x12/readme.md @@ -1,6 +1,6 @@ # ThumbsUp! v9 -![ThumbsUp! v9](https://imgur.com/a/B93pDJF) +![ThumbsUp! v9](https://i.imgur.com/Zqc6dpQ.jpeg) A yet another version of the ThumbsUp! keyboard, a three-level PCB-based keyboard supporting Kailh Choc (1350) switches. This v9 version got 4x12 key layout with 2- or 3-key thumbcluster and an optional touchpad. From a139c5542ace940e3555aefa68b65b2e219b128e Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:30:05 -0400 Subject: [PATCH 10/20] Update keyboards/thumbsup/rev9_promicro_4x12/readme.md As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/rev9_promicro_4x12/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/thumbsup/rev9_promicro_4x12/readme.md b/keyboards/thumbsup/rev9_promicro_4x12/readme.md index 1394e6b8244c..e74da5cec8f9 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/readme.md +++ b/keyboards/thumbsup/rev9_promicro_4x12/readme.md @@ -16,7 +16,6 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - make %KEYBOARD%:default:flash make thumbsup/rev9_promicro_4x12: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). From 5d648817896831e56e546bc9dd923db817290b63 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:30:49 -0400 Subject: [PATCH 11/20] Update keyboards/thumbsup/rev9_promicro_4x12/rules.mk As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/rev9_promicro_4x12/rules.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/thumbsup/rev9_promicro_4x12/rules.mk b/keyboards/thumbsup/rev9_promicro_4x12/rules.mk index 94bdd0194af6..9bfd1498a339 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/rules.mk +++ b/keyboards/thumbsup/rev9_promicro_4x12/rules.mk @@ -1,9 +1 @@ - - -# Enable Pinnacle Cirque 40mm touchpad -POINTING_DEVICE_ENABLE = yes -POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c - -CIRQUE_PINNACLE_ATTENUATION = EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X - -TRI_LAYER_ENABLE = yes \ No newline at end of file +POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c \ No newline at end of file From 4b5318af9fef2d295c83dfba1725332dc385d677 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:31:00 -0400 Subject: [PATCH 12/20] Update keyboards/thumbsup/rev9_promicro_4x12/info.json As per PR review suggestions. Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/rev9_promicro_4x12/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/thumbsup/rev9_promicro_4x12/info.json b/keyboards/thumbsup/rev9_promicro_4x12/info.json index a58fc1cec8ab..8178f5471bba 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/info.json +++ b/keyboards/thumbsup/rev9_promicro_4x12/info.json @@ -13,6 +13,9 @@ "nkro": false, "steno": false }, + "dynamic_keymap": { + "layer_count": 6 + }, "matrix_pins": { "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "B3", "F4", "F5", "F6", "F7", "B1"], "rows": ["D3", "D2", "D4", "C6"] From 613bb3b3c0578a5475f9d5d037067a0f25cc50fb Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:33:12 -0400 Subject: [PATCH 13/20] Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/thumbsup/keymaps/default/keymap.c | 27 +++++++------------ keyboards/thumbsup/keymaps/default/rules.mk | 2 +- .../thumbsup/rev9_promicro_4x12/config.h | 22 --------------- .../thumbsup/rev9_promicro_4x12/info.json | 13 +++------ 4 files changed, 15 insertions(+), 49 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 525abfec16ae..5acc03f79971 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -168,12 +168,11 @@ h * |------+------+------+------+------+-------------+------+------+------+----- * | | | | | | | | | * `-------------------------------------------------------' */ -[_EXTRARIGHT] = LAYOUT_ortho_4x12( \ - _______, KC_BRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_EQL, KC_LPRN, KC_RPRN, KC_MINS, _______, \ - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, KC_QUOT, _______, \ - _______, XXXXXXX, XXXXXXX, TG(_NUMPAD), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - +[_EXTRARIGHT] = LAYOUT_ortho_4x12( + _______, KC_BRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_EQL, KC_LPRN, KC_RPRN, KC_MINS, _______, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, KC_QUOT, _______, + _______, XXXXXXX, XXXXXXX, TG(_NUMPAD), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* The right side turned into a numpad, set as default layer. @@ -193,16 +192,10 @@ Hold: | LSft |CursLt||CursRt| RSft | Single hit: | |Space ||Space | | +------+------||------+------+ */ -[_NUMPAD] = LAYOUT_ortho_4x12( \ - KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_SLASH, KC_7, KC_8, KC_9, KC_KP_MINUS, KC_BSPC, \ - LT(_EXTRARIGHT,KC_TAB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_PENT, \ - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_1, KC_2, KC_3, KC_DOT, KC_RCTL, \ - KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_0, KC_DOT, KC_SPC \ +[_NUMPAD] = LAYOUT_ortho_4x12( + KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_SLASH, KC_7, KC_8, KC_9, KC_KP_MINUS, KC_BSPC, + LT(_EXTRARIGHT,KC_TAB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_PENT, + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_1, KC_2, KC_3, KC_DOT, KC_RCTL, + KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_0, KC_DOT, KC_SPC ) }; - - - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state (state, _CURSORRGHT, _CURSORLEFT, _NUMBERS); -}; diff --git a/keyboards/thumbsup/keymaps/default/rules.mk b/keyboards/thumbsup/keymaps/default/rules.mk index 1e5b99807cb7..7c9bf212a6f5 100644 --- a/keyboards/thumbsup/keymaps/default/rules.mk +++ b/keyboards/thumbsup/keymaps/default/rules.mk @@ -1 +1 @@ -VIA_ENABLE = yes +TRI_LAYER_ENABLE = yes diff --git a/keyboards/thumbsup/rev9_promicro_4x12/config.h b/keyboards/thumbsup/rev9_promicro_4x12/config.h index bcb23ffafede..d9353884810b 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/config.h +++ b/keyboards/thumbsup/rev9_promicro_4x12/config.h @@ -18,24 +18,9 @@ along with this program. If not, see . #pragma once - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -//The number of layers for VIA/REMAP -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - //This disables the auto-repeat for the double-action keys (e.g. S+LAlt) #define QUICK_TAP_TERM 0 -//This defines mousekey speed, a bit slower than by default -#define MOUSEKEY_DELAY 150 //200 -#define MOUSEKEY_INTERVAL 60 //50 -#define MOUSEKEY_MAX_SPEED 5 //10 -#define MOUSEKEY_TIME_TO_MAX 7 //20 -#define MOUSEKEY_WHEEL_MAX_SPEED 5 //8 -#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 - //Cirque ProGlide Touchpad configuration #define POINTING_DEVICE_ROTATION_90 @@ -43,11 +28,4 @@ along with this program. If not, see . #define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE -//#define CIRQUE_PINNACLE_ATTENUATION ADC_ATTENUATE_2X -//#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE - -//#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE -//#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE -//#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE - diff --git a/keyboards/thumbsup/rev9_promicro_4x12/info.json b/keyboards/thumbsup/rev9_promicro_4x12/info.json index 8178f5471bba..95fa6664b244 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/info.json +++ b/keyboards/thumbsup/rev9_promicro_4x12/info.json @@ -2,16 +2,13 @@ "manufacturer": "Alexander (Sasha) Karmanov", "keyboard_name": "ThumbsUp! v9", "maintainer": "u/ak66666", - "bootloader": "caterina", + "development_board": "promicro", "diode_direction": "COL2ROW", "features": { - "bootmagic": false, - "command": false, - "console": false, - "extrakey": false, + "bootmagic": true, + "extrakey": true, "mousekey": true, - "nkro": false, - "steno": false + "pointing_device": true }, "dynamic_keymap": { "layer_count": 6 @@ -20,8 +17,6 @@ "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "B3", "F4", "F5", "F6", "F7", "B1"], "rows": ["D3", "D2", "D4", "C6"] }, - "processor": "atmega32u4", - "url": "", "usb": { "device_version": "1.0.0", "pid": "0x0090", From a4beac2ed154edbcafe96749792f18972003a4f5 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:35:35 -0400 Subject: [PATCH 14/20] Delete keyboards/thumbsup/keymaps/default/readme.md as per review recommendation. --- keyboards/thumbsup/keymaps/default/readme.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 keyboards/thumbsup/keymaps/default/readme.md diff --git a/keyboards/thumbsup/keymaps/default/readme.md b/keyboards/thumbsup/keymaps/default/readme.md deleted file mode 100644 index 97b7c1a62bb2..000000000000 --- a/keyboards/thumbsup/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The default keymap for ThumbsUp! v9 - -Three key thumb cluster. -Toggled numbpad layer. -No Plover support. From 637daa931e889c30ab6460b1270a77444113024e Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Tue, 28 May 2024 15:49:55 -0400 Subject: [PATCH 15/20] v9: Fixed the layout name in keymap.c file. --- keyboards/thumbsup/keymaps/default/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 5acc03f79971..ccd9312684ed 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -53,7 +53,7 @@ Single hit: | | |Space | |Space | | | +------------------------------> SPACE SPACE <-----------------------------+ */ -[_QWERTY] = LAYOUT_ortho_4x12( +[_QWERTY] = LAYOUT( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, @@ -107,7 +107,7 @@ without separate thumbcluster. * | | | | | X | | | | * `-------------------------------------------------------' */ -[_CURSORRGHT] = LAYOUT_ortho_4x12( +[_CURSORRGHT] = LAYOUT( _______, KC_BRK, KC_WH_D, KC_MS_U, KC_WH_U, KC_DEL, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_GRV, KC_DEL, KC_ENT, LCTL(KC_A), KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, _______, _______, LCTL(KC_Z), LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, KC_INS, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, _______, @@ -127,7 +127,7 @@ without separate thumbcluster. * | | | | X | | | | | * `-------------------------------------------------------' */ -[_CURSORLEFT] = LAYOUT_ortho_4x12( +[_CURSORLEFT] = LAYOUT( _______, KC_BRK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_DEL, KC_WH_U, KC_MS_U, KC_WH_D, KC_GRV, KC_DEL, KC_ENT, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, _______, _______, XXXXXXX, KC_BTN2, KC_BTN3, KC_BTN1, KC_INS, XXXXXXX, LCTL(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, _______, @@ -147,7 +147,7 @@ h * |------+------+------+------+------+-------------+------+------+------+----- * | | | | | | | | | * `-------------------------------------------------------' */ -[_NUMBERS] = LAYOUT_ortho_4x12( +[_NUMBERS] = LAYOUT( _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, LT(_EXTRARIGHT,KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_F11, KC_F12, KC_LALT, KC_LSFT, KC_LALT, KC_RALT, KC_RSFT, KC_COMM, KC_DOT, KC_SLSH, _______, @@ -168,7 +168,7 @@ h * |------+------+------+------+------+-------------+------+------+------+----- * | | | | | | | | | * `-------------------------------------------------------' */ -[_EXTRARIGHT] = LAYOUT_ortho_4x12( +[_EXTRARIGHT] = LAYOUT( _______, KC_BRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_EQL, KC_LPRN, KC_RPRN, KC_MINS, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, KC_QUOT, _______, _______, XXXXXXX, XXXXXXX, TG(_NUMPAD), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______, @@ -192,7 +192,7 @@ Hold: | LSft |CursLt||CursRt| RSft | Single hit: | |Space ||Space | | +------+------||------+------+ */ -[_NUMPAD] = LAYOUT_ortho_4x12( +[_NUMPAD] = LAYOUT( KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_SLASH, KC_7, KC_8, KC_9, KC_KP_MINUS, KC_BSPC, LT(_EXTRARIGHT,KC_TAB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_PENT, KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_1, KC_2, KC_3, KC_DOT, KC_RCTL, From 3dfd5002d5f5c27e875d56cdc67194980ea0dbaa Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Wed, 29 May 2024 11:26:54 -0400 Subject: [PATCH 16/20] v9: PR recommendatios applied - rules.mk file removed, info.json renamed to keyboard.json. --- keyboards/thumbsup/keymaps/default/rules.mk | 1 - keyboards/thumbsup/rev9_promicro_4x12/config.h | 3 --- .../thumbsup/rev9_promicro_4x12/{info.json => keyboard.json} | 0 3 files changed, 4 deletions(-) delete mode 100644 keyboards/thumbsup/keymaps/default/rules.mk rename keyboards/thumbsup/rev9_promicro_4x12/{info.json => keyboard.json} (100%) diff --git a/keyboards/thumbsup/keymaps/default/rules.mk b/keyboards/thumbsup/keymaps/default/rules.mk deleted file mode 100644 index 7c9bf212a6f5..000000000000 --- a/keyboards/thumbsup/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -TRI_LAYER_ENABLE = yes diff --git a/keyboards/thumbsup/rev9_promicro_4x12/config.h b/keyboards/thumbsup/rev9_promicro_4x12/config.h index d9353884810b..71300e008d0e 100644 --- a/keyboards/thumbsup/rev9_promicro_4x12/config.h +++ b/keyboards/thumbsup/rev9_promicro_4x12/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -//This disables the auto-repeat for the double-action keys (e.g. S+LAlt) -#define QUICK_TAP_TERM 0 - //Cirque ProGlide Touchpad configuration #define POINTING_DEVICE_ROTATION_90 diff --git a/keyboards/thumbsup/rev9_promicro_4x12/info.json b/keyboards/thumbsup/rev9_promicro_4x12/keyboard.json similarity index 100% rename from keyboards/thumbsup/rev9_promicro_4x12/info.json rename to keyboards/thumbsup/rev9_promicro_4x12/keyboard.json From d7cb44f8f9514681456d5538187cb7da43d3ff41 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Wed, 29 May 2024 17:19:50 -0400 Subject: [PATCH 17/20] v9: PR recommendatios applied - rules.mk file removed, info.json renamed to keyboard.json. --- keyboards/thumbsup/keymaps/default/keymap.c | 48 ++++++--------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index ccd9312684ed..fc75dfffd29b 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2022 + /* Copyright 2022 * * 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 @@ -19,18 +19,16 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { -// The first four layers are used for the tri-layer controls, so their order is important. _QWERTY, _CURSORLEFT, _CURSORRGHT, _NUMBERS, - _NUMPAD, _EXTRARIGHT }; // Aliases for this command to make the thumb keys work as LOWER/RAISE on hold and as space on hit. -#define CURSORRGHT LT(_CURSORRGHT,KC_SPC) -#define CURSORLEFT LT(_CURSORLEFT,KC_SPC) +//#define CURSORRGHT LT(_CURSORRGHT,KC_SPC) +//#define CURSORLEFT LT(_CURSORLEFT,KC_SPC) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -57,11 +55,10 @@ Single hit: | | |Space | |Space | | | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, - KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_RALT, KC_APP, KC_SPC + KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, LT(_CURSORLEFT,KC_SPC), LT(_CURSORRGHT,KC_SPC), KC_RSFT, KC_RALT, KC_APP, KC_SPC ), - /* Layers below are used on top of QWERTY layer defined above. @@ -124,7 +121,7 @@ without separate thumbcluster. * |------+------+------+------+------+------+------|------+------+------+------+------| * | | xxx |MsBtRt|MsBtMi|MsBtLe| PgDn | xxx | Cut | Copy | Paste| xxx | | * `------+------+------+------+------+------+------+------+------+------+------+------. - * | | | | X | | | | | + * | | | | X | | | | | * `-------------------------------------------------------' */ [_CURSORLEFT] = LAYOUT( @@ -141,7 +138,7 @@ without separate thumbcluster. * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |BackSp| * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| Enter| -h * |------+------+------+------+------+-------------+------+------+------+------+------| + * |------+------+------+------+------+-------------+------+------+------+------+------| * | | F11 | F12 | LAlt |LShift| LAlt | RAlt |RShift| , | . | / | | * `------+------+------+------+------+------+------+------+------+------+------+------. * | | | | | | | | | @@ -163,7 +160,7 @@ h * |------+------+------+------+------+-------------+------+------+------+----- key turning this layer on * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | |NumPad| | | | | [ | ] | \ | | + * | | | |NumPad|Qwerty| | | | [ | ] | \ | | * `------+------+------+------+------+------+------+------+------+------+------+------. * | | | | | | | | | * `-------------------------------------------------------' @@ -171,31 +168,12 @@ h * |------+------+------+------+------+-------------+------+------+------+----- [_EXTRARIGHT] = LAYOUT( _______, KC_BRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_EQL, KC_LPRN, KC_RPRN, KC_MINS, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, KC_QUOT, _______, - _______, XXXXXXX, XXXXXXX, TG(_NUMPAD), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - -/* The right side turned into a numpad, set as default layer. - * - * ,-----------------------------------------||-----------------------------------------. - * | Esc | | | | | || / | 7 | 8 | 9 | - |BackSp| - * |------+------+------+------+------+------||------|------+------+------+------+------| - * | | | | | | || * | 4 | 5 | 6 | + |Enter | -Hold: - Extra-Rt - * |------+------+------+------+------+------||-------------+------+------+------+------| - * | Ctrl | | | | | || , | 1 | 2 | 3 | . | Ctrl | - * `------+------+------+------+------+------||------+------+------+------+------+------. - | GUI | Alt | | || | | 0 | . | - +------+------+ | || | +------+------+ -Hold: | LSft |CursLt||CursRt| RSft | -Single hit: | |Space ||Space | | - +------+------||------+------+ - */ -[_NUMPAD] = LAYOUT( - KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_SLASH, KC_7, KC_8, KC_9, KC_KP_MINUS, KC_BSPC, - LT(_EXTRARIGHT,KC_TAB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_PENT, - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_1, KC_2, KC_3, KC_DOT, KC_RCTL, - KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, CURSORLEFT, CURSORRGHT, KC_RSFT, KC_0, KC_DOT, KC_SPC ) }; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _CURSORLEFT, _CURSORRGHT, _NUMBERS); +} + \ No newline at end of file From 1a7dee8a7850a006ac7bf0532f21ea63fa6ed870 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Wed, 29 May 2024 17:29:29 -0400 Subject: [PATCH 18/20] v9: Fixed the copyright header modified by mistake. --- keyboards/thumbsup/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index fc75dfffd29b..30ec51e35a15 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -1,4 +1,4 @@ - /* Copyright 2022 + /* Copyright 2022 Alexander (Sasha) Karmanov * * 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 4ec8592f96f8caaf3f497a2b186a857f9242de95 Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Wed, 29 May 2024 22:25:07 -0400 Subject: [PATCH 19/20] v9: Fixed the tri-layer switch as per the review recommendation. --- keyboards/thumbsup/keymaps/default/keymap.c | 6 +----- keyboards/thumbsup/keymaps/default/rules.mk | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 keyboards/thumbsup/keymaps/default/rules.mk diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 30ec51e35a15..00318ac49e48 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -55,7 +55,7 @@ Single hit: | | |Space | |Space | | | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, - KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, LT(_CURSORLEFT,KC_SPC), LT(_CURSORRGHT,KC_SPC), KC_RSFT, KC_RALT, KC_APP, KC_SPC + KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, LT(TL_LOWR,KC_SPC), LT(TL_UPPR ,KC_SPC), KC_RSFT, KC_RALT, KC_APP, KC_SPC ), @@ -173,7 +173,3 @@ without separate thumbcluster. ) }; -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _CURSORLEFT, _CURSORRGHT, _NUMBERS); -} - \ No newline at end of file diff --git a/keyboards/thumbsup/keymaps/default/rules.mk b/keyboards/thumbsup/keymaps/default/rules.mk new file mode 100644 index 000000000000..2c72d2ddb6cd --- /dev/null +++ b/keyboards/thumbsup/keymaps/default/rules.mk @@ -0,0 +1 @@ +TRI_LAYER_ENABLE = yes \ No newline at end of file From 1711c3471aa1117e80f98195673240aad6fb0c8c Mon Sep 17 00:00:00 2001 From: ak66666 <32971450+ak66666@users.noreply.github.com> Date: Wed, 29 May 2024 22:44:37 -0400 Subject: [PATCH 20/20] v9: Fixed the copyright header modified by mistake. --- keyboards/thumbsup/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index 00318ac49e48..a7bc42718014 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -1,4 +1,4 @@ - /* Copyright 2022 Alexander (Sasha) Karmanov +/* Copyright 2022 Alexander (Sasha) Karmanov * * 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