-
-
Notifications
You must be signed in to change notification settings - Fork 38.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into develop
Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk
- Loading branch information
Showing
139 changed files
with
6,481 additions
and
447 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
{ | ||
"keyboard_name": "3w6", | ||
"url": "https://github.com/weteor/3W6/", | ||
"maintainer": "weteor", | ||
"width": 13, | ||
"height": 5, | ||
"layouts": { | ||
"LAYOUT": { | ||
"layout": [ | ||
{"label": "k00", "x": 0, "y": 0.8}, | ||
{"label": "k01", "x": 1, "y": 0.2}, | ||
{"label": "k02", "x": 2, "y": 0}, | ||
{"label": "k03", "x": 3, "y": 0.2}, | ||
{"label": "k04", "x": 4, "y": 0.4}, | ||
|
||
{"label": "k05", "x": 8, "y": 0.4}, | ||
{"label": "k06", "x": 9, "y": 0.2}, | ||
{"label": "k07", "x": 10, "y": 0}, | ||
{"label": "k08", "x": 11, "y": 0.2}, | ||
{"label": "k09", "x": 12, "y": 0.8}, | ||
|
||
{"label": "k10", "x": 0, "y": 1.8}, | ||
{"label": "k11", "x": 1, "y": 1.2}, | ||
{"label": "k12", "x": 2, "y": 1}, | ||
{"label": "k13", "x": 3, "y": 1.2}, | ||
{"label": "k14", "x": 4, "y": 1.4}, | ||
|
||
{"label": "k15", "x": 8, "y": 1.4}, | ||
{"label": "k16", "x": 9, "y": 1.2}, | ||
{"label": "k17", "x": 10, "y": 1}, | ||
{"label": "k18", "x": 11, "y": 1.2}, | ||
{"label": "k19", "x": 12, "y": 1.8}, | ||
|
||
{"label": "k20", "x": 0, "y": 2.8}, | ||
{"label": "k21", "x": 1, "y": 2.2}, | ||
{"label": "k22", "x": 2, "y": 2}, | ||
{"label": "k23", "x": 3, "y": 2.2}, | ||
{"label": "k24", "x": 4, "y": 2.4}, | ||
|
||
{"label": "k25", "x": 8, "y": 2.4}, | ||
{"label": "k26", "x": 9, "y": 2.2}, | ||
{"label": "k27", "x": 10, "y": 2}, | ||
{"label": "k28", "x": 11, "y": 2.2}, | ||
{"label": "k29", "x": 12, "y": 2.8}, | ||
|
||
{"label": "k32", "x": 3.2, "y": 3.6}, | ||
{"label": "k33", "x": 4.2, "y": 3.6}, | ||
{"label": "k34", "x": 5.2, "y": 3.8}, | ||
|
||
{"label": "k35", "x": 6.8, "y": 3.8}, | ||
{"label": "k36", "x": 7.8, "y": 3.6}, | ||
{"label": "k37", "x": 8.8, "y": 3.6} | ||
] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* Copyright 2021 weteor | ||
* | ||
* 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 <https://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#include QMK_KEYBOARD_H | ||
|
||
enum layers | ||
{ | ||
_ALPHA_QWERTY = 0, | ||
_ALPHA_COLEMAK, | ||
_SYM, | ||
_NAV, | ||
_NUM, | ||
_CFG, | ||
}; | ||
|
||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
|
||
|
||
[_ALPHA_QWERTY] = LAYOUT( | ||
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, | ||
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, | ||
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), | ||
|
||
LCTL_T(KC_ESC), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) | ||
), | ||
[_ALPHA_COLEMAK] = LAYOUT( | ||
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, | ||
KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, | ||
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SCLN), | ||
LCTL_T(KC_ENT), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB), LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL) | ||
), | ||
[_SYM] = LAYOUT( | ||
KC_GRV , KC_CIRC, KC_AT, KC_DLR, KC_TILD, KC_AMPR, KC_EXLM, KC_PIPE, KC_UNDS, KC_HASH, | ||
KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, | ||
_______, KC_QUES, KC_PLUS, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, _______, | ||
XXXXXXX, MO(_CFG), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | ||
), | ||
[_NAV] = LAYOUT( | ||
XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP, KC_PGUP, KC_DEL, | ||
KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, | ||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(_CFG), XXXXXXX | ||
), | ||
[_NUM] = LAYOUT( | ||
XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PSLS, | ||
XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_P0, KC_P4, KC_P5, KC_P6, KC_PDOT, | ||
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P1, KC_P2, KC_P3, KC_PAST, | ||
XXXXXXX, XXXXXXX, XXXXXXX, KC_PEQL, KC_PENT, XXXXXXX | ||
), | ||
[_CFG] = LAYOUT( | ||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,DF(_ALPHA_QWERTY), DF(_ALPHA_COLEMAK), | ||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | ||
), | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/* Copyright 2021 weteor | ||
* | ||
* 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 <https://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
// generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- | ||
|
||
#pragma once | ||
|
||
#define LAYOUT_miryoku( \ | ||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ | ||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ | ||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ | ||
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ | ||
) \ | ||
LAYOUT( \ | ||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ | ||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ | ||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ | ||
K32, K33, K34, K35, K36, K37 \ | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/* Copyright 2021 weteor | ||
* | ||
* 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 <https://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
// generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# 3W6 | ||
|
||
![3W6](https://raw.githubusercontent.com/weteor/3W6/main/images/3w6_rev2_1s.jpg) | ||
|
||
The 3w6 is a low profile, split ortholinear keyboard with 36 keys. | ||
|
||
I needed a keyboard for work and wasn't really satisfied with the available alternatives (namely Corne, Kyria and Ferris), mostly because they are either rather large and/or don't have the spacing I would like. | ||
|
||
The 3w6 is designed to be a simple, realiable, cheap and small keyboard to be taken everywhere. | ||
|
||
There are currently two revisions: | ||
* Rev1: | ||
- onboard microcontroller (ATMega32U4) | ||
- USB-C connector Board <-> PC | ||
- USB-C connectors between both split halfs | ||
- choc spacing (18x17mm) | ||
- aggressive pinky stagger | ||
- support for Choc V1 switches | ||
* Rev2: | ||
- everything Rev1 did | ||
- additional middle plate (2mm) | ||
- support for [Pimoroni Trackball](https://shop.pimoroni.com/products/trackball-breakout) instead of outer thumb switch on right half, needs midplate | ||
- mounting holes for [Tenting Puck](https://splitkb.com/collections/keyboard-parts/products/tenting-puck), only usable without mid or switchplate | ||
|
||
--- | ||
|
||
* Keyboard Maintainer: [weteor](https://github.com/weteor) | ||
* Hardware Supported: | ||
* 3w6 rev1 | ||
* 3w6 rev2 (with Pimoroni support) | ||
* Hardware Availability: | ||
* make one yourself: [Design and Productionfiles](https://github.com/weteor/3w6) | ||
* maintainer is selling kits when available | ||
--- | ||
To reach the bootloader, connect the board to the PC and push the reset button on left half. | ||
|
||
Make examples for this keyboard (after setting up your build environment): | ||
|
||
make 3w6/rev1:default | ||
make 3w6/rev2:default | ||
make 3w6/rev2:default_pimoroni | ||
|
||
--- | ||
|
||
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). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
Copyright 2021 weteor | ||
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 <https://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
|
||
/* USB Device descriptor parameter */ | ||
#define VENDOR_ID 0xFEED | ||
#define PRODUCT_ID 0x4658 | ||
#define DEVICE_VER 0x0001 | ||
#define MANUFACTURER weteor | ||
#define PRODUCT 3w6 | ||
|
||
/* key matrix size */ | ||
#define MATRIX_ROWS 8 | ||
#define MATRIX_COLS 10 | ||
|
||
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) | ||
#define MATRIX_COLS_PER_SIDE (MATRIX_COLS / 2) | ||
|
||
/* | ||
* Keyboard Matrix Assignments | ||
* | ||
* Change this to how you wired your keyboard | ||
* COLS: AVR pins used for columns, left to right | ||
* ROWS: AVR pins used for rows, top to bottom | ||
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
* | ||
*/ | ||
#define MATRIX_ROW_PINS_L { B0, B1, B2, B4} | ||
#define MATRIX_COL_PINS_L { B3, E6, F7, B6, B5 } | ||
#define UNUSED_PINS_L { B7, C6, C7, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 } | ||
|
||
#define MATRIX_ROW_PINS_R { P10, P11, P12, P05 } | ||
#define MATRIX_COL_PINS_R { P06, P13, P14, P01, P00 } | ||
#define UNUSED_PINS_R { P02, P03, P04, P07, P15, P16, P17 } | ||
|
||
|
||
/* COL2ROW, ROW2COL */ | ||
#define DIODE_DIRECTION COL2ROW | ||
|
||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||
#define DEBOUNCE 5 | ||
|
||
/* disable these deprecated features by default */ | ||
#define NO_ACTION_MACRO | ||
#define NO_ACTION_FUNCTION | ||
|
Oops, something went wrong.