From 2c04293a966ea6be3cd01b9d3a14afcf3b50bf12 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 19 Dec 2019 17:05:14 -0700 Subject: [PATCH] Finish layout --- .../system76/virgo/keymaps/default/keymap.c | 2 +- keyboards/system76/virgo/virgo.c | 2 +- keyboards/system76/virgo/virgo.h | 32 ++++++++----------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/keyboards/system76/virgo/keymaps/default/keymap.c b/keyboards/system76/virgo/keymaps/default/keymap.c index 2c9ecd1e1f2..2dcd1714f1f 100644 --- a/keyboards/system76/virgo/keymaps/default/keymap.c +++ b/keyboards/system76/virgo/keymaps/default/keymap.c @@ -30,7 +30,7 @@ ________________________________________________________________________________ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_NONE, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_NONE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, + KC_LCTL, KC_NO, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ) }; diff --git a/keyboards/system76/virgo/virgo.c b/keyboards/system76/virgo/virgo.c index 44e813586bf..5f16c147918 100644 --- a/keyboards/system76/virgo/virgo.c +++ b/keyboards/system76/virgo/virgo.c @@ -1 +1 @@ -#include "melody96.h" +#include "virgo.h" diff --git a/keyboards/system76/virgo/virgo.h b/keyboards/system76/virgo/virgo.h index b4db40c0b42..0e37d2227f1 100644 --- a/keyboards/system76/virgo/virgo.h +++ b/keyboards/system76/virgo/virgo.h @@ -2,24 +2,20 @@ #include "quantum.h" +#define ___ KC_NO + #define LAYOUT( \ - K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, - K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, - K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, - K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, - K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, - K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, K00, + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, \ + K50, K51, K52, K53, K54, K56, K57, K58, K59, K5B, K5C, K5D \ ) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ - { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ - { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \ - { K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \ - { K050, K051, K052, K053, K054, K055, K056, K057, K058 }, \ - { K060, K061, K062, K063, K064, K00, K066, K00, KC_NO }, \ - { K070, K071, K072, K073, K074, K075, K076, K077, K078 }, \ - { K080, K081, K082, K00, K084, K085, K086, K087, K088 }, \ - { K090, K091, K092, K093, K094, K095, K096, K097, K098 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108 }, \ - { K110, K111, K112, K113, K114, K115, K116, K117, K118 } \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___ }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___ }, \ + { K50, K51, K52, K53, K54, ___, K56, K57, K58, K59, ___, K5B, K5C, K5D, ___ }, \ }