diff options
author | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
commit | 0a3f7e48690bb2b7b008300a54554979a55be19a (patch) | |
tree | 7499d52f20040ed7d5a56496ecb81ed114f80719 /keyboards/maple_computing/launchpad | |
parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/maple_computing/launchpad')
-rw-r--r-- | keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/maple_computing/launchpad/rev1/config.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c index 1ef77ccc6e..6fc28dccc2 100644 --- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c @@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └──────┴──────┘ */ [_ADJUST] = LAYOUT( \ - QM_MAKE, RESET, \ + QM_MAKE, QK_BOOT, \ DF_REDR, DF_MEDA, \ DF_NAVI, DF_KBNR, \ TG_LGHT, XXXXXXX \ diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index 54a67caaed..427e04618c 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { C6, B1, B3, D7 } #define MATRIX_COL_PINS { D2, F7 } -#define UNUSED_PINS #define DIODE_DIRECTION COL2ROW |