Merge remote-tracking branch 'qmk/master' into merge-2022-09-10
This commit is contained in:
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xCEEB
|
||||
#define PRODUCT_ID 0x0007
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER That-Canadian
|
||||
#define PRODUCT 6-Ball
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 1
|
||||
#define MATRIX_COLS 6
|
||||
@@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
/* pin-out */
|
||||
#define MATRIX_ROW_PINS { F5 }
|
||||
#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
/* ws2812 RGB LED */
|
||||
#define RGB_DI_PIN F7
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "6-Ball",
|
||||
"manufacturer": "That-Canadian",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0xCEEB",
|
||||
"pid": "0x0007",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
||||
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xCA17
|
||||
#define PRODUCT_ID 0xCA39
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Maple Computing
|
||||
#define PRODUCT C39
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 3
|
||||
#define MATRIX_COLS 13
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "C39",
|
||||
"manufacturer": "Maple Computing",
|
||||
"url": "",
|
||||
"maintainer": "Space Cat",
|
||||
"usb": {
|
||||
"vid": "0xCA17",
|
||||
"pid": "0xCA39",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Back", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Enter", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Fn", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}]
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define DEVICE_VER 0x2017
|
||||
5
keyboards/maple_computing/christmas_tree/V2017/info.json
Normal file
5
keyboards/maple_computing/christmas_tree/V2017/info.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"usb": {
|
||||
"device_version": "20.1.7"
|
||||
}
|
||||
}
|
||||
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0x3070
|
||||
#define MANUFACTURER Maple Computing
|
||||
#define PRODUCT Christmas Tree
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 6
|
||||
#define MATRIX_COLS 1
|
||||
@@ -32,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
/* Planck PCB default pin-out */
|
||||
#define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 }
|
||||
#define MATRIX_COL_PINS { D1 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define BACKLIGHT_PIN D2
|
||||
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
{
|
||||
"keyboard_name": "Christmas Tree",
|
||||
"manufacturer": "Maple Computing",
|
||||
"url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
|
||||
"maintainer": "That-Canadian",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0x3070"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
|
||||
|
||||
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x1337
|
||||
#define PRODUCT_ID 0x6012
|
||||
#define MANUFACTURER Maple Computing
|
||||
#define PRODUCT Ivy
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 3
|
||||
#define MATRIX_COLS 3
|
||||
|
||||
@@ -17,11 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
/* Let's Macro V2 pin-out */
|
||||
#define MATRIX_ROW_PINS { F1, B2, D3 }
|
||||
#define MATRIX_COL_PINS { F5, B3, D5 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "IVY",
|
||||
"keyboard_name": "Ivy",
|
||||
"manufacturer": "Maple Computing",
|
||||
"url": "",
|
||||
"maintainer": "That-Canadian",
|
||||
"usb": {
|
||||
"vid": "0x1337",
|
||||
"pid": "0x6012",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
||||
@@ -19,20 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x1337
|
||||
#define PRODUCT_ID 0x6017
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Maple Computing
|
||||
#define PRODUCT JNAO Keyboard
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 12
|
||||
|
||||
#define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 }
|
||||
#define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define BACKLIGHT_PIN D0
|
||||
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "JNAO",
|
||||
"manufacturer": "Maple Computing",
|
||||
"url": "",
|
||||
"maintainer": "That-Canadian",
|
||||
"usb": {
|
||||
"vid": "0x1337",
|
||||
"pid": "0x6017",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_ortho_5x12": {
|
||||
"layout": [
|
||||
|
||||
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x1337
|
||||
#define PRODUCT_ID 0x6007
|
||||
#define MANUFACTURER Maple Computing
|
||||
#define PRODUCT Launch Pad
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 4
|
||||
#define MATRIX_COLS 2
|
||||
|
||||
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
QM_MAKE, RESET, \
|
||||
QM_MAKE, QK_BOOT, \
|
||||
DF_REDR, DF_MEDA, \
|
||||
DF_NAVI, DF_KBNR, \
|
||||
TG_LGHT, XXXXXXX \
|
||||
|
||||
@@ -6,9 +6,10 @@
|
||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||
// entirely and just use numbers.
|
||||
#define _QWERTY 0
|
||||
|
||||
#define _FUNC 15
|
||||
enum layer_names {
|
||||
_QWERTY,
|
||||
_FUNC
|
||||
};
|
||||
|
||||
// Defines for task manager and such
|
||||
#define CALTDEL LCTL(LALT(KC_DEL))
|
||||
|
||||
@@ -7,9 +7,11 @@ extern keymap_config_t keymap_config;
|
||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||
// entirely and just use numbers.
|
||||
#define _QWERTY 0
|
||||
#define _RGB 1
|
||||
#define _FUNC 15
|
||||
enum layer_names {
|
||||
_QWERTY,
|
||||
_RGB,
|
||||
_FUNC
|
||||
};
|
||||
|
||||
// Defines for task manager and such
|
||||
#define CALTDEL LCTL(LALT(KC_DEL))
|
||||
|
||||
@@ -19,12 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "../config.h"
|
||||
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
/* Let's Macro V2 pin-out */
|
||||
#define MATRIX_ROW_PINS { C6, B1, B3, D7 }
|
||||
#define MATRIX_COL_PINS { D2, F7 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "Launch Pad rev1",
|
||||
"keyboard_name": "Launch Pad",
|
||||
"manufacturer": "Maple Computing",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0x1337",
|
||||
"pid": "0x6007",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
||||
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0xE401
|
||||
#define DEVICE_VER 0x0100
|
||||
#define MANUFACTURER That-Canadian
|
||||
#define PRODUCT Lets Split Eh?
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
#define MATRIX_ROWS 8
|
||||
|
||||
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
/* Let's Split EH? pin-out */
|
||||
#define MATRIX_ROW_PINS { B1, B3, D7, B4 }
|
||||
#define MATRIX_COL_PINS { F4, F5, C6, B6, B5, D5 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "Let's Split",
|
||||
"keyboard_name": "Lets Split Eh?",
|
||||
"manufacturer": "That-Canadian",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0xE401",
|
||||
"device_version": "1.0.0"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
||||
@@ -94,14 +94,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |------+------+------+------+------+------|------+------+------+------+------+------|
|
||||
* | | | | | | | | | | | |BLSTEP|
|
||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
|
||||
* | | | | | | | | | | | | RESET|
|
||||
* | | | | | | | | | | | | QK_BOOT|
|
||||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
TSKMGR, _______, _______, _______, _______, _______, KC_DEL, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
|
||||
_______, _______, _______, _______, _______, _______, _______, DVORAK, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT \
|
||||
),
|
||||
|
||||
/* Function
|
||||
|
||||
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
/* Adjust (Lower + Raise)
|
||||
* ,-----------------------------------------------------------------------------------.
|
||||
* | RESET| | | | | | |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
|
||||
* | QK_BOOT| | | | | | |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
|
||||
* |------+------+------+------+------+-------------+------+------+------+------+------|
|
||||
* | | | | | | | |RGBRMO|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
|
||||
* |------+------+------+------+------+------|------+------+------+------+------+------|
|
||||
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
RESET, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
|
||||
QK_BOOT, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
|
||||
_______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
|
||||
|
||||
@@ -99,14 +99,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |------+------+------+------+------+------|------+------+------+------+------+------|
|
||||
* | | | | | | | | | | | |BLSTEP|
|
||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
|
||||
* | | | | | | | | | | | | RESET|
|
||||
* | | | | | | | | | | | | QK_BOOT|
|
||||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
RGB_MOD, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, QWERTY, DVORAK, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT \
|
||||
),
|
||||
|
||||
/* FUNC
|
||||
|
||||
@@ -132,14 +132,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |------+------+------+------+------+------|------+------+------+------+------+------|
|
||||
* |_DVORAK| | | | | | | | | |RGBMOD|BLSTEP|
|
||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
|
||||
* |_QWERTY| | | | | | | | | | | RESET|
|
||||
* |_QWERTY| | | | | | | | | | | QK_BOOT|
|
||||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
TSKMGR, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
|
||||
DF(_COLEMAK), _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
|
||||
DF(_DVORAK), _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, BL_STEP, \
|
||||
DF(_QWERTY), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \
|
||||
DF(_QWERTY), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT \
|
||||
),
|
||||
|
||||
/* Function
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
void matrix_init_keymap (void) {
|
||||
}
|
||||
|
||||
uint32_t layer_state_set_keymap(uint32_t state) {
|
||||
|
||||
layer_state_t layer_state_set_keymap(layer_state_t state) {
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
|
||||
@@ -90,14 +90,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |------+------+------+------+------+------|------+------+------+------+------+------|
|
||||
* | | | | | | | | | | | |BLSTEP|
|
||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
|
||||
* | | | | | | | | | | | | RESET|
|
||||
* | | | | | | | | | | | | QK_BOOT|
|
||||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
TSKMGR, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
|
||||
_______, _______, _______, _______, _______, _______, _______, QWERTY, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT \
|
||||
),
|
||||
|
||||
/* Function
|
||||
|
||||
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0x3060
|
||||
#define MANUFACTURER That-Canadian
|
||||
#define PRODUCT MiniDox
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
#define MATRIX_ROWS 8
|
||||
|
||||
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT( \
|
||||
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, \
|
||||
KC_F11, KC_F12, RGB_RMOD, RGB_SAI, RGB_SAD, _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL, \
|
||||
RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_F8, TSKMGR, _______, \
|
||||
QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_F8, TSKMGR, _______, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
)
|
||||
};
|
||||
|
||||
@@ -5,10 +5,12 @@
|
||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||
// entirely and just use numbers.
|
||||
#define _QWERTY 0
|
||||
#define _LOWER 1
|
||||
#define _RAISE 2
|
||||
#define _ADJUST 16
|
||||
enum layer_names {
|
||||
_QWERTY,
|
||||
_LOWER,
|
||||
_RAISE,
|
||||
_ADJUST
|
||||
};
|
||||
|
||||
enum custom_keycodes {
|
||||
QWERTY = SAFE_RANGE,
|
||||
|
||||
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* If you use QWERTY + the Vanilla numbers primarily, change NUMLK_E to NUMLK_N here.
|
||||
*
|
||||
* ,----------------------------------. ,----------------------------------.
|
||||
* | RESET|DEBUG |QWERTY|CMKDHM| | | | VOL--| VOL++|BRITE-|BRITE+|
|
||||
* | QK_BOOT|DEBUG |QWERTY|CMKDHM| | | | VOL--| VOL++|BRITE-|BRITE+|
|
||||
* |------+------+------+------+------| |------+------+------+------+------|
|
||||
* | SHIFT| CTRL | ALT | GUI |NAV LK| | POWER| VOL- | VOL+ | MUTE | MPLY |
|
||||
* |------+------+------+------+------| |------+------+------+------+------|
|
||||
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* `------' `------'
|
||||
*/
|
||||
[_SYS] = LAYOUT( \
|
||||
RESET, DEBUG, QWERTY, CMK_DHM, _______, _______, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
|
||||
QK_BOOT, DEBUG, QWERTY, CMK_DHM, _______, _______, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
|
||||
KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK, KC_POWER, VOL_DN, VOL_UP, KC__MUTE, KC_MPLY, \
|
||||
_______, _______, AU_OFF, AU_ON, _______, _______, NUMLK_E, KC_MRWD, KC_MFFD, _______, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
|
||||
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT( \
|
||||
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
|
||||
_______, DSK_LFT, _______, DSK_RT, _______, TSKMGR, CALTDEL, _______, KC_F11, KC_F12, \
|
||||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
)
|
||||
};
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
#define PERMISSIVE_HOLD
|
||||
#define QMK_KEYS_PER_SCAN 4
|
||||
#define TAPPING_TERM 160
|
||||
|
||||
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT( \
|
||||
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
|
||||
_______, DSK_LFT, _______, DSK_RT, _______, TSKMGR, CALTDEL, _______, KC_F11, KC_F12, \
|
||||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
)
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT(
|
||||
_______, KC_F7, KC_F8, KC_F9, SCRCAP, _______, KC_F10, KC_F11, KC_F12, _______,
|
||||
_______, KC_F1, KC_F2, KC_F3, _______, _______, KC_F4, KC_F5, KC_F6, _______,
|
||||
OSM(MOD_LCTL),_______, _______, _______, RESET, KILL, _______, _______, _______, OSM(MOD_RCTL),
|
||||
OSM(MOD_LCTL),_______, _______, _______, QK_BOOT, KILL, _______, _______, _______, OSM(MOD_RCTL),
|
||||
_______, _______, _______, _______, _______, _______
|
||||
)
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT( \
|
||||
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, \
|
||||
KC_F11, KC_F12, _______, RGB_SAI, RGB_SAD, _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL, \
|
||||
RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_F8, TSKMGR, _______, \
|
||||
QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_F8, TSKMGR, _______, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
)
|
||||
};
|
||||
|
||||
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT( \
|
||||
_______, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, \
|
||||
CALTESC, CALTDEL, _______, CALT, _______, _______, KC_F4, KC_F5, KC_F6, KC_F11, \
|
||||
RESET, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F12, \
|
||||
QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F12, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
)};
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |------+------+------+------+------| |------+------+------+------+------|
|
||||
* | F11 | | | | | | | PrSc | ScLk | Paus | F12 |
|
||||
* |------+------+------+------+------| |------+------+------+------+------|
|
||||
* | |QWERTY|COLEMK|DVORAK| | |RESET | | | | |
|
||||
* | |QWERTY|COLEMK|DVORAK| | |QK_BOOT | | | | |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
* ,--------------------. ,------,-------------.
|
||||
* | | | | | | | |
|
||||
@@ -152,8 +152,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
*/
|
||||
[_ADJUST] = LAYOUT ( \
|
||||
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, \
|
||||
KC_F11, RESET, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12, \
|
||||
_______, QWERTY, COLEMAK, DVORAK, _______, RESET, _______, _______, _______, _______, \
|
||||
KC_F11, QK_BOOT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12, \
|
||||
_______, QWERTY, COLEMAK, DVORAK, _______, QK_BOOT, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, _______, _______ \
|
||||
)
|
||||
};
|
||||
|
||||
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
// wiring of each half
|
||||
#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
|
||||
#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "MiniDox",
|
||||
"manufacturer": "That-Canadian",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0x3060",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_split_3x5_3": {
|
||||
"layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]
|
||||
|
||||
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x1337
|
||||
#define PRODUCT_ID 0x6007
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Maple Computing
|
||||
#define PRODUCT The PCB Ruler
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 1
|
||||
#define MATRIX_COLS 6
|
||||
@@ -42,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#define MATRIX_ROW_PINS { C7 }
|
||||
#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6}
|
||||
#define UNUSED_PINS
|
||||
|
||||
/* COL2ROW or ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "The Ruler",
|
||||
"manufacturer": "Maple Computing",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0x1337",
|
||||
"pid": "0x6007",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0, "w":2}]
|
||||
|
||||
Reference in New Issue
Block a user