From 7ec583e5efb276ce90a40a1df985de7d0d0b8f46 Mon Sep 17 00:00:00 2001 From: Jarred Steenvoorden Date: Tue, 23 Jul 2019 17:07:57 +1000 Subject: [PATCH] [Keymap] Jarred's Plaid keymap (#6049) * Add my plaid keymap * Move planck / plaid keymaps to common layout folder --- keyboards/planck/keymaps/jarred/keymap.c | 34 ------------------- keyboards/planck/keymaps/jarred/readme.md | 9 ----- layouts/community/ortho_4x12/jarred/keymap.c | 22 ++++++++++++ layouts/community/ortho_4x12/jarred/readme.md | 22 ++++++++++++ users/jarred/jarred.h | 1 + users/jarred/readme.md | 11 +++++- 6 files changed, 55 insertions(+), 44 deletions(-) delete mode 100644 keyboards/planck/keymaps/jarred/keymap.c delete mode 100644 keyboards/planck/keymaps/jarred/readme.md create mode 100644 layouts/community/ortho_4x12/jarred/keymap.c create mode 100644 layouts/community/ortho_4x12/jarred/readme.md diff --git a/keyboards/planck/keymaps/jarred/keymap.c b/keyboards/planck/keymaps/jarred/keymap.c deleted file mode 100644 index 591166908..000000000 --- a/keyboards/planck/keymaps/jarred/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2018 Jarred Steenvoorden - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "planck.h" -#include "jarred.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QW] = LAYOUT_planck_grid_wrapper(QWERTY_4x12), - [_GAME] = LAYOUT_planck_grid_wrapper(GAME_4x12), - [_LW] = LAYOUT_planck_grid_wrapper(LOWER_4x12), - [_NV] = LAYOUT_planck_grid_wrapper(NAV_4x12), - [_NP] = LAYOUT_planck_grid_wrapper(NUMPAD_4x12), - [_MS] = LAYOUT_planck_grid_wrapper(MOUSE_4x12) -}; - -#ifdef RGB_MATRIX_H -void rgb_matrix_indicators_user(void) { - // Disable light in middle of 2U position - rgb_matrix_set_color(42, 0, 0, 0); -} -#endif diff --git a/keyboards/planck/keymaps/jarred/readme.md b/keyboards/planck/keymaps/jarred/readme.md deleted file mode 100644 index e6be56412..000000000 --- a/keyboards/planck/keymaps/jarred/readme.md +++ /dev/null @@ -1,9 +0,0 @@ -# Jarred's Planck Layout - -Check out [user space readme](../../../../users/jarred/readme.md) for more info - -# Build - -``` -make planck/rev4:jarred:dfu -``` diff --git a/layouts/community/ortho_4x12/jarred/keymap.c b/layouts/community/ortho_4x12/jarred/keymap.c new file mode 100644 index 000000000..4be5f9ed6 --- /dev/null +++ b/layouts/community/ortho_4x12/jarred/keymap.c @@ -0,0 +1,22 @@ +#include QMK_KEYBOARD_H +#include "jarred.h" + +#define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QW] = LAYOUT_ortho_4x12_wrapper(QWERTY_4x12), + [_GAME] = LAYOUT_ortho_4x12_wrapper(GAME_4x12), + [_LW] = LAYOUT_ortho_4x12_wrapper(LOWER_4x12), + [_NV] = LAYOUT_ortho_4x12_wrapper(NAV_4x12), + [_NP] = LAYOUT_ortho_4x12_wrapper(NUMPAD_4x12), + [_MS] = LAYOUT_ortho_4x12_wrapper(MOUSE_4x12) +}; + +#ifdef RGB_MATRIX_ENABLE +void rgb_matrix_indicators_user(void) { + #ifdef KEYBOARD_planck_light + // Disable light in middle of 2U position of Planck Light + rgb_matrix_set_color(42, 0, 0, 0); + #endif +} +#endif diff --git a/layouts/community/ortho_4x12/jarred/readme.md b/layouts/community/ortho_4x12/jarred/readme.md new file mode 100644 index 000000000..05f1ff086 --- /dev/null +++ b/layouts/community/ortho_4x12/jarred/readme.md @@ -0,0 +1,22 @@ +# Jarred's ortho 4x12 keymap + +[User space](../../../../users/jarred/readme.md) + +Boards used on: +- [Planck](../../../../keyboards/planck/readme.md) +- [Plaid](../../../../keyboards/plaid/readme.md) + +# Plaid build notes + +Enter Bootloader: +Press Reset / Press Boot / Release Reset / Release Boot + +Install libusbK driver for usbasp: +https://zadig.akeo.ie/ + +make plaid:jarred:program + +Press Reset + +https://github.com/hsgw/plaid/blob/master/doc/en/bootloader.md +https://github.com/hsgw/plaid/blob/master/doc/en/firmware.md diff --git a/users/jarred/jarred.h b/users/jarred/jarred.h index ae48adb70..49b1253be 100644 --- a/users/jarred/jarred.h +++ b/users/jarred/jarred.h @@ -50,6 +50,7 @@ enum { // Wrappers #define LAYOUT_planck_grid_wrapper(...) LAYOUT_planck_grid(__VA_ARGS__) +#define LAYOUT_plaid_grid_wrapper(...) LAYOUT_plaid_grid(__VA_ARGS__) #define LAYOUT_atreus62_grid_wrapper(...) LAYOUT(__VA_ARGS__) #define LAYOUT_ergotravel_grid_wrapper(...) LAYOUT(__VA_ARGS__) diff --git a/users/jarred/readme.md b/users/jarred/readme.md index 9d4e926e7..e2f44219b 100644 --- a/users/jarred/readme.md +++ b/users/jarred/readme.md @@ -2,4 +2,13 @@ Keymaps: -- [Planck](../../keyboards/planck/keymaps/jarred/readme.md) +- [Ortho 4x12](../../layouts/community/ortho_4x12/jarred/readme.md) + +- [CRKBD](../../keyboards/crkbd/keymaps/jarred/readme.md) +- [Atreus 62](../../keyboards/ergotravel/keymaps/jarred/readme.md) +- [ErgoTravel](../../keyboards/ergotravel/keymaps/jarred/readme.md) +- [xd75](../../keyboards/xd75/keymaps/jarred/readme.md) + +- [satan](../../keyboards/satan/keymaps/jarred/readme.md) +- [dz60](../../keyboards/dz60/keymaps/jarred/readme.md) +- [org60](../../keyboards/org60/keymaps/jarred/readme.md)