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

Dilly: Refactor and Configurator support (#3134)

Browse Source 
* Refactor

* Configurator support

* Add LAYOUT_ortho_3x10 to default QMK layouts

* Refactor Dilly to use LAYOUT_ortho_3x10
This commit is contained in:
noroadsleft 2018-06-06 11:12:42 -07:00 committed by Drashna Jaelre
parent d86410103f
commit afa0a8d6f7
9 changed files with 76 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyboards/dilly/dilly.h
View File

@ -3,7 +3,7 @@
#include "quantum.h" #include "quantum.h"
#define KEYMAP( \ #define LAYOUT_ortho_3x10( \
A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, \ A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, \
B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, \ B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, \
C1, C2, C3, C4, C5, C6, C7, C8, C9, C10 \ C1, C2, C3, C4, C5, C6, C7, C8, C9, C10 \
@ -17,12 +17,12 @@
} }
// Used to create a keymap using only KC_ prefixed keys // Used to create a keymap using only KC_ prefixed keys
#define KC_KEYMAP( \ #define LAYOUT_kc( \
A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, \ A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, \
B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, \ B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, \
C1, C2, C3, C4, C5, C6, C7, C8, C9, C10 \ C1, C2, C3, C4, C5, C6, C7, C8, C9, C10 \
) \ ) \
KEYMAP( \ LAYOUT_ortho_3x10( \
KC_##A1, KC_##A2, KC_##A3, KC_##A4, KC_##A5, KC_##A6, KC_##A7, KC_##A8, KC_##A9, KC_##A10, \ KC_##A1, KC_##A2, KC_##A3, KC_##A4, KC_##A5, KC_##A6, KC_##A7, KC_##A8, KC_##A9, KC_##A10, \
KC_##B1, KC_##B2, KC_##B3, KC_##B4, KC_##B5, KC_##B6, KC_##B7, KC_##B8, KC_##B9, KC_##B10, \ KC_##B1, KC_##B2, KC_##B3, KC_##B4, KC_##B5, KC_##B6, KC_##B7, KC_##B8, KC_##B9, KC_##B10, \
KC_##C1, KC_##C2, KC_##C3, KC_##C4, KC_##C5, KC_##C6, KC_##C7, KC_##C8, KC_##C9, KC_##C10 \ KC_##C1, KC_##C2, KC_##C3, KC_##C4, KC_##C5, KC_##C6, KC_##C7, KC_##C8, KC_##C9, KC_##C10 \

13
keyboards/dilly/info.json Normal file
View File

@ -0,0 +1,13 @@
{
"keyboard_name": "Dilly",
"url": "",
"maintainer": "qmk",
"width": 10,
"height": 3,
"layouts": {
"LAYOUT_ortho_3x10": {
"key_count": 30,
"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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
}
}
}

88
keyboards/dilly/keymaps/default/keymap.c
View File

@ -1,5 +1,4 @@
#include "dilly.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -10,7 +9,6 @@ extern keymap_config_t keymap_config;
#define _FN4 4 #define _FN4 4
#define _FN5 5 #define _FN5 5
#define KC_ KC_TRNS
#define _______ KC_TRNS #define _______ KC_TRNS
// Tap-Hold keys // Tap-Hold keys
@ -30,78 +28,42 @@ extern keymap_config_t keymap_config;
#define KC_GUIC LGUI(KC_C) #define KC_GUIC LGUI(KC_C)
#define KC_RST RESET
#define KC_BL_S BL_STEP
#define KC_DBUG DEBUG
#define KC_RTOG RGB_TOG
#define KC_RMOD RGB_MOD
#define KC_RHUI RGB_HUI
#define KC_RHUD RGB_HUD
#define KC_RSAI RGB_SAI
#define KC_RSAD RGB_SAD
#define KC_RVAI RGB_VAI
#define KC_RVAD RGB_VAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KC_KEYMAP( [_BASE] = LAYOUT_ortho_3x10(
//,----+----+----+----+----+----+----+----+----+----. KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
Q , W , E , R , T , Y , U , I , O , P , KC_ASFT, KC_S, KC_D, KC_F_L3, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESCS,
//|----+----+----+----+----+----+----+----+----+----| KC_ZCTL, KC_XALT, KC_CGUI, KC_V_L4, KC_SPL2, KC_B_L1, KC_N_L5, KC_MALT, KC_BSCT, KC_ENTS
ASFT, S , D ,F_L3, G , H , J , K , L ,ESCS,
//|----+----+----+----+----+----+----+----+----+----|
ZCTL,XALT,CGUI,V_L4,SPL2,B_L1,N_L5,MALT,BSCT,ENTS
//`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN1] = KC_KEYMAP( [_FN1] = LAYOUT_ortho_3x10(
//,----+----+----+----+----+----+----+----+----+----. KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
//|----+----+----+----+----+----+----+----+----+----| _______, _______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______
F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
//|----+----+----+----+----+----+----+----+----+----|
, , , ,BSPC, , , , ,
//`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN2] = KC_KEYMAP( [_FN2] = LAYOUT_ortho_3x10(
//,----+----+----+----+----+----+----+----+----+----. KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_GRV,
//|----+----+----+----+----+----+----+----+----+----| _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______
F11 ,F12 , , , , , , , ,GRV ,
//|----+----+----+----+----+----+----+----+----+----|
, , , , ,DEL , , , ,
//`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN3] = KC_KEYMAP( [_FN3] = LAYOUT_ortho_3x10(
//,----+----+----+----+----+----+----+----+----+----. _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
, , , , ,MINS,EQL ,LBRC,RBRC,BSLS, KC_TAB, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT,
//|----+----+----+----+----+----+----+----+----+----| _______, _______, _______, _______, KC_BSPC, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
TAB , , , , ,COMM,DOT ,SLSH,SCLN,QUOT,
//|----+----+----+----+----+----+----+----+----+----|
, , , ,BSPC, ,LEFT,DOWN, UP ,RGHT
//`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN4] = KC_KEYMAP( [_FN4] = LAYOUT_ortho_3x10(
//,----+----+----+----+----+----+----+----+----+----. _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
, , , , ,UNDS,PLUS,LCBR,RCBR,PIPE, KC_TAB, _______, _______, _______, _______, KC_LT, KC_GT, KC_QUES, KC_COLN, KC_DQUO,
//|----+----+----+----+----+----+----+----+----+----| _______, _______, KC_GUIC, _______, KC_BSPC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
TAB , , , , , LT , GT ,QUES,COLN,DQUO,
//|----+----+----+----+----+----+----+----+----+----|
, ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END
//`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN5] = KC_KEYMAP( [_FN5] = LAYOUT_ortho_3x10(
//,----+----+----+----+----+----+----+----+----+----. RGB_TOG, RGB_MOD, _______, RESET, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
RTOG,RMOD, ,RST ,RHUI,RSAI,RVAI, , , , _______, _______, DEBUG, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
//|----+----+----+----+----+----+----+----+----+----| BL_STEP, _______, KC_GUIC, _______, _______, _______, _______, _______, _______, _______
, ,DBUG, ,RHUD,RSAD,RVAD, , , ,
//|----+----+----+----+----+----+----+----+----+----|
BL_S, ,GUIC, , , , , , ,
//`----+----+----+----+----+----+----+----+----+----'
) )
}; };

