Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-07-20 05:27:43 +00:00
commit 8109363148
14 changed files with 461 additions and 0 deletions

54
keyboards/q4z/config.h Normal file
View File

@ -0,0 +1,54 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x0001
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER drmmr
#define PRODUCT q4z keyboard
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 10
/*
* 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 { F4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { D1, D0, D4, B6, B2, B3, B1, F7, F6, F5 }
#define UNUSED_PINS
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

55
keyboards/q4z/info.json Normal file
View File

@ -0,0 +1,55 @@
{
"keyboard_name": "q4z",
"url": "",
"maintainer": "rjboone",
"width": 10.25,
"height": 5,
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00 (F4,D1)", "x":0.5, "y":0},
{"label":"K01 (F4,D0)", "x":1.5, "y":0},
{"label":"K02 (F4,D4)", "x":2.5, "y":0},
{"label":"K03 (F4,B6)", "x":3.5, "y":0},
{"label":"K04 (F4,B2)", "x":4.5, "y":0},
{"label":"K10 (C6,D1)", "x":0, "y":1},
{"label":"K11 (C6,D0)", "x":1, "y":1},
{"label":"K12 (C6,D4)", "x":2, "y":1},
{"label":"K13 (C6,B6)", "x":3, "y":1},
{"label":"K14 (C6,B2)", "x":4, "y":1},
{"label":"K15 (C6,B3)", "x":5, "y":1},
{"label":"K16 (C6,B1)", "x":6, "y":1},
{"label":"K17 (C6,F7)", "x":7, "y":1},
{"label":"K18 (C6,F6)", "x":8, "y":1},
{"label":"K19 (C6,F5)", "x":9, "y":1, "w":1.25},
{"label":"K20 (D7,D1)", "x":0, "y":2, "w":1.25},
{"label":"K21 (D7,D0)", "x":1.25, "y":2},
{"label":"K22 (D7,D4)", "x":2.25, "y":2},
{"label":"K23 (D7,B6)", "x":3.25, "y":2},
{"label":"K24 (D7,B2)", "x":4.25, "y":2},
{"label":"K25 (D7,B3)", "x":5.25, "y":2},
{"label":"K26 (D7,B1)", "x":6.25, "y":2},
{"label":"K27 (D7,F7)", "x":7.25, "y":2},
{"label":"K28 (D7,F6)", "x":8.25, "y":2},
{"label":"K29 (D7,F5)", "x":9.25, "y":2},
{"label":"K30 (E6,D1)", "x":0, "y":3, "w":1.75},
{"label":"K31 (E6,D0)", "x":1.75, "y":3},
{"label":"K32 (E6,D4)", "x":2.75, "y":3},
{"label":"K33 (E6,B6)", "x":3.75, "y":3},
{"label":"K34 (E6,B2)", "x":4.75, "y":3},
{"label":"K35 (E6,B3)", "x":5.75, "y":3},
{"label":"K36 (E6,B1)", "x":6.75, "y":3},
{"label":"K37 (E6,F7)", "x":7.75, "y":3},
{"label":"K38 (E6,F6)", "x":8.75, "y":3, "w":1.5},
{"label":"K40 (B4,D1)", "x":0, "y":4},
{"label":"K41 (B4,D0)", "x":1, "y":4},
{"label":"K42 (B4,D4)", "x":2, "y":4},
{"label":"K43 (B4,B6)", "x":3, "y":4, "w":2.25},
{"label":"K44 (B4,B2)", "x":5.25, "y":4, "w":2},
{"label":"K45 (B4,B3)", "x":7.25, "y":4},
{"label":"K46 (B4,B1)", "x":8.25, "y":4},
{"label":"K47 (B4,F7)", "x":9.25, "y":4}
]
}
}
}

View File

@ -0,0 +1,23 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
#ifdef COMBO_ENABLE
#define COMBO_COUNT 5
#define COMBO_TERM 200
#endif

View File

@ -0,0 +1,101 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
enum layers{
_BASE,
_NUM_SYM,
_NAV,
_GAME
};
enum combo_events {
COMBO_BSPC,
COMBO_NUMBAK,
COMBO_TAB,
COMBO_ESC,
COMBO_DEL,
};
#define KC_SF LSFT_T(KC_F)
#define KC_SJ RSFT_T(KC_J)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_5,
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_SF, KC_G, KC_H, KC_SJ, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
KC_LCTL, KC_LALT, KC_LGUI, LT(_NUM_SYM, KC_ENT), KC_SPC, MO(_NAV), TG(_GAME), KC_SLSH
),
[_NUM_SYM] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, KC_TRNS, KC_BSLS
),
[_NAV] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_GAME] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_5,
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_NO, TG(_GAME), KC_NO
),
};
#ifdef COMBO_ENABLE
const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
combo_t key_combos[COMBO_COUNT] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
[COMBO_DEL] = COMBO(combo_del,KC_DEL),
};
#endif
layer_state_t layer_state_set_user(layer_state_t state) {
#ifdef COMBO_ENABLE
switch(get_highest_layer(state)) {
case _GAME:
combo_disable();
break;
default:
combo_enable();
break;
}
#endif // COMBO_ENABLE
return state;
}

View File

@ -0,0 +1 @@
# Default Q4Z Keymap

View File

@ -0,0 +1 @@
COMBO_ENABLE = yes

View File

@ -0,0 +1,25 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
#undef TAPPING_TERM
#define TAPPING_TERM 300
#undef COMBO_COUNT
#define COMBO_COUNT 5
#define COMBO_TERM 50

View File

@ -0,0 +1,107 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
enum layers{
_BASE,
_NUM_SYM,
_NAV,
_GAME
};
enum combo_events {
COMBO_BSPC,
COMBO_NUMBAK,
COMBO_TAB,
COMBO_ESC,
COMBO_DEL,
};
#define KC_GA LGUI_T(KC_A)
#define KC_AS LALT_T(KC_S)
#define KC_CD LCTL_T(KC_D)
#define KC_SF LSFT_T(KC_F)
#define KC_SJ RSFT_T(KC_J)
#define KC_CK RCTL_T(KC_K)
#define KC_AL RALT_T(KC_L)
#define KC_GSCLN RGUI_T(KC_SCLN)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_5,
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_SF, KC_G, KC_H, KC_SJ, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
KC_LCTL, KC_LALT, KC_LGUI, LT(_NUM_SYM, KC_ENT), KC_SPC, MO(_NAV), TG(_GAME), KC_SLSH
),
[_NUM_SYM] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_LBRC, KC_RBRC, KC_EQL, KC_TRNS, KC_TRNS, KC_QUOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, KC_TRNS, KC_BSLS
),
[_NAV] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_GAME] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_5,
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_NO, TG(_GAME), KC_NO
),
};
#ifdef COMBO_ENABLE
const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
combo_t key_combos[COMBO_COUNT] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
[COMBO_DEL] = COMBO(combo_del,KC_DEL),
};
#endif
layer_state_t layer_state_set_user(layer_state_t state) {
#ifdef COMBO_ENABLE
switch(get_highest_layer(state)) {
case _GAME:
combo_disable();
break;
default:
combo_enable();
break;
}
#endif // COMBO_ENABLE
return state;
}

View File

@ -0,0 +1 @@
# Default Le Chiffre Keymap

View File

@ -0,0 +1 @@
COMBO_ENABLE = yes

16
keyboards/q4z/q4z.c Normal file
View File

@ -0,0 +1,16 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "q4z.h"

34
keyboards/q4z/q4z.h Normal file
View File

@ -0,0 +1,34 @@
/* Copyright 2021 rjboone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define XXX KC_NO
#define LAYOUT( \
K01, K06, K11, K16, K21, \
K02, K07, K12, K17, K22, K26, K30, K34, K38, K41, \
K03, K08, K13, K18, K23, K27, K31, K35, K39, K42, \
K04, K09, K14, K19, K24, K28, K32, K36, K40, \
K05, K10, K15, K20, K25, K29, K33, K37 \
) { \
{ K01, K06, K11, K16, K21, XXX, XXX, XXX, XXX, XXX }, \
{ K02, K07, K12, K17, K22, K26, K30, K34, K38, K41 }, \
{ K03, K08, K13, K18, K23, K27, K31, K35, K39, K42 }, \
{ K04, K09, K14, K19, K24, K28, K32, K36, K40, XXX }, \
{ K05, K10, K15, K20, K25, K29, K33, K37, XXX, XXX } \
}

20
keyboards/q4z/readme.md Normal file
View File

@ -0,0 +1,20 @@
# Q4Z
![Q4Z](https://cdn.shopify.com/s/files/1/0501/7537/7592/products/q4n-6_470x.jpg?v=1623373518)
Q4Z is a play on everybody's favorite 10.25u layout. With the addition of 5 number keys and a handle,
this little board is ready for whatever a raging gamer can throw it at.
* Keyboard Maintainer: [Ryan Boone](https://github.com/rjboone) (Drmmr#0004)
* Hardware Supported: Pro Micro or equivalent
* Hardware Availability: This board is available to purchase from [P3D Store](https://p3dstore.com)
Make example for this keyboard (after setting up your build environment):
make q4z:default
Flashing example for this keyboard:
make q4z: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).

22
keyboards/q4z/rules.mk Normal file
View File

@ -0,0 +1,22 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output