Skip to content

Commit 523dff3

Browse files
fredizzimofredizzimo
committed
Merge branch 'master' into makefile_overhaul
2 parents 2e3834e + 4321f0a commit 523dff3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2856
-336
lines changed

‎keyboards/atomic/keymaps/pvc/keymap.c

+23-9
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
154154

155155
/* UPPER
156156
* .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
157-
* | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE |
157+
* | PRINT | BR TOG | BR SP+ | BR SP- | BR RST | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE |
158158
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
159159
* | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS |
160160
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
@@ -180,9 +180,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
180180
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
181181
* | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS |
182182
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
183-
* | | ^ | * | + | - | ; | : | _ | ' | " | ` | | XXXXXX . | HOME |
183+
* | | ^ | * | + | - | / | \ | _ | ' | " | ` | | XXXXXX . | HOME |
184184
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
185-
* | | | | & | ! | ~ | / | \ | = | < | > | ? | XXXXXX . | | END |
185+
* | | | | & | ! | ~ | ; | : | = | < | > | ? | XXXXXX . | | END |
186186
* |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
187187
* | | | | | | | | | | | | | | |
188188
* '--------------------------------------------------------------------------------------------------------------------------------------'
@@ -191,16 +191,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
191191
[LAYER_LOWER] = { // LOWER
192192
{ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
193193
{ _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS },
194-
{ _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME },
195-
{ _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END },
194+
{ _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME },
195+
{ _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END },
196196
{ _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ },
197197
},
198198

199+
/* FUNCTION
200+
* .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
201+
* | NUM LK | | | | | | | | | | | | | XXXXXX . |
202+
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
203+
* | SCR LK | F13 | F14 | F15 | F16 | | | | | | | | | | |
204+
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
205+
* | CAP LK | F17 | F18 | F19 | F20 | | | | | | | | XXXXXX . | |
206+
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
207+
* | | F21 | F22 | F23 | F24 | | | | | | | XXXXXX . | VOL UP | MUTE |
208+
* |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
209+
* | | | | | | PLAY/PAUSE | | | | | | PTRACK | VOL DN | NTRACK |
210+
* '--------------------------------------------------------------------------------------------------------------------------------------'
211+
*/
212+
199213
[LAYER_FUNCTION] = { // FUNCTION
200-
{ KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
201-
{ KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_PAUS },
202-
{ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_PSCR },
203-
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_VOLU, KC_MUTE },
214+
{ KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX },
215+
{ KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
216+
{ KC_CAPS, KC_F17, KC_F18, KC_F19, KC_F20, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, XXXXXXX },
217+
{ _______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_VOLU, KC_MUTE },
204218
{ _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT },
205219
},
206220

‎keyboards/atreus/keymaps/replicaJunction/atreus-replica-base-colemakdh.png

74.5 KB
Loading

‎keyboards/atreus/keymaps/replicaJunction/atreus-replica-extend.png

89.4 KB
Loading

‎keyboards/atreus/keymaps/replicaJunction/atreus-replica-function.png

90.3 KB
Loading

‎keyboards/atreus/keymaps/replicaJunction/atreus-replica-game.png

70.8 KB
Loading

‎keyboards/atreus/keymaps/replicaJunction/atreus-replica-num.png

71.5 KB
Loading

‎keyboards/atreus/keymaps/replicaJunction/config.h

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
/*
2+
Config file - Atreus QMK with replicaJunction layout
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
#ifndef CONFIG_H
19+
#define CONFIG_H
20+
21+
#include "config_common.h"
22+
23+
/* USB Device descriptor parameter */
24+
25+
#define VENDOR_ID 0xFEED
26+
#define PRODUCT_ID 0x6060
27+
#define DEVICE_VER 0x0001
28+
#define MANUFACTURER Technomancy
29+
#define PRODUCT Atreus
30+
#define DESCRIPTION q.m.k. keyboard firmware for Atreus
31+
32+
/* key matrix size */
33+
#define MATRIX_ROWS 4
34+
#define MATRIX_COLS 11
35+
36+
// Change this to how you wired your keyboard
37+
// COLS: Left to right, ROWS: Top to bottom
38+
#if defined(ATREUS_ASTAR)
39+
# define MATRIX_ROW_PINS { D0, D1, D3, D2 }
40+
# define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
41+
# define UNUSED_PINS
42+
#elif defined(ATREUS_TEENSY2)
43+
# define MATRIX_ROW_PINS { D0, D1, D2, D3 }
44+
# define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
45+
# define UNUSED_PINS
46+
#endif
47+
48+
/* COL2ROW or ROW2COL */
49+
#define DIODE_DIRECTION COL2ROW
50+
51+
/* define if matrix has ghost */
52+
//#define MATRIX_HAS_GHOST
53+
54+
/* number of backlight levels */
55+
//#define BACKLIGHT_LEVELS 3
56+
57+
/* Set 0 if debouncing isn't needed */
58+
// Default: 5
59+
#define DEBOUNCING_DELAY 6
60+
61+
// I don't have any locking keys, so I don't need these features
62+
63+
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
64+
//#define LOCKING_SUPPORT_ENABLE
65+
/* Locking resynchronize hack */
66+
//#define LOCKING_RESYNC_ENABLE
67+
68+
/* key combination for command */
69+
#define IS_COMMAND() ( \
70+
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
71+
)
72+
73+
/* Prevent modifiers from sticking when switching layers */
74+
#define PREVENT_STUCK_MODIFIERS
75+
76+
/*
77+
* Feature disable options
78+
* These options are also useful to firmware size reduction.
79+
*/
80+
81+
/* disable debug print */
82+
//#define NO_DEBUG
83+
84+
/* disable print */
85+
//#define NO_PRINT
86+
87+
/* disable action features */
88+
//#define NO_ACTION_LAYER
89+
//#define NO_ACTION_TAPPING
90+
//#define NO_ACTION_ONESHOT
91+
//#define NO_ACTION_MACRO
92+
//#define NO_ACTION_FUNCTION
93+
94+
#endif