21
keyboards/dilly/keymaps/delmo/keymap.c
View File

@ -1,5 +1,4 @@
#include "dilly.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -44,7 +43,7 @@ extern keymap_config_t keymap_config;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KC_KEYMAP( [_BASE] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
Q , W , E , R , T , Y , U , I , O , P , Q , W , E , R , T , Y , U , I , O , P ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -54,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN1] = KC_KEYMAP( [_FN1] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -64,17 +63,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN2] = KC_KEYMAP( [_FN2] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
F11 ,F12 , , , , , , , ,GRV , F11 ,F12 , , , , , , , ,GRV ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
, , , ,DEL , , , , , , , , ,DEL , , , , ,
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN3] = KC_KEYMAP( [_FN3] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
ESC , , , , ,MINS,EQL ,LBRC,RBRC,BSLS, ESC , , , , ,MINS,EQL ,LBRC,RBRC,BSLS,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -84,23 +83,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN4] = KC_KEYMAP( [_FN4] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
, , , , ,UNDS,PLUS,LCBR,RCBR,PIPE, , , , , ,UNDS,PLUS,LCBR,RCBR,PIPE,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
TAB , , , , , LT , GT ,QUES,COLN,DQUO, TAB , , , , , LT , GT ,QUES,COLN,DQUO,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
, ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN5] = KC_KEYMAP( [_FN5] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
RTOG,RMOD, ,RST ,RHUI,RSAI,RVAI, , , , RTOG,RMOD, ,RST ,RHUI,RSAI,RVAI, , , ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
, ,DBUG, ,RHUD,RSAD,RVAD, , , , , ,DBUG, ,RHUD,RSAD,RVAD, , , ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
BL_S, ,GUIC, , , , , , , BL_S, ,GUIC, , , , , , ,
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
) )

15
keyboards/dilly/keymaps/pletcher/keymap.c
View File

@ -1,5 +1,4 @@
#include "dilly.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -34,7 +33,7 @@ extern keymap_config_t keymap_config;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KC_KEYMAP( [_BASE] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
Q , W , E , R , T , Y , U , I , O , P , Q , W , E , R , T , Y , U , I , O , P ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -44,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN1] = KC_KEYMAP( [_FN1] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -54,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN2] = KC_KEYMAP( [_FN2] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN, EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -64,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN3] = KC_KEYMAP( [_FN3] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
, , , , ,MINS,EQL ,LBRC,RBRC,BSLS, , , , , ,MINS,EQL ,LBRC,RBRC,BSLS,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -74,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN4] = KC_KEYMAP( [_FN4] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
, , , , ,UNDS,PLUS,LCBR,RCBR,PIPE, , , , , ,UNDS,PLUS,LCBR,RCBR,PIPE,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|
@ -84,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----' //`----+----+----+----+----+----+----+----+----+----'
), ),
[_FN5] = KC_KEYMAP( [_FN5] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----. //,----+----+----+----+----+----+----+----+----+----.
, , ,RST , , ,MSTP,VOLD,VOLU,MPLY, , , ,RST , , ,MSTP,VOLD,VOLU,MPLY,
//|----+----+----+----+----+----+----+----+----+----| //|----+----+----+----+----+----+----+----+----+----|

4
keyboards/dilly/rules.mk
View File

@ -53,4 +53,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
LAYOUTS = ortho_3x10

9
layouts/default/ortho_3x10/default_ortho_3x10/keymap.c Normal file
View File

@ -0,0 +1,9 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_3x10(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
)
};

3
layouts/default/ortho_3x10/layout.json Normal file
View File

@ -0,0 +1,3 @@
["","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""]

3
layouts/default/ortho_3x10/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_3x10
LAYOUT_ortho_3x10