Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
23ed6c4ec0
@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#define UNUSED_PINS
|
||||
|
||||
/* COL2ROW, ROW2COL*/
|
||||
#define DIODE_DIRECTION ROW2COL // the current flows into the rows and then out of the columns
|
||||
#define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative.
|
||||
|
||||
/* define whiche Pins to use for the status LEDs*/
|
||||
#define LED_CAPS_LOCK_PIN D4
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"url": "https://github.com/YangPiCui/ErgonomicVerticalKeyboard",
|
||||
"maintainer": "YangPiCui",
|
||||
"width": 22.75,
|
||||
"height": 7.5,
|
||||
"height": 8,
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
@ -60,12 +60,10 @@
|
||||
{"label":"k3C", "x":2.5, "y":3.75, "w":1.25, "h":1.25},
|
||||
{"label":"k3D", "x":3.75, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3E", "x":5, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3F", "x":6.75, "y":4.5, "w":1.25, "h":1.25},
|
||||
{"label":"k3G", "x":8.75, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3H", "x":10, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3I", "x":11.25, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3J", "x":12.5, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3K", "x":14.75, "y":4.5, "w":1.25, "h":1.25},
|
||||
{"label":"k3L", "x":16.5, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3M", "x":17.75, "y":4, "w":1.25, "h":1.25},
|
||||
{"label":"k3N", "x":19, "y":3.75, "w":1.25, "h":1.25},
|
||||
@ -75,27 +73,31 @@
|
||||
{"label":"k4B", "x":1.25, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4C", "x":2.5, "y":5, "w":1.25, "h":1.25},
|
||||
{"label":"k4D", "x":3.75, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4E", "x":5.5, "y":5.75, "w":1.25, "h":1.25},
|
||||
{"label":"k4F", "x":6.75, "y":5.75, "w":1.25, "h":1.25},
|
||||
{"label":"k4E", "x":5, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4F", "x":6.5, "y":5.5, "w":1.25, "h":1.25},
|
||||
{"label":"k4G", "x":8.75, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4H", "x":10, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4I", "x":11.25, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4J", "x":12.5, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4K", "x":14.75, "y":5.75, "w":1.25, "h":1.25},
|
||||
{"label":"k4L", "x":16, "y":5.75, "w":1.25, "h":1.25},
|
||||
{"label":"k4K", "x":15, "y":5.5, "w":1.25, "h":1.25},
|
||||
{"label":"k4L", "x":16.5, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4M", "x":17.75, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4N", "x":19, "y":5, "w":1.25, "h":1.25},
|
||||
{"label":"k4O", "x":20.25, "y":5.25, "w":1.25, "h":1.25},
|
||||
{"label":"k4P", "x":21.5, "y":5.5, "w":1.25, "h":1.25},
|
||||
{"label":"k5B", "x":1.25, "y":6.5, "w":1.25, "h":1.25},
|
||||
{"label":"k5C", "x":2.5, "y":6.25, "w":1.25, "h":1.25},
|
||||
{"label":"k5E", "x":5.25, "y":6.75, "w":1.25, "h":1.25},
|
||||
{"label":"k5F", "x":6.55, "y":6.75, "w":1.25, "h":1.25},
|
||||
{"label":"k5G", "x":8.75, "y":6.5, "w":1.25, "h":1.25},
|
||||
{"label":"k5H", "x":10, "y":6.5, "w":1.25, "h":1.25},
|
||||
{"label":"k5I", "x":11.25, "y":6.5, "w":1.25, "h":1.25},
|
||||
{"label":"k5J", "x":12.5, "y":6.5, "w":1.25, "h":1.25},
|
||||
{"label":"k5K", "x":15, "y":6.75, "w":1.25, "h":1.25},
|
||||
{"label":"k5L", "x":16.25, "y":6.75, "w":1.25, "h":1.25},
|
||||
{"label":"k5N", "x":19, "y":6.25, "w":1.25, "h":1.25},
|
||||
{"label":"k5O", "x":20.25, "y":6.5, "w":1.25, "h":1.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,19 +16,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(/* Base Layer (0th Layer) - default Layout */
|
||||
KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, TG(1), KC_PSCR, KC_INS, KC_APP, KC_CAPS, KC_6, KC_7, KC_8, KC_9, KC_0,
|
||||
KC_Q, KC_H, KC_R, KC_F, KC_X, KC_LBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_RBRC, KC_BSPC, KC_Y, KC_O, KC_U, KC_J,
|
||||
KC_L, KC_S, KC_N, KC_T, KC_D, KC_END, KC_F5, KC_F6, KC_F7, KC_F8, KC_DEL, KC_P, KC_I, KC_A, KC_E, KC_K,
|
||||
KC_Z, KC_M, KC_C, KC_V, KC_B, KC_LCTL, KC_F9, KC_F10, KC_F11, KC_F12, KC_RCTL, KC_W, KC_G, KC_COMM, KC_DOT, KC_ENT,
|
||||
KC_LALT, KC_MINS, KC_EQL, KC_TAB, KC_SPC, KC_LGUI, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_RGUI, KC_SPC, KC_QUOT, KC_SCLN, KC_SLSH, KC_RALT,
|
||||
KC_LSFT, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSLS, KC_RSFT
|
||||
),
|
||||
[1] = LAYOUT(/* 1st Layer - Numpad Keys */
|
||||
_______, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PEQL, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, KC_P0, KC_P0, KC_PDOT, KC_PENT, _______, _______
|
||||
)
|
||||
KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, TG(1), KC_PSCR, KC_INS, KC_APP, KC_CAPS, KC_6, KC_7, KC_8, KC_9, KC_0,
|
||||
KC_Q, KC_H, KC_R, KC_F, KC_X, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_PGDN, KC_QUOT, KC_Y, KC_O, KC_U, KC_J,
|
||||
KC_L, KC_S, KC_N, KC_T, KC_D, KC_LBRC, KC_F5, KC_F6, KC_F7, KC_F8, KC_RBRC, KC_P, KC_I, KC_A, KC_E, KC_K,
|
||||
KC_Z, KC_M, KC_C, KC_V, KC_B, KC_F9, KC_F10, KC_F11, KC_F12, KC_W, KC_G, KC_COMM, KC_DOT, KC_ENT,
|
||||
KC_LALT, KC_MINS, KC_EQL, KC_END, KC_GRV, KC_LCTL, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_RCTL, KC_BSLS, KC_TAB, KC_SCLN, KC_SLSH, KC_RALT,
|
||||
KC_LSFT, KC_DEL, KC_SPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RGUI, KC_SPC, KC_BSPC, KC_RSFT
|
||||
),
|
||||
[1] = LAYOUT(/* 1st Layer - Numpad Keys */
|
||||
_______, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PEQL, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, KC_P0, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______, _______
|
||||
)
|
||||
};
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* Keyboard Maintainer: [YangPiCui](https://github.com/YangPiCui)
|
||||
* Hardware Supported: Ergonomic Vertical Keyboard (EVK) version 1.3 with Teensy 2.0
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make handwired/evk/v1_3:default
|
||||
|
||||
|
||||
@ -27,17 +27,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
#define LAYOUT(\
|
||||
k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P, \
|
||||
k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P, \
|
||||
k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P, \
|
||||
k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, k3J, k3K, k3L, k3M, k3N, k3O, k3P, \
|
||||
k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P, \
|
||||
k5B, k5C, k5G, k5H, k5I, k5J, k5N, k5O \
|
||||
k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P, \
|
||||
k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P, \
|
||||
k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P, \
|
||||
k3A, k3B, k3C, k3D, k3E, k3G, k3H, k3I, k3J, k3L, k3M, k3N, k3O, k3P, \
|
||||
k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P, \
|
||||
k5B, k5C, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, k5N, k5O \
|
||||
) { \
|
||||
{ k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P }, \
|
||||
{ k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P }, \
|
||||
{ k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P }, \
|
||||
{ k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, k3J, k3K, k3L, k3M, k3N, k3O, k3P }, \
|
||||
{ k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P }, \
|
||||
{ XXX, k5B, k5C, XXX, XXX, XXX, k5G, k5H, k5I, k5J, XXX, XXX, XXX, k5N, k5O, XXX } \
|
||||
{ k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H, k3I, k3J, XXX, k3L, k3M, k3N, k3O, k3P }, \
|
||||
{ k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P }, \
|
||||
{ XXX, k5B, k5C, XXX, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, XXX, k5N, k5O, XXX } \
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user