‎keyboards/atreus/keymaps/replicaJunction/keymap.c

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
/*
2+
* Keyboard: Atreus
3+
* Keymap: replicaJunction
4+
* Version: 0.3
5+
*
6+
* This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez.
7+
* The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox. I now
8+
* have both keyboards, so I've designed these layouts in an effort to make switching between the
9+
* two as easy as possible.
10+
*
11+
* Clearly, the Atreus is the limiting factor in this equation, so I've taken heavy advantage of
12+
* function and dual-role keys.
13+
*
14+
* The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
15+
* here: https://colemakmods.github.io/mod-dh/
16+
*/
17+
18+
#include "atreus.h"
19+
20+
// Each layer gets a name for readability, which is then used in the keymap matrix below.
21+
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
22+
// Layer names don't all need to be of the same length, obviously, and you can also skip them
23+
// entirely and just use numbers.
24+
25+
// Note that whatever is set as layer 0 will be the default layer of the keyboard.
26+
27+
#define _CO 0 // Colemak
28+
#define _QW 1 // QWERTY
29+
#define _GA 2 // Gaming
30+
#define _EX 3 // Extend
31+
#define _NU 4 // Numpad
32+
#define _FN 5 // Function
33+
34+
// Some quick aliases, just to make it look pretty
35+
#define _______ KC_TRNS
36+
#define KCX_CA LCTL(KC_LALT)
37+
#define KCX_CS LCTL(KC_LSFT)
38+
#define KCX_CSA LCTL(LSFT(KC_LALT))
39+
#define KCX_LST LSFT(KC_TAB)
40+
#define KX_COPY LCTL(KC_C)
41+
#define KX_CUT LCTL(KC_X)
42+
#define KX_PAST LCTL(KC_V)
43+
#define KX_UNDO LCTL(KC_Z)
44+
45+
; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
46+
47+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
48+
[_CO] = KEYMAP(
49+
KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
50+
KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O,
51+
SFT_T(KC_Z), KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, SFT_T(KC_SLSH),
52+
KC_ESC, KC_LGUI, KC_TAB, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
53+
),
54+
55+
[_QW] = KEYMAP( /* Qwerty */
56+
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
57+
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
58+
SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH),
59+
KC_ESC, KC_LGUI, KC_TAB, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
60+
),
61+
62+
[_EX] = KEYMAP( /* Extend */
63+
KC_CAPS, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL,
64+
_______, KC_LGUI, KC_LALT, KC_LCTL, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
65+
_______, KX_CUT, KX_COPY, _______, KX_PAST, _______, KC_TAB, KCX_LST, _______, KC_INSERT,
66+
_______, _______, _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, KC_PSCR
67+
),
68+
69+
[_NU] = KEYMAP( /* Numbers and symbols */
70+
KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR,
71+
KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_TILD, KC_PIPE, KC_4, KC_5, KC_6, KC_MINS,
72+
KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, KC_1, KC_2, KC_3, KC_PLUS,
73+
_______, TG(_GA), _______, MO(_FN), _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, _______
74+
),
75+
76+
[_FN] = KEYMAP( /* Functions */
77+
KC_DEL, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, KC_F7, KC_F8, KC_F9, KC_F10,
78+
KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_F4, KC_F5, KC_F6, KC_F11,
79+
_______, KC_VOLU, KC_MUTE, KC_VOLD, KC_MPLY, _______, KC_F1, KC_F2, KC_F3, KC_F12,
80+
_______, _______, _______, _______, KC_MSTP, _______, _______, _______, KC_NO, DF(_CO), DF(_QW), RESET
81+
),
82+
83+
[_GA] = KEYMAP( /* Gaming */
84+
_______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
85+
_______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
86+
KC_Z, _______, _______, _______, _______, KC_BTN3, _______, KC_MS_D, _______, _______,
87+
_______, TG(_GA), _______, KC_LSFT, KC_SPC, KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
88+
)};
89+
90+
const uint16_t PROGMEM fn_actions[] = {
91+
92+
};
93+
94+
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
95+
{
96+
// MACRODOWN only works in this function
97+
switch(id) {
98+
case 0:
99+
if (record->event.pressed) {
100+
register_code(KC_RSFT);
101+
} else {
102+
unregister_code(KC_RSFT);
103+
}
104+
break;
105+
}
106+
return MACRO_NONE;
107+
};

‎keyboards/atreus/keymaps/replicaJunction/readme.md

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# replicaJunction - Atreus Layout #
2+
3+
This layout is designed to make the absolute most out of the Atreus 40% keyboard.
4+
5+
I was enchanted with the idea of the Atreus keyboard after using my Ergodox for several months. I wanted something of a similar form factor that was easily portable, so I could bring and transport a keyboard to my workplace without much hassle. After building the Atreus keyboard, though, I realized very quickly that the 40% form factor requires a lot more creativity than a full-size keyboard (even one as strangely-shaped as the Ergodox).
6+
7+
The default Atreus keyboard layout provides all the necessary keys in order to function with the keyboard, but as a programmer, I needed quicker access to just about everything. I noticed that the default layer didn't include any dual-role keys, and so I started on my journey to build my perfect layout for the Atreus.
8+
9+
I won't claim that this layout is perfect for everyone. It does make several significant changes from the "normal" Atreus layout. In my own use, though, I've found this keyboard turbocharges my Atreus, and gives it the power of a full-size keyboard without the size.
10+
11+
## Base Layer ##
12+
13+
![Atreus base layout](atreus-replica-base-colemakdh.png)
14+
15+
The letters on this layout are arranged in the [Colemak Mod-DH layout](https://colemakmods.github.io/mod-dh/).
16+
17+
Note that there are four dual-purpose keys: Shift (Backspace), Ctrl (Delete), Alt (Enter), and Space (Number layer). In QMK, these dual-role keys can be made to hold their primary key by double-tapping the key and holding on the second tap. For example, if I wanted to insert a long string of Spaces, I would tap the Space key, then tap it again and hold. A single press and hold would trigger the secondary function of the key instead.
18+
19+
The secondary Alt on the left bottom row exists to provide a single-hand Alt+Tab shortcut, which would take two rows otherwise.
20+
21+
## Extend Layer ##
22+
23+
![Atreus extend layer](atreus-replica-extend.png)
24+
25+
This layout is designed primarily for keyboard navigation. Arrow keys are easily accessible under the right hand (a welcome change from the original Atreus layout, which places them under the left hand), along with Home/End and PgUp/PgDn.
26+
27+
Modifiers are also placed under the home row of the left hand. One of the single keyboard actions I use most is Shift+Ctrl+Left/Right to select a whole word; this layer makes those keypresses simple by adding the Ctrl key in an easy-to-reach location.
28+
29+
For the common Ctrl shortcuts, I also added some hotkeys to this layer over the letter keys they are associated with. This gives the Extend key some extra utility by letting it "feel" like a Ctrl key in some cases.
30+
31+
The Space key exists to prevent going from this layer directly into the Number layer. Similarly, the Shift key on the left pinky helps make sure that the normal letter (Z) doesn't fire.
32+
33+
## Number and Symbol Layer ##
34+
35+
![Atreus number and symbol layer](atreus-replica-num.png)
36+
37+
This layer provides the only way of accessing number keys on this keyboard, since it's too small for its own number row. Note that even though they are laid out in the number pad fashion, they send the "regular" number keystrokes. Games and programs that specifically use NumPad keys are not supported in this layout at the moment.
38+
39+
This layer also provides plenty of symbol shortcuts. Most of these can be accessed through other means (like Shift+8 for the asterisk), but having shortcut keys to them makes for one less keypress, which adds up quickly when using these symbols on a regular basis. I've been through many revisions of this concept on my Ergodox as well as the Atreus, and I've finally arrived at this layout as the one that provides the symbols I need most frequently in places I can think to expect them. The Ordinary layout from the Ergodox-EZ keyboard in this repository was a large influence in this design.
40+
41+
## Function Layer ##
42+
43+
![Atreus function layer](atreus-replica-function.png)
44+
45+
Function keys (F1-F12) are on this layer, as well as some more generic "functions" such as media keys. I've also set up a mirror image of the arrows from the Extend layer in case I need to use these with my left hand, but I don't do this very often.
46+
47+
The reset key is on this layer, as well as a toggle from Colemak to QWERTY and back. The QWERTY layer is not currently documented, but it is functionally identical to the base layer except for letter positions.
48+
49+
## Gaming Layer ##
50+
51+
![Atreus gaming layer](atreus-replica-game.png)
52+
53+
This is a small layer developed to allow some simple gameplay without a mouse. This layer is a toggle (from the Number layer), so it is designed to stay on while in use.
54+
55+
The keys on the left hand bring Space into the left thumb's reach, as well as overriding the dual-role Shift with its standard function (Z in both QWERTY and in Colemak). This allows easy Shift presses without blocking the Z key, commonly used in games.
56+
57+
I would probably not consider this a hard-core gaming keyboard, and this layout does have the huge problem of blocking access to the number keys, but for more casual games, it plays quite well. I've used it quite a bit on Minecraft, for example, and I'm quite pleased with it.

0 commit comments

Comments
 (0)