1
0
Fork 0

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

This commit is contained in:
QMK Bot 2021-09-28 21:50:02 +00:00
commit 528623eb33
3 changed files with 72 additions and 4 deletions

View file

@ -18,6 +18,28 @@
#include "quantum.h" #include "quantum.h"
#define XXX KC_NO
/*
*
* 00 01 02 03
*
*
* 10 11 12 13
*
* 20 21 22 23
* 23 2u Plus
* 30 31 32 33
*
* 40 41 42 43
* 43 2u Enter
* 50 51 52 53
*
*
* 51 2u 0/Ins
*
*/
#define LAYOUT_ortho_6x4( \ #define LAYOUT_ortho_6x4( \
K00, K01, K02, K03, \ K00, K01, K02, K03, \
K10, K11, K12, K13, \ K10, K11, K12, K13, \
@ -33,3 +55,19 @@
{ K40, K41, K42, K43 }, \ { K40, K41, K42, K43 }, \
{ K50, K51, K52, K53 }, \ { K50, K51, K52, K53 }, \
} }
#define LAYOUT_numpad_6x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, \
K30, K31, K32, K23, \
K40, K41, K42, \
K51, K52, K43 \
) { \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, K23 }, \
{ K30, K31, K32, XXX }, \
{ K40, K41, K42, K43 }, \
{ XXX, K51, K52, XXX }, \
}

View file

@ -1,7 +1,7 @@
{ {
"keyboard_name": "Delphine", "keyboard_name": "Delphine",
"url": "", "url": "",
"maintainer": "Team Mechlovin'", "maintainer": "mechlovin",
"layouts": { "layouts": {
"LAYOUT_ortho_6x4": { "LAYOUT_ortho_6x4": {
"layout": [ "layout": [
@ -30,7 +30,36 @@
{"label":"K52 (D3,D6)", "x":2, "y":5.25}, {"label":"K52 (D3,D6)", "x":2, "y":5.25},
{"label":"K53 (D3,D2)", "x":3, "y":5.25} {"label":"K53 (D3,D2)", "x":3, "y":5.25}
] ]
},
"LAYOUT_numpad_6x4": {
"layout": [
{"label":"K00 (F0,F7)", "x":0, "y":0},
{"label":"K01 (F0,D7)", "x":1, "y":0},
{"label":"K02 (F0,D6)", "x":2, "y":0},
{"label":"K03 (F0,D2)", "x":3, "y":0},
{"label":"K10 (F1,F7)", "x":0, "y":1.25},
{"label":"K11 (F1,D7)", "x":1, "y":1.25},
{"label":"K12 (F1,D6)", "x":2, "y":1.25},
{"label":"K13 (F1,D2)", "x":3, "y":1.25},
{"label":"K20 (F4,F7)", "x":0, "y":2.25},
{"label":"K21 (F4,D7)", "x":1, "y":2.25},
{"label":"K22 (F4,D6)", "x":2, "y":2.25},
{"label":"K30 (F5,F7)", "x":0, "y":3.25},
{"label":"K31 (F5,D7)", "x":1, "y":3.25},
{"label":"K32 (F5,D6)", "x":2, "y":3.25},
{"label":"K23 (F4,D2)", "x":3, "y":2.25, "h":2},
{"label":"K40 (F6,F7)", "x":0, "y":4.25},
{"label":"K41 (F6,D7)", "x":1, "y":4.25},
{"label":"K42 (F6,D6)", "x":2, "y":4.25},
{"label":"K51 (D3,D7)", "x":0, "y":5.25, "w":2},
{"label":"K52 (D3,D6)", "x":2, "y":5.25},
{"label":"K43 (F6,D2)", "x":3, "y":4.25, "h":2}
]
} }
} }
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
} }

View file

@ -20,5 +20,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
LAYOUTS = ortho_6x4 LAYOUTS = numpad_6x4 ortho_6x4
DEFAULT_FOLDER = mechlovin/delphine/mono_led
DEFAULT_FOLDER = mechlovin/delphine/mono_led