mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-22 11:29:26 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
d04789e9ea
131
keyboards/druah/majestouch_redux/keyboard.json
Normal file
131
keyboards/druah/majestouch_redux/keyboard.json
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
{
|
||||||
|
"manufacturer": "FILCO",
|
||||||
|
"keyboard_name": "Majestouch Redux",
|
||||||
|
"maintainer": "Druah",
|
||||||
|
"bootloader": "atmel-dfu",
|
||||||
|
"build": {
|
||||||
|
"lto": true
|
||||||
|
},
|
||||||
|
"diode_direction": "COL2ROW",
|
||||||
|
"features": {
|
||||||
|
"bootmagic": true,
|
||||||
|
"extrakey": true,
|
||||||
|
"mousekey": true,
|
||||||
|
"nkro": true
|
||||||
|
},
|
||||||
|
"indicators": {
|
||||||
|
"caps_lock": "C1",
|
||||||
|
"scroll_lock": "C0"
|
||||||
|
},
|
||||||
|
"matrix_pins": {
|
||||||
|
"cols": ["A0", "A1", "A2", "F6", "F7", "E6", "F0", "F1", "F2", "B3", "B2", "B1", "F3", "F4", "C5", "C6", "C3"],
|
||||||
|
"rows": ["C2", "B4", "B5", "F5", "C7", "C4"]
|
||||||
|
},
|
||||||
|
"processor": "at90usb646",
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"url": "https://druah.moe",
|
||||||
|
"usb": {
|
||||||
|
"device_version": "1.0.0",
|
||||||
|
"pid": "0x0003",
|
||||||
|
"vid": "0x444E"
|
||||||
|
},
|
||||||
|
"community_layouts": ["tkl_ansi"],
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT_tkl_ansi": {
|
||||||
|
"layout": [
|
||||||
|
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||||
|
{"matrix": [0, 2], "x": 2, "y": 0},
|
||||||
|
{"matrix": [0, 3], "x": 3, "y": 0},
|
||||||
|
{"matrix": [0, 4], "x": 4, "y": 0},
|
||||||
|
{"matrix": [0, 5], "x": 5, "y": 0},
|
||||||
|
{"matrix": [0, 6], "x": 6.5, "y": 0},
|
||||||
|
{"matrix": [0, 7], "x": 7.5, "y": 0},
|
||||||
|
{"matrix": [0, 8], "x": 8.5, "y": 0},
|
||||||
|
{"matrix": [0, 9], "x": 9.5, "y": 0},
|
||||||
|
{"matrix": [0, 10], "x": 11, "y": 0},
|
||||||
|
{"matrix": [0, 11], "x": 12, "y": 0},
|
||||||
|
{"matrix": [0, 12], "x": 13, "y": 0},
|
||||||
|
{"matrix": [0, 13], "x": 14, "y": 0},
|
||||||
|
{"matrix": [0, 14], "x": 15.25, "y": 0},
|
||||||
|
{"matrix": [0, 15], "x": 16.25, "y": 0},
|
||||||
|
{"matrix": [0, 16], "x": 17.25, "y": 0},
|
||||||
|
{"matrix": [1, 0], "x": 0, "y": 1.5},
|
||||||
|
{"matrix": [1, 1], "x": 1, "y": 1.5},
|
||||||
|
{"matrix": [1, 2], "x": 2, "y": 1.5},
|
||||||
|
{"matrix": [1, 3], "x": 3, "y": 1.5},
|
||||||
|
{"matrix": [1, 4], "x": 4, "y": 1.5},
|
||||||
|
{"matrix": [1, 5], "x": 5, "y": 1.5},
|
||||||
|
{"matrix": [1, 6], "x": 6, "y": 1.5},
|
||||||
|
{"matrix": [1, 7], "x": 7, "y": 1.5},
|
||||||
|
{"matrix": [1, 8], "x": 8, "y": 1.5},
|
||||||
|
{"matrix": [1, 9], "x": 9, "y": 1.5},
|
||||||
|
{"matrix": [1, 10], "x": 10, "y": 1.5},
|
||||||
|
{"matrix": [1, 11], "x": 11, "y": 1.5},
|
||||||
|
{"matrix": [1, 12], "x": 12, "y": 1.5},
|
||||||
|
{"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
|
||||||
|
{"matrix": [1, 14], "x": 15.25, "y": 1.5},
|
||||||
|
{"matrix": [1, 15], "x": 16.25, "y": 1.5},
|
||||||
|
{"matrix": [1, 16], "x": 17.25, "y": 1.5},
|
||||||
|
{"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
|
||||||
|
{"matrix": [2, 1], "x": 1.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 2], "x": 2.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 3], "x": 3.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 4], "x": 4.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 5], "x": 5.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 6], "x": 6.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 7], "x": 7.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 8], "x": 8.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 9], "x": 9.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 10], "x": 10.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 11], "x": 11.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 12], "x": 12.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
|
||||||
|
{"matrix": [2, 14], "x": 15.25, "y": 2.5},
|
||||||
|
{"matrix": [2, 15], "x": 16.25, "y": 2.5},
|
||||||
|
{"matrix": [2, 16], "x": 17.25, "y": 2.5},
|
||||||
|
{"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
|
||||||
|
{"matrix": [3, 1], "x": 1.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 2], "x": 2.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 3], "x": 3.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 4], "x": 4.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 5], "x": 5.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 6], "x": 6.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 7], "x": 7.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 8], "x": 8.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 9], "x": 9.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 10], "x": 10.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 11], "x": 11.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
|
||||||
|
{"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
|
||||||
|
{"matrix": [4, 2], "x": 2.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 3], "x": 3.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 4], "x": 4.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 5], "x": 5.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 6], "x": 6.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 7], "x": 7.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 8], "x": 8.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 9], "x": 9.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 10], "x": 10.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 11], "x": 11.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
|
||||||
|
{"matrix": [4, 15], "x": 16.25, "y": 4.5},
|
||||||
|
{"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
|
||||||
|
{"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 14], "x": 15.25, "y": 5.5},
|
||||||
|
{"matrix": [5, 15], "x": 16.25, "y": 5.5},
|
||||||
|
{"matrix": [5, 16], "x": 17.25, "y": 5.5}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
32
keyboards/druah/majestouch_redux/keymaps/default/keymap.c
Normal file
32
keyboards/druah/majestouch_redux/keymaps/default/keymap.c
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// Copyright 2024 Druah (@Druah)
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
/*
|
||||||
|
* ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
|
||||||
|
* │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12││PSc│Scr│Pse│
|
||||||
|
* └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
|
||||||
|
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
|
||||||
|
* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│
|
||||||
|
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
|
||||||
|
* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ ││Del│End│PgD│
|
||||||
|
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
|
||||||
|
* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │
|
||||||
|
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐
|
||||||
|
* │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │
|
||||||
|
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
|
||||||
|
* │Ctrl│GUI │Alt │ │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │
|
||||||
|
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
|
||||||
|
*/
|
||||||
|
[0] = LAYOUT_tkl_ansi(
|
||||||
|
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
|
||||||
|
|
||||||
|
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
|
||||||
|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
|
||||||
|
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||||
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
|
||||||
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
|
)
|
||||||
|
};
|
||||||
27
keyboards/druah/majestouch_redux/readme.md
Normal file
27
keyboards/druah/majestouch_redux/readme.md
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Majestouch Redux
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
A replacement PCB for the FILCO Majestouch TKL line of keyboards (and other keyboards) compatible with [Phantom TKL](https://deskthority.net/wiki/Phantom) PCB spacing
|
||||||
|
|
||||||
|
* Keyboard Maintainer: [Druah](https://github.com/Druah)
|
||||||
|
* Hardware Supported: Majestouch Redux
|
||||||
|
* Hardware Availability: Private buy
|
||||||
|
|
||||||
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
|
make druah/majestouch_redux:default
|
||||||
|
|
||||||
|
Flashing example for this keyboard:
|
||||||
|
|
||||||
|
make druah/majestouch_redux: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).
|
||||||
|
|
||||||
|
## Bootloader
|
||||||
|
|
||||||
|
Enter the bootloader in 3 ways:
|
||||||
|
|
||||||
|
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the Escape/top left key) and plug in the keyboard
|
||||||
|
* **Physical reset button**: Briefly press the button on the back of the PCB labelled with "RESET"
|
||||||
|
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
|
||||||
Loading…
Reference in New Issue
Block a user