mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-27 02:56:33 +06:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
65326f7d1f
|
@ -19,12 +19,11 @@
|
|||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define VENDOR_ID 0x4B47 // KG
|
||||
#define PRODUCT_ID 0x0000
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER MrT1ddl3s
|
||||
#define PRODUCT knobgoblin
|
||||
|
||||
#define PRODUCT Knob Goblin
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 5
|
||||
|
@ -43,3 +42,7 @@
|
|||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
#define DEBOUNCE 2
|
||||
|
||||
/*Bootmagic position definition because (0,0) is not used*/
|
||||
#define BOOTMAGIC_LITE_ROW 0
|
||||
#define BOOTMAGIC_LITE_COLUMN 1
|
||||
|
|
|
@ -8,32 +8,33 @@
|
|||
"LAYOUT_ortho": {
|
||||
"layout": [
|
||||
|
||||
{"x": 1, "y": 0},
|
||||
{"x": 2, "y": 0},
|
||||
{"x": 3, "y": 0},
|
||||
{"x": 4, "y": 0},
|
||||
{"Label": "F17", "x": 1, "y": 0},
|
||||
{"Label": "F18", "x": 2, "y": 0},
|
||||
{"Label": "F19", "x": 3, "y": 0},
|
||||
{"Label": "F20", "x": 4, "y": 0},
|
||||
|
||||
{"x": 1, "y": 1},
|
||||
{"x": 2, "y": 1},
|
||||
{"x": 3, "y": 1},
|
||||
{"x": 4, "y": 1},
|
||||
{"Label": "F13", "x": 1, "y": 1},
|
||||
{"Label": "F14", "x": 2, "y": 1},
|
||||
{"Label": "F15", "x": 3, "y": 1},
|
||||
{"Label": "F16", "x": 4, "y": 1},
|
||||
|
||||
{"x": 1, "y": 2},
|
||||
{"x": 2, "y": 2},
|
||||
{"x": 3, "y": 2},
|
||||
{"x": 4, "y": 2},
|
||||
{"Label": "F9", "x": 1, "y": 2},
|
||||
{"Label": "F10", "x": 2, "y": 2},
|
||||
{"Label": "F11", "x": 3, "y": 2},
|
||||
{"Label": "F12", "x": 4, "y": 2},
|
||||
|
||||
{"x": 0, "y": 3},
|
||||
{"x": 1, "y": 3},
|
||||
{"x": 2, "y": 3},
|
||||
{"x": 3, "y": 3},
|
||||
{"x": 4, "y": 3},
|
||||
{"Label": "K2", "x": 0, "y": 3},
|
||||
{"Label": "F5", "x": 1, "y": 3},
|
||||
{"Label": "F6", "x": 2, "y": 3},
|
||||
{"Label": "F7", "x": 3, "y": 3},
|
||||
{"Label": "F8", "x": 4, "y": 3},
|
||||
|
||||
{"Label": "K1", "x": 0, "y": 4},
|
||||
{"Label": "F1", "x": 1, "y": 4},
|
||||
{"Label": "F2", "x": 2, "y": 4},
|
||||
{"Label": "F3", "x": 3, "y": 4},
|
||||
{"Label": "F4", "x": 4, "y": 4}
|
||||
|
||||
{"x": 0, "y": 4},
|
||||
{"x": 1, "y": 4},
|
||||
{"x": 2, "y": 4},
|
||||
{"x": 3, "y": 4},
|
||||
{"x": 4, "y": 4}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,12 +25,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_MPLY, KC_P1, KC_P2, KC_P3, KC_PENT,
|
||||
KC_MUTE, MO(1), KC_P0, KC_PDOT, KC_PENT
|
||||
),
|
||||
|
||||
|
||||
[1] = LAYOUT_ortho(
|
||||
KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_HOME, KC_TRNS, KC_PGUP, KC_TRNS,
|
||||
KC_END , KC_UP, KC_PGDN, KC_TRNS,
|
||||
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_SPC,
|
||||
KC_TRNS, KC_TRNS, KC_BSPC, KC_DEL, KC_TRNS
|
||||
)
|
||||
|
||||
)
|
||||
};
|
||||
|
|
53
keyboards/knobgoblin/keymaps/via/keymap.c
Normal file
53
keyboards/knobgoblin/keymaps/via/keymap.c
Normal file
|
@ -0,0 +1,53 @@
|
|||
/* Copyright 2020 MrT1ddl3s
|
||||
*
|
||||
* 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
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
[0] = LAYOUT_ortho(
|
||||
KC_EQL, KC_PSLS, KC_PAST, KC_PMNS,
|
||||
KC_P7, KC_P8, KC_P9, KC_PPLS,
|
||||
KC_P4, KC_P5, KC_P6, KC_PPLS,
|
||||
KC_MPLY, KC_P1, KC_P2, KC_P3, KC_PENT,
|
||||
KC_MUTE, MO(1), KC_P0, KC_PDOT, KC_PENT
|
||||
),
|
||||
|
||||
[1] = LAYOUT_ortho(
|
||||
KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_HOME, KC_TRNS, KC_PGUP, KC_TRNS,
|
||||
KC_END , KC_UP, KC_PGDN, KC_TRNS,
|
||||
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_SPC,
|
||||
KC_TRNS, KC_TRNS, KC_BSPC, KC_DEL, KC_TRNS
|
||||
),
|
||||
|
||||
[2] = LAYOUT_ortho(
|
||||
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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
|
||||
[3] = LAYOUT_ortho(
|
||||
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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
)
|
||||
|
||||
};
|
3
keyboards/knobgoblin/keymaps/via/readme.md
Normal file
3
keyboards/knobgoblin/keymaps/via/readme.md
Normal file
|
@ -0,0 +1,3 @@
|
|||
# Ortho Knob Goblin Layout
|
||||
|
||||
Via functionality for the Knob Goblin. Ortho layout.
|
2
keyboards/knobgoblin/keymaps/via/rules.mk
Normal file
2
keyboards/knobgoblin/keymaps/via/rules.mk
Normal file
|
@ -0,0 +1,2 @@
|
|||
VIA_ENABLE = YES
|
||||
LTO_ENABLE = YES
|
|
@ -74,22 +74,29 @@ static void render_goblin_logo(void) {
|
|||
__attribute__((weak)) void oled_task_user(void) {
|
||||
|
||||
render_goblin_logo();
|
||||
|
||||
oled_set_cursor(0,11);
|
||||
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 0:
|
||||
oled_set_cursor(0,11);
|
||||
oled_advance_char();
|
||||
oled_write_P(PSTR("ONE\n"), false);
|
||||
oled_write_P(PSTR(" ONE\n"), false);
|
||||
break;
|
||||
case 1:
|
||||
oled_set_cursor(0,11);
|
||||
oled_advance_char();
|
||||
oled_write_P(PSTR("TWO\n"), false);
|
||||
oled_write_P(PSTR(" TWO\n"), false);
|
||||
break;
|
||||
case 2:
|
||||
oled_set_cursor(0,11);
|
||||
oled_write_P(PSTR("THREE\n"), false);
|
||||
break;
|
||||
case 3:
|
||||
oled_write_P(PSTR(" FOUR\n"), false);
|
||||
break;
|
||||
case 4:
|
||||
oled_write_P(PSTR(" FIVE\n"), false);
|
||||
break;
|
||||
case 5:
|
||||
oled_write_P(PSTR(" SIX\n"), false);
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
# KNOBGOBLIN
|
||||
|
||||
![Knob Goblin](https://i.imgur.com/oYnzqqNl.jpg)
|
||||
![Knob Goblin](https://i.imgur.com/oYnzqqN.jpg)
|
||||
|
||||
A 5x4 numpad with 2x rotary encoder and OLED support.
|
||||
|
||||
* Keyboard Maintainer: [MrT1ddl3s](https://github.com/mrT1ddl3s)
|
||||
* Hardware Supported: knobgoblin PCB
|
||||
* Hardware Availability: Occasional group buy.[knobgoblin.xyz](https://knobgoblin.xyz)
|
||||
* Hardware Availability: Occasional group buy - [knob-goblin.com](https://knob-goblin.com)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ BOOTLOADER = caterina
|
|||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
||||
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
|
||||
MOUSEKEY_ENABLE = no # Mouse keys
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||
CONSOLE_ENABLE = yes # Console for debug
|
||||
|
|
Loading…
Reference in New Issue
Block a user