From fbc7d86cadb0090fcc7ac9f3c1e187d91150ee6a Mon Sep 17 00:00:00 2001
From: Paul Warren <pwarren@pwarren.id.au>
Date: Mon, 27 Jul 2020 20:16:49 +1000
Subject: [PATCH] fixed a few missed keys, added another layer, fixed bootloadr
 issues

---
 68keys/pwarren/config.h |  2 +-
 68keys/pwarren/keymap.c | 17 ++++++++++++-----
 68keys/pwarren/rules.mk |  4 +++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/68keys/pwarren/config.h b/68keys/pwarren/config.h
index 9ee2422..14e1e25 100644
--- a/68keys/pwarren/config.h
+++ b/68keys/pwarren/config.h
@@ -12,4 +12,4 @@
 #define DEVICE_VER 0x0068
 #define MANUFACTURER 68Keys.io
 #define PRODUCT The 68Keys.io Keyboard
-#define DESCRIPTION A 68 keys mechanical keyboard modded by pwarren
+#define DESCRIPTION A 68 keys mechanical keyboard layout by pwarren
diff --git a/68keys/pwarren/keymap.c b/68keys/pwarren/keymap.c
index 09cd22e..bd9114f 100644
--- a/68keys/pwarren/keymap.c
+++ b/68keys/pwarren/keymap.c
@@ -6,13 +6,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_DEL, KC_PGDN,
     KC_CAPSLOCK, 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_LALT, KC_LGUI, KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-		       ),
+    KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(1), MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+		      ),
  [1] = LAYOUT_68_ansi(
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC,          KC_VOLU, KC_HOME,
+    _______, KC_HOME,   KC_UP,  KC_END, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,   RESET,       KC_VOLD, KC_END,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,  BL_DEC,  BL_INC, BL_TOGG,   BL_ON,  BL_OFF, _______, _______, _______, _______, _______,                   _______,          KC_MUTE,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
+		      ),
+ [2] = LAYOUT_68_ansi(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC,          KC_VOLU, KC_HOME,
     _______, _______, KC_HOME,   KC_UP,  KC_END, _______, _______, _______, _______, _______, _______, _______, BL_STEP,   RESET,          KC_VOLD, KC_END,
     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______,  BL_DEC,  BL_INC, BL_TOGG,   BL_ON,  BL_OFF, _______, _______, _______, _______, _______,                   _______,          KC_MUTE,
-    _______, _______, _______,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
-			    ),
+    _______,  BL_DEC,  BL_INC, BL_TOGG,   BL_ON,  BL_OFF, _______, _______, _______, _______, _______,                   KC_MS_BTN2,          KC_MS_UP,
+    _______, _______, _______,                            _______,                            _______, _______, KC_MS_BTN1,          KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT
+		      ),
 };
diff --git a/68keys/pwarren/rules.mk b/68keys/pwarren/rules.mk
index be3b779..ec1e7db 100644
--- a/68keys/pwarren/rules.mk
+++ b/68keys/pwarren/rules.mk
@@ -1,4 +1,6 @@
-BOOTLOADER = avrdude
+BOOTLOADER = caterina
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = yes
 BACKLIGHT_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+