masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
QMK Bot 2022-08-04 00:22:37 +00:00
parent 42a36a2095 5a631ed9ac
commit 4e50de3a4b
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/balloondogcaps/tr90/info.json
View File

@ -23,8 +23,11 @@
"pid": "0x0001", "pid": "0x0001",
"vid": "0x4243" "vid": "0x4243"
}, },
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_3x3"
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_ortho_3x3": {
"layout": [ "layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 },

4
keyboards/balloondogcaps/tr90/keymaps/default/keymap.c
View File

@ -16,12 +16,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */ [0] = LAYOUT_ortho_3x3( /* Base */
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_VOLD, KC_VOLU, MO(1) KC_VOLD, KC_VOLU, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,
KC_0, KC_MINUS, KC_PLUS, KC_0, KC_MINUS, KC_PLUS,
RESET, KC_AT , KC_TRNS RESET, KC_AT , KC_TRNS

8
keyboards/balloondogcaps/tr90/keymaps/via/keymap.c
View File

@ -16,22 +16,22 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */ [0] = LAYOUT_ortho_3x3( /* Base */
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_VOLD, KC_VOLU, MO(1) KC_VOLD, KC_VOLU, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,
KC_0, KC_MINUS, KC_PLUS, KC_0, KC_MINUS, KC_PLUS,
RESET, KC_AT , KC_TRNS RESET, KC_AT , KC_TRNS
), ),
[2] = LAYOUT( [2] = LAYOUT_ortho_3x3(
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( [3] = LAYOUT_ortho_3x3(
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

5
keyboards/balloondogcaps/tr90pm/info.json
View File

@ -23,8 +23,11 @@
"pid": "0x0002", "pid": "0x0002",
"vid": "0x4243" "vid": "0x4243"
}, },
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_3x3"
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_ortho_3x3": {
"layout": [ "layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 },

4
keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c
View File

@ -16,12 +16,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */ [0] = LAYOUT_ortho_3x3( /* Base */
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_VOLD, KC_VOLU, MO(1) KC_VOLD, KC_VOLU, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,
KC_0, KC_MINUS, KC_PLUS, KC_0, KC_MINUS, KC_PLUS,
RESET, KC_AT , KC_TRNS RESET, KC_AT , KC_TRNS

8
keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c
View File

@ -16,22 +16,22 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */ [0] = LAYOUT_ortho_3x3( /* Base */
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_VOLD, KC_VOLU, MO(1) KC_VOLD, KC_VOLU, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,
KC_0, KC_MINUS, KC_PLUS, KC_0, KC_MINUS, KC_PLUS,
RESET, KC_AT , KC_TRNS RESET, KC_AT , KC_TRNS
), ),
[2] = LAYOUT( [2] = LAYOUT_ortho_3x3(
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( [3] = LAYOUT_ortho_3x3(
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