ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2024-06-29 09:27:40 +00:00
commit 3e4159bc55
9 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
keyboards/jels/boaty/keyboard.json
View file

@ -29,8 +29,11 @@
"rows": ["D6", "B0", "D7", "B5", "B3", "B4", "B2"]
},
"diode_direction": "COL2ROW",
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
"layouts": {
"LAYOUT_all": {
"LAYOUT": {
"layout": [
{"label": "Num Lock", "matrix": [2, 10], "x": 6.75, "y": 0},
{"label": "-", "matrix": [1, 10], "x": 6.75, "y": 1},

4
keyboards/jels/boaty/keymaps/default/keymap.c
View file

@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//base layer
[0] = LAYOUT_all(
[0] = LAYOUT(
KC_NUM,
KC_PAST, KC_PSLS,
KC_P7, KC_P8, KC_P9,
@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_1, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT,
KC_LCTL, KC_LALT, KC_SPC, KC_1, KC_RALT, KC_RCTL
),
[1] = LAYOUT_all(
[1] = LAYOUT(
KC_F2,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,

8
keyboards/jels/boaty/keymaps/via/keymap.c
View file

@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//base layer
[0] = LAYOUT_all(
[0] = LAYOUT(
KC_NUM,
KC_PAST, KC_PSLS,
KC_P7, KC_P8, KC_P9,
@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT,
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RCTL
),
[1] = LAYOUT_all(
[1] = LAYOUT(
KC_F2,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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
),
[2] = LAYOUT_all(
[2] = LAYOUT(
KC_F2,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_all(
[3] = LAYOUT(
KC_F2,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,