From b60560de1abde0a84b5fe2dbbf99986acf1276da Mon Sep 17 00:00:00 2001
From: Peter Peterson <ppeterson@noao.edu>
Date: Wed, 3 Jan 2018 12:26:25 -0700
Subject: [PATCH 01/18] WIP working on new keymap

---
 keyboards/xd75/keymaps/ipetepete/config.h  |  24 +++++
 keyboards/xd75/keymaps/ipetepete/keymap.c  | 116 +++++++++++++++++++++
 keyboards/xd75/keymaps/ipetepete/readme.md |   1 +
 keyboards/xd75/keymaps/ipetepete/rules.mk  |  18 ++++
 4 files changed, 159 insertions(+)
 create mode 100644 keyboards/xd75/keymaps/ipetepete/config.h
 create mode 100644 keyboards/xd75/keymaps/ipetepete/keymap.c
 create mode 100644 keyboards/xd75/keymaps/ipetepete/readme.md
 create mode 100644 keyboards/xd75/keymaps/ipetepete/rules.mk

diff --git a/keyboards/xd75/keymaps/ipetepete/config.h b/keyboards/xd75/keymaps/ipetepete/config.h
new file mode 100644
index 000000000000..015377b5f8f7
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2017 Benjamin Kesselring
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// place overrides here
+
+#endif
diff --git a/keyboards/xd75/keymaps/ipetepete/keymap.c b/keyboards/xd75/keymaps/ipetepete/keymap.c
new file mode 100644
index 000000000000..9193278ab8cf
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/keymap.c
@@ -0,0 +1,116 @@
+/* Copyright 2017 Wunder
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include "xd75.h"
+
+#define ESCCTRL CTL_T(KC_ESC)
+#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
+#define HYPER MT(MOD_HYPR, KC_ENT)
+#define ENTSFT SFT_T(KC_ENT)
+#define APPTOG LGUI(KC_TAB) // toggles last two apps used
+#define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
+#define SPCRGT LCTL(KC_RGHT) // Switch workspaces
+#define SPCLFT LCTL(KC_LEFT)
+
+#define _______ KC_TRANS
+#define XXXXXXX KC_NO
+
+// Layer shorthand
+enum layers{
+  _QWERTY = 0,
+  _FUNC,
+  _UPPER,
+  _LOWER,
+  _SPCFN
+};
+
+enum keycodes{
+  QWERTY = 0,
+  FUNC,
+  UPPER,
+  LOWER,
+  SPCFN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* QWERTY
+ * .--------------------------------------------------------------------------------------------------------------------------------.
+ * | F10  | F11  | F12  | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+ * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+ * | F7   | F8   | F9   | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | \      |
+ * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+ * | F4   | F5   | F6   | ESC/CTL| A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |
+ * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+ * | F1   | F2   | F3   | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | ENT/SFT|
+ * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
+ * | PGDN |PGUP  | HOME | FUNC   |HYPER   | LCTL   | LGUI   | LALT   | SPCFN  | SPCFN  | RALT   | RGUI   | RCTL   | HYPER  | FUNC   |
+ * '--------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+    [_QWERTY] = {
+        /* QWERTY */
+        {KC_F10,  KC_F11,  KC_F12,  KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
+        {KC_F7,   KC_F8,   KC_F9,   KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS},
+        {KC_F4,   KC_F5,   KC_F6,   ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
+        {KC_F1,   KC_F2,   KC_F3,   KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
+        {KC_PGDN, KC_PGUP, KC_HOME, FUNC,    HYPER, KC_LCTL, KC_LGUI, KC_LALT, SPCFN,  SPCFN,  KC_RALT, KC_RGUI, KC_RCTL, HYPER,   FUNC},
+    },
+
+/* SPCFN
+ * .-----------------------------------------------------------------------------------------------------------------------------------------.
+ * |      | /    | *    |         |         |         | PAGEUP |         |         |        |         |    UP   |   -    |    =    |   DEL   |
+ * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
+ * | P7   | P8   | P9   |         |         | SPCLEFT | PAGEDN |  SPCRGT |    [    |   ]    | LEFT    |  DOWN   | RIGHT  |         |         |
+ * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
+ * | P4   | P5   | P6   |         |         |         |        |         |    {    |   }    |         |         |        |         |         |
+ * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
+ * | P1   | P2   | P3   |         |         |         |        |         |    (    |   )    |         |         |        |         |         |
+ * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
+ * | VOLD | VOLUp| MUTE |         |         |         |        |         |         |        |         |         |        |         |         |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------.
+ */
+
+    [_SPCFN] = {
+        /* SPCFN */
+        {_______, KC_SLSH, KC_ASTR, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   KC_MINS,  KC_EQL, KC_DEL,
+        {KC_P7,  KC_P8,   KC_P9,    _______, _______, SPCLFT,  KC_PGDN, SPCRGT,  KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
+        {KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______,
+        {KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______,
+        {KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    }
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+            #ifdef BACKLIGHT_ENABLE
+              backlight_step();
+            #endif
+          } else {
+            unregister_code(KC_RSFT);
+          }
+        break;
+      }
+    return MACRO_NONE;
+};
diff --git a/keyboards/xd75/keymaps/ipetepete/readme.md b/keyboards/xd75/keymaps/ipetepete/readme.md
new file mode 100644
index 000000000000..d53c0f34a87a
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/readme.md
@@ -0,0 +1 @@
+# The default keymap for xd75
diff --git a/keyboards/xd75/keymaps/ipetepete/rules.mk b/keyboards/xd75/keymaps/ipetepete/rules.mk
new file mode 100644
index 000000000000..d4e08cfb26be
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/rules.mk
@@ -0,0 +1,18 @@
+# Copyright 2013 Jun Wako <wakojun@gmail.com>
+#
+# 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 <http://www.gnu.org/licenses/>.
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif

From 68f579bd78a4264e2269846c1ce190aaf4126476 Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Wed, 17 Jan 2018 13:51:10 -0700
Subject: [PATCH 02/18] tweaking keymap

---
 keyboards/xd75/keymaps/ipetepete/keymap.c | 37 ++++++++++++++---------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/keyboards/xd75/keymaps/ipetepete/keymap.c b/keyboards/xd75/keymaps/ipetepete/keymap.c
index 9193278ab8cf..db81d0dfd67b 100644
--- a/keyboards/xd75/keymaps/ipetepete/keymap.c
+++ b/keyboards/xd75/keymaps/ipetepete/keymap.c
@@ -18,14 +18,13 @@
 #define ESCCTRL CTL_T(KC_ESC)
 #define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
 #define HYPER MT(MOD_HYPR, KC_ENT)
+#define KC_FUNC MO(_FUNC)
 #define ENTSFT SFT_T(KC_ENT)
 #define APPTOG LGUI(KC_TAB) // toggles last two apps used
 #define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
 #define SPCRGT LCTL(KC_RGHT) // Switch workspaces
 #define SPCLFT LCTL(KC_LEFT)
 
-#define _______ KC_TRANS
-#define XXXXXXX KC_NO
 
 // Layer shorthand
 enum layers{
@@ -45,8 +44,7 @@ enum keycodes{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWERTY
+ /* QWERTY SPLIT
  * .--------------------------------------------------------------------------------------------------------------------------------.
  * | F10  | F11  | F12  | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | BACKSP |
  * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
@@ -62,13 +60,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = {
         /* QWERTY */
-        {KC_F10,  KC_F11,  KC_F12,  KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
-        {KC_F7,   KC_F8,   KC_F9,   KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS},
-        {KC_F4,   KC_F5,   KC_F6,   ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
-        {KC_F1,   KC_F2,   KC_F3,   KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
-        {KC_PGDN, KC_PGUP, KC_HOME, FUNC,    HYPER, KC_LCTL, KC_LGUI, KC_LALT, SPCFN,  SPCFN,  KC_RALT, KC_RGUI, KC_RCTL, HYPER,   FUNC},
+        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5, KC_MINS, KC_EQL, KC_BSLS,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
+        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_PGUP, KC_RBRC,    KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
+        {ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_LCBR, KC_PGDN, KC_RCBR,    KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
+        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B, KC_LPRN, KC_HOME, KC_RPRN,    KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
+        {KC_FUNC,MOD_HYPR,KC_LGUI, KC_LALT,KC_LCTL, KC_SPFN, _______, KC_END, _______, KC_SPFN,KC_RALT, KC_RGUI, KC_RCTL, HYPER, KC_FUNC},
     },
 
+
+
 /* SPCFN
  * .-----------------------------------------------------------------------------------------------------------------------------------------.
  * |      | /    | *    |         |         |         | PAGEUP |         |         |        |         |    UP   |   -    |    =    |   DEL   |
@@ -85,11 +85,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_SPCFN] = {
         /* SPCFN */
-        {_______, KC_SLSH, KC_ASTR, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   KC_MINS,  KC_EQL, KC_DEL,
-        {KC_P7,  KC_P8,   KC_P9,    _______, _______, SPCLFT,  KC_PGDN, SPCRGT,  KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-        {KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______,
-        {KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______,
-        {KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        {_______, _______, _______, _______, _______, _______, KC_F10,  KC_F11,  KC_F12,  _______, _______,_______,KC_MINS,  KC_EQL, KC_DEL},
+        {_______, _______, _______, _______, _______, KC_LBRC, KC_F7,   KC_F8,   KC_F9,   KC_RBRC, _______, KC_UP,   _______, _______, _______},
+        {_______, _______, _______, _______, _______, KC_LCBR, KC_F4,   KC_F5,   KC_F6,   KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______},
+        {_______, _______, _______, _______, _______, KC_LPRN, KC_F1,   KC_F2,   KC_F3,   KC_RPRN, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______},
+    },
+
+    [_FUNC] = {
+        /* SPCFN */
+        {RESET,   _______,   _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______},
+        {_______,DF(_QWERTY),_______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______},
+        {_______, _______,   _______, _______, _______, _______, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
+        {_______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______,   _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______},
     }
 };
 

From 59477983a82c80e7924a2242fbb05146ab901b4f Mon Sep 17 00:00:00 2001
From: Peter Peterson <ppeterson@noao.edu>
Date: Wed, 17 Jan 2018 15:02:47 -0700
Subject: [PATCH 03/18] updated keymap

---
 keyboards/xd75/keymaps/ipetepete/keymap.c | 34 +++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/keyboards/xd75/keymaps/ipetepete/keymap.c b/keyboards/xd75/keymaps/ipetepete/keymap.c
index db81d0dfd67b..8144261cc648 100644
--- a/keyboards/xd75/keymaps/ipetepete/keymap.c
+++ b/keyboards/xd75/keymaps/ipetepete/keymap.c
@@ -18,8 +18,8 @@
 #define ESCCTRL CTL_T(KC_ESC)
 #define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
 #define HYPER MT(MOD_HYPR, KC_ENT)
-#define KC_FUNC MO(_FUNC)
 #define ENTSFT SFT_T(KC_ENT)
+#define KC_FUN MO(_FUN)
 #define APPTOG LGUI(KC_TAB) // toggles last two apps used
 #define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
 #define SPCRGT LCTL(KC_RGHT) // Switch workspaces
@@ -29,17 +29,17 @@
 // Layer shorthand
 enum layers{
   _QWERTY = 0,
-  _FUNC,
-  _UPPER,
   _LOWER,
-  _SPCFN
+  _GAMR,
+  _SPCFN,
+  _FUN,
 };
 
 enum keycodes{
   QWERTY = 0,
   FUNC,
-  UPPER,
-  LOWER,
+  LO,
+  UP,
   SPCFN
 };
 
@@ -64,10 +64,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_PGUP, KC_RBRC,    KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
         {ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_LCBR, KC_PGDN, KC_RCBR,    KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
         {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B, KC_LPRN, KC_HOME, KC_RPRN,    KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
-        {KC_FUNC,MOD_HYPR,KC_LGUI, KC_LALT,KC_LCTL, KC_SPFN, _______, KC_END, _______, KC_SPFN,KC_RALT, KC_RGUI, KC_RCTL, HYPER, KC_FUNC},
+        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,MO(_LOWER), KC_SPFN, _______, KC_END, _______, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
     },
 
+    [_LOWER] = {
+        /* SPCFN */
+        {_______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______},
+        {APPTOG,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  XXXXXXX},
+        {APPWIN,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX, XXXXXXX, XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+    },
 
+    [_GAMR] = {
+        /* QWERTY */
+        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5, KC_F7, KC_F8,  KC_F9,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
+        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_F4, KC_F5,  KC_F6,    KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
+        {KC_ESC,  KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_F1, KC_F2,  KC_F3,    KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
+        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B, XXXXXXX, KC_UP,  XXXXXXX,    KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
+        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,  KC_SPC,KC_SPFN,KC_LEFT, KC_DOWN, KC_LEFT, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
+    },
 
 /* SPCFN
  * .-----------------------------------------------------------------------------------------------------------------------------------------.
@@ -92,11 +108,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         {_______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______},
     },
 
-    [_FUNC] = {
+    [_FUN] = {
         /* SPCFN */
         {RESET,   _______,   _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______},
         {_______,DF(_QWERTY),_______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______},
-        {_______, _______,   _______, _______, _______, _______, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
+        {_______, _______,   _______, _______, _______, DF(_GAMR), _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
         {_______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
         {_______, _______,   _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______},
     }

From 77cea2abb96fa607435f82df14179f45f0da0fbb Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Mon, 2 Jul 2018 07:34:36 -0700
Subject: [PATCH 04/18] cleaned up a little bit

---
 keyboards/xd75/keymaps/ipetepete/config.h |  10 +-
 keyboards/xd75/keymaps/ipetepete/keymap.c | 132 +++++++++++-----------
 keyboards/xd75/keymaps/ipetepete/rules.mk |   4 +-
 3 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/keyboards/xd75/keymaps/ipetepete/config.h b/keyboards/xd75/keymaps/ipetepete/config.h
index 015377b5f8f7..6a274b220b0d 100644
--- a/keyboards/xd75/keymaps/ipetepete/config.h
+++ b/keyboards/xd75/keymaps/ipetepete/config.h
@@ -17,8 +17,16 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
+//#include "../../config.h"
 
 // place overrides here
 
+
+
+#undef BACKLIGHT_BREATHING
+
+//#define BACKLIGHT_BREATHING
+//#undef BACKLIGHT_LEVELS
+//#define BACKLIGHT_LEVELS 3
 #endif
diff --git a/keyboards/xd75/keymaps/ipetepete/keymap.c b/keyboards/xd75/keymaps/ipetepete/keymap.c
index 8144261cc648..53a8bc6521f9 100644
--- a/keyboards/xd75/keymaps/ipetepete/keymap.c
+++ b/keyboards/xd75/keymaps/ipetepete/keymap.c
@@ -15,16 +15,6 @@
  */
 #include "xd75.h"
 
-#define ESCCTRL CTL_T(KC_ESC)
-#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
-#define HYPER MT(MOD_HYPR, KC_ENT)
-#define ENTSFT SFT_T(KC_ENT)
-#define KC_FUN MO(_FUN)
-#define APPTOG LGUI(KC_TAB) // toggles last two apps used
-#define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
-#define SPCRGT LCTL(KC_RGHT) // Switch workspaces
-#define SPCLFT LCTL(KC_LEFT)
-
 
 // Layer shorthand
 enum layers{
@@ -36,84 +26,64 @@ enum layers{
 };
 
 enum keycodes{
-  QWERTY = 0,
+  QWERTY = SAFE_RANGE,
   FUNC,
   LO,
   UP,
-  SPCFN
+  SPCFN,
+  LED,
+  GAMER
 };
 
+// Needs clean up, I don't think I'm using all of these
+#define ESCCTRL CTL_T(KC_ESC)
+#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
+#define ROT_LED M(LED)
+#define HYPER MT(MOD_HYPR, KC_ENT)
+#define ENTSFT SFT_T(KC_ENT)
+#define KC_FUN MO(_FUN)
+#define APPTOG LGUI(KC_TAB) // toggles last two apps used
+#define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
+#define SPCRGT LCTL(KC_RGHT) // Switch workspaces
+#define SPCLFT LCTL(KC_LEFT)
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* QWERTY SPLIT
- * .--------------------------------------------------------------------------------------------------------------------------------.
- * | F10  | F11  | F12  | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | F7   | F8   | F9   | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | \      |
- * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | F4   | F5   | F6   | ESC/CTL| A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |
- * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | F1   | F2   | F3   | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | ENT/SFT|
- * |------+------+------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * | PGDN |PGUP  | HOME | FUNC   |HYPER   | LCTL   | LGUI   | LALT   | SPCFN  | SPCFN  | RALT   | RGUI   | RCTL   | HYPER  | FUNC   |
- * '--------------------------------------------------------------------------------------------------------------------------------'
- */
 
     [_QWERTY] = {
-        /* QWERTY */
-        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5, KC_MINS, KC_EQL, KC_BSLS,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
-        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_PGUP, KC_RBRC,    KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
-        {ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_LCBR, KC_PGDN, KC_RCBR,    KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
-        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B, KC_LPRN, KC_HOME, KC_RPRN,    KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
-        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,MO(_LOWER), KC_SPFN, _______, KC_END, _______, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
+        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5,  KC_F10,  KC_F11,  KC_F12,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
+        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T,  KC_F7,   KC_F8,   KC_F9,     KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
+        {ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,  KC_F4,   KC_F5,   KC_F6,     KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
+        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,  KC_F1,   KC_F2,   KC_F3,     KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
+        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,MO(_LOWER), KC_SPFN, KC_PGDN, KC_PGUP, KC_HOME, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, HYPER,KC_FUN},
+    },
+    [_GAMR] = {
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,  KC_SPC,KC_SPFN,KC_LEFT, KC_DOWN, KC_LEFT, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
     },
-
     [_LOWER] = {
-        /* SPCFN */
         {_______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______},
         {APPTOG,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  XXXXXXX},
         {APPWIN,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX, XXXXXXX, XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX},
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-    },
-
-    [_GAMR] = {
-        /* QWERTY */
-        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5, KC_F7, KC_F8,  KC_F9,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
-        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_F4, KC_F5,  KC_F6,    KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
-        {KC_ESC,  KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_F1, KC_F2,  KC_F3,    KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
-        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B, XXXXXXX, KC_UP,  XXXXXXX,    KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
-        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,  KC_SPC,KC_SPFN,KC_LEFT, KC_DOWN, KC_LEFT, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
+        {_______, _______, _______, _______, _______, KC_PIPE, _______, _______, _______, KC_BSLS, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______},
     },
-
-/* SPCFN
- * .-----------------------------------------------------------------------------------------------------------------------------------------.
- * |      | /    | *    |         |         |         | PAGEUP |         |         |        |         |    UP   |   -    |    =    |   DEL   |
- * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
- * | P7   | P8   | P9   |         |         | SPCLEFT | PAGEDN |  SPCRGT |    [    |   ]    | LEFT    |  DOWN   | RIGHT  |         |         |
- * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
- * | P4   | P5   | P6   |         |         |         |        |         |    {    |   }    |         |         |        |         |         |
- * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
- * | P1   | P2   | P3   |         |         |         |        |         |    (    |   )    |         |         |        |         |         |
- * |------+------+------+---------+---------+---------+--------+---------+---------+--------+---------+---------+--------+---------+---------+
- * | VOLD | VOLUp| MUTE |         |         |         |        |         |         |        |         |         |        |         |         |
- * '-----------------------------------------------------------------------------------------------------------------------------------------.
- */
-
     [_SPCFN] = {
-        /* SPCFN */
         {_______, _______, _______, _______, _______, _______, KC_F10,  KC_F11,  KC_F12,  _______, _______,_______,KC_MINS,  KC_EQL, KC_DEL},
-        {_______, _______, _______, _______, _______, KC_LBRC, KC_F7,   KC_F8,   KC_F9,   KC_RBRC, _______, KC_UP,   _______, _______, _______},
-        {_______, _______, _______, _______, _______, KC_LCBR, KC_F4,   KC_F5,   KC_F6,   KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______},
-        {_______, _______, _______, _______, _______, KC_LPRN, KC_F1,   KC_F2,   KC_F3,   KC_RPRN, _______, _______, _______, _______, _______},
+        {KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, KC_F7,   KC_F8,   KC_F9,   KC_RBRC, _______, KC_UP,   _______, _______, _______},
+        {_______, _______, KC_HOME, KC_PGDN, KC_END,  KC_LCBR, KC_F4,   KC_F5,   KC_F6,   KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______},
+        {_______, _______, _______, _______, _______, KC_LPRN, KC_MPRV, KC_MNXT, KC_MPLY,   KC_RPRN, _______, _______, _______, _______, _______},
         {_______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______},
     },
 
     [_FUN] = {
-        /* SPCFN */
-        {RESET,   _______,   _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______},
-        {_______,DF(_QWERTY),_______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______},
-        {_______, _______,   _______, _______, _______, DF(_GAMR), _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
-        {_______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {RESET,   _______,   _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, _______, _______, _______, BL_DEC, BL_INC, BL_ON},
+        {_______, QWERTY,_______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, BL_STEP, BL_OFF },
+         {_______, _______,   _______, _______, _______, GAMER, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
+        {KC_NLCK, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
         {_______, _______,   _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______},
     }
 };
@@ -122,6 +92,31 @@ const uint16_t PROGMEM fn_actions[] = {
 
 };
 
+bool process_record_user(uint16_t keycode, keyrecord_t *record){
+  if(record->event.pressed){
+    switch(keycode){
+      // Flip RGB mode on game/qwerty mode
+      case QWERTY:
+        if(record->event.pressed){
+          layer_off(_GAMR);
+          layer_on(_QWERTY);
+          rgblight_mode(1);
+            //rgblight_setrgb(40, 80, 255);
+        }
+        return true;
+      case GAMER:
+        if(record->event.pressed){
+          layer_on(_GAMR);
+          rgblight_mode(10);
+            //rgblight_setrgb(255, 40, 40);
+        }
+        return true;
+      default:
+        return true;
+    }
+  }
+  return true;
+}
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
   // MACRODOWN only works in this function
@@ -130,7 +125,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
           if (record->event.pressed) {
             register_code(KC_RSFT);
             #ifdef BACKLIGHT_ENABLE
-              backlight_step();
             #endif
           } else {
             unregister_code(KC_RSFT);
diff --git a/keyboards/xd75/keymaps/ipetepete/rules.mk b/keyboards/xd75/keymaps/ipetepete/rules.mk
index d4e08cfb26be..bb01c4641a8d 100644
--- a/keyboards/xd75/keymaps/ipetepete/rules.mk
+++ b/keyboards/xd75/keymaps/ipetepete/rules.mk
@@ -13,6 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+BACKLIGHT_ENABLE = yes
 ifndef QUANTUM_DIR
-	include ../../../../Makefile
+
+  include ../../../../Makefile
 endif

From 5ba9a133d613ee8d7d84ec71f9aed7a5cf78f96f Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Wed, 20 Feb 2019 16:27:19 -0700
Subject: [PATCH 05/18] New preonic keymap

---
 keyboards/preonic/keymaps/ipetepete/config.h  |  42 +++
 keyboards/preonic/keymaps/ipetepete/keymap.c  | 293 ++++++++++++++++++
 keyboards/preonic/keymaps/ipetepete/readme.md |  24 ++
 keyboards/preonic/keymaps/ipetepete/rules.mk  |   1 +
 4 files changed, 360 insertions(+)
 create mode 100644 keyboards/preonic/keymaps/ipetepete/config.h
 create mode 100644 keyboards/preonic/keymaps/ipetepete/keymap.c
 create mode 100644 keyboards/preonic/keymaps/ipetepete/readme.md
 create mode 100644 keyboards/preonic/keymaps/ipetepete/rules.mk

diff --git a/keyboards/preonic/keymaps/ipetepete/config.h b/keyboards/preonic/keymaps/ipetepete/config.h
new file mode 100644
index 000000000000..205351258267
--- /dev/null
+++ b/keyboards/preonic/keymaps/ipetepete/config.h
@@ -0,0 +1,42 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "config_common.h"
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PREONIC_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/ipetepete/keymap.c b/keyboards/preonic/keymaps/ipetepete/keymap.c
new file mode 100644
index 000000000000..d0d0138313cc
--- /dev/null
+++ b/keyboards/preonic/keymaps/ipetepete/keymap.c
@@ -0,0 +1,293 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+
+enum preonic_layers {
+  _QWERTY,
+  _GAMER,
+  _LOWER,
+  _RAISE,
+  _SPCFN,
+  _ADJUST
+};
+
+enum preonic_keycodes {
+  QWERTY = SAFE_RANGE,
+  GAMER,
+  LOWER,
+  RAISE,
+  SPCFN,
+  BACKLIT
+};
+
+#define ESCCTRL CTL_T(KC_ESC)
+#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
+#define HYPER MT(MOD_HYPR, KC_ENT)
+#define ENTSFT SFT_T(KC_ENT)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | EsCtl|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |  SpaceFN    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_preonic_grid( \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  \
+  ESCCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT,  \
+  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+/* Gamer
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | EsCtl|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |  Space      |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_GAMER] = LAYOUT_preonic_grid( \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC, KC_SPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+[_SPCFN] = LAYOUT_preonic_grid( \
+_______, _______, _______, _______, _______, _______, _______, _______,_______,KC_MINS,  KC_EQL, KC_DEL,  \
+KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC, _______, KC_UP,   _______, _______, _______,\
+_______, _______, KC_HOME, KC_PGDN, KC_END,  KC_LCBR, KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______,\
+_______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______,\
+_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
+),
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_preonic_grid( \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,  \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_preonic_grid( \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
+),
+
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |Qwerty|Gamer |      |      |      |      |      |      |      |      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|AudOff|AGnorm|AGswap|      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | RESET|      |      |      |      |             |      |      |      |      |DEBUG |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_preonic_grid( \
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
+  _______, QWERTY,  GAMER,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  RESET,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG\
+)
+
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QWERTY);
+          }
+          return false;
+          break;
+        case GAMER:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_GAMER);
+          }
+          return false;
+          break;
+
+        case LOWER:
+          if (record->event.pressed) {
+            layer_on(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case RAISE:
+          if (record->event.pressed) {
+            layer_on(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case BACKLIT:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+            #ifdef BACKLIGHT_ENABLE
+              backlight_step();
+            #endif
+            #ifdef __AVR__
+            PORTE &= ~(1<<6);
+            #endif
+          } else {
+            unregister_code(KC_RSFT);
+            #ifdef __AVR__
+            PORTE |= (1<<6);
+            #endif
+          }
+          return false;
+          break;
+      }
+    return true;
+};
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (muse_mode) {
+    if (IS_LAYER_ON(_RAISE)) {
+      if (clockwise) {
+        muse_offset++;
+      } else {
+        muse_offset--;
+      }
+    } else {
+      if (clockwise) {
+        muse_tempo+=1;
+      } else {
+        muse_tempo-=1;
+      }
+    }
+  } else {
+    if (clockwise) {
+      register_code(KC_PGDN);
+      unregister_code(KC_PGDN);
+    } else {
+      register_code(KC_PGUP);
+      unregister_code(KC_PGUP);
+    }
+  }
+}
+
+void dip_update(uint8_t index, bool active) {
+  switch (index) {
+    case 0:
+      if (active) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      break;
+    case 1:
+      if (active) {
+        muse_mode = true;
+      } else {
+        muse_mode = false;
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+        #endif
+      }
+   }
+}
+
+void matrix_scan_user(void) {
+  #ifdef AUDIO_ENABLE
+    if (muse_mode) {
+      if (muse_counter == 0) {
+        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+        if (muse_note != last_muse_note) {
+          stop_note(compute_freq_for_midi_note(last_muse_note));
+          play_note(compute_freq_for_midi_note(muse_note), 0xF);
+          last_muse_note = muse_note;
+        }
+      }
+      muse_counter = (muse_counter + 1) % muse_tempo;
+    }
+  #endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}
diff --git a/keyboards/preonic/keymaps/ipetepete/readme.md b/keyboards/preonic/keymaps/ipetepete/readme.md
new file mode 100644
index 000000000000..725b47494e40
--- /dev/null
+++ b/keyboards/preonic/keymaps/ipetepete/readme.md
@@ -0,0 +1,24 @@
+# Mostly default...
+
+## SpaceFN _The most awesome use of Space_
+
+This layer adds arrow keys under the right hand on the home row, just hold space. Also...
+
+Under the left hand
+- Home
+- End
+- PageUp
+- PageDown
+
+Center columns house the ever useful [],{},() on TY, GH, BN respectively.
+
+## Gamer 
+
+This is the base layer but with SpaceFN turned off so space acts normally, you know for like jumping and stuff.
+
+## Other conveniences
+
+Tap `Esc` for `Esc` hold for `Ctl`. Much easier to do shortcuts with the pinky.
+
+Tap `Enter` for `Enter` hold for `RSFT`. If you learned to touch type by using the "correct" shift key, this gives
+you right shift where it would normally be on a staggered keyboard.
diff --git a/keyboards/preonic/keymaps/ipetepete/rules.mk b/keyboards/preonic/keymaps/ipetepete/rules.mk
new file mode 100644
index 000000000000..dcf16bef3994
--- /dev/null
+++ b/keyboards/preonic/keymaps/ipetepete/rules.mk
@@ -0,0 +1 @@
+SRC += muse.c

From 5b232f70a7c5d1308f8542b1beefde291cff554c Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Thu, 11 Apr 2019 09:56:02 -0700
Subject: [PATCH 06/18] my preonic keymap

---
 keyboards/preonic/keymaps/ipetepete/config.h |   8 +-
 keyboards/preonic/keymaps/ipetepete/keymap.c | 113 +++++++++++++------
 keyboards/preonic/keymaps/ipetepete/rules.mk |  13 +++
 3 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/keyboards/preonic/keymaps/ipetepete/config.h b/keyboards/preonic/keymaps/ipetepete/config.h
index 205351258267..9f63d796a095 100644
--- a/keyboards/preonic/keymaps/ipetepete/config.h
+++ b/keyboards/preonic/keymaps/ipetepete/config.h
@@ -8,12 +8,14 @@
     // #define STARTUP_SONG SONG(NO_SOUND)
 
     #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
+                                  SONG(ZELDA_PUZZLE), \
+                                  SONG(MARIO_THEME) \
                                 }
 #endif
 
 #define MUSIC_MASK (keycode != KC_NO)
+//#define AUDIO_CLICKY
+#define TAP_CODE_DELAY 100
 
 /*
  * MIDI options
@@ -39,4 +41,4 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/preonic/keymaps/ipetepete/keymap.c b/keyboards/preonic/keymaps/ipetepete/keymap.c
index d0d0138313cc..c7de586eaac9 100644
--- a/keyboards/preonic/keymaps/ipetepete/keymap.c
+++ b/keyboards/preonic/keymaps/ipetepete/keymap.c
@@ -32,9 +32,12 @@ enum preonic_keycodes {
   LOWER,
   RAISE,
   SPCFN,
-  BACKLIT
+  BACKLIT,
+  ESCCTRL
 };
 
+#define MEDIA_KEY_DELAY 10
+
 #define ESCCTRL CTL_T(KC_ESC)
 #define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
 #define HYPER MT(MOD_HYPR, KC_ENT)
@@ -53,15 +56,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |  SpaceFN    |Raise | Left | Down |  Up  |Right |
+ * | Brite| Alt | GUI   | Ctrl  |Lower |  SpaceFN    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_preonic_grid( \
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  \
-  ESCCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  ESCCTRL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT,  \
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+  KC_RALT, KC_LALT, KC_LGUI, KC_LCTRL, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
 /* Gamer
  * ,-----------------------------------------------------------------------------------.
@@ -88,9 +91,9 @@ _______, _______, _______, _______, _______, _______, _______, _______,_______,K
 KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC, _______, KC_UP,   _______, _______, _______,\
 _______, _______, KC_HOME, KC_PGDN, KC_END,  KC_LCBR, KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______,\
 _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______,\
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
+_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______\
 ),
-/* Lower
+/* RAISE
  * ,-----------------------------------------------------------------------------------.
  * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
@@ -103,15 +106,15 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[_LOWER] = LAYOUT_preonic_grid( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,  \
+[_RAISE] = LAYOUT_preonic_grid( \
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+  KC_TILD, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PIPE, KC_BSLS, KC_MINS, KC_PLUS, KC_LPRN, KC_RPRN, KC_DEL, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL, HYPER \
 ),
 
-/* Raise
+/* Lower
  * ,-----------------------------------------------------------------------------------.
  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -123,12 +126,13 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
+
  */
-[_RAISE] = LAYOUT_preonic_grid( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+[_LOWER] = LAYOUT_preonic_grid( \
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \
+  KC_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,   _______, \
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_PIPE, KC_BSLS,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
 ),
 
@@ -220,28 +224,69 @@ uint8_t muse_offset = 70;
 uint16_t muse_tempo = 50;
 
 void encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
+  uint16_t held_keycode_timer = timer_read();
+
+  switch(biton32(layer_state)){
+    case _LOWER:
+      if(clockwise){
+        register_code(KC_MNXT);
+        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
+          // noop
+        }
+        unregister_code(KC_MNXT);
+      }else{
+        register_code(KC_MPRV);
+        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
+          // noop
+        }
+        unregister_code(KC_MPRV);
+
       }
-    } else {
+      break;
+    case _RAISE:
+      if (muse_mode) {
+          if (clockwise) {
+            muse_offset++;
+          } else {
+            muse_offset--;
+          }
+      }else{
+        if(clockwise){
+          register_code(KC_PGUP);
+          while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
+            // noop
+          }
+          unregister_code(KC_PGUP);
+        }else{
+            register_code(KC_PGDN);
+            while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
+              // noop
+            }
+            unregister_code(KC_PGDN);
+          }
+        }
+      break;
+    case _SPCFN:
+      if(clockwise){
+        tap_code(KC_WH_U);
+      }else{
+        tap_code(KC_WH_D);
+      }
+      break;
+    default:
       if (clockwise) {
-        muse_tempo+=1;
+        register_code(KC_VOLU);
+        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
+          // noop
+        }
+        unregister_code(KC_VOLU);
       } else {
-        muse_tempo-=1;
+        register_code(KC_VOLD);
+        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
+          // noop
+        }
+        unregister_code(KC_VOLD);
       }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
   }
 }
 
diff --git a/keyboards/preonic/keymaps/ipetepete/rules.mk b/keyboards/preonic/keymaps/ipetepete/rules.mk
index dcf16bef3994..74439af1a212 100644
--- a/keyboards/preonic/keymaps/ipetepete/rules.mk
+++ b/keyboards/preonic/keymaps/ipetepete/rules.mk
@@ -1 +1,14 @@
 SRC += muse.c
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+MIDI_ENABLE = yes            # MIDI controls
+AUDIO_ENABLE = yes           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+API_SYSEX_ENABLE = no

From 871af998f7ef027e737bdebcf8ed30b2ad2f9fea Mon Sep 17 00:00:00 2001
From: Peter Peterson <ppeterson@noao.edu>
Date: Tue, 27 Aug 2019 09:52:36 -0700
Subject: [PATCH 07/18] added mac layout

---
 keyboards/preonic/keymaps/ipetepete/keymap.c | 23 ++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/keyboards/preonic/keymaps/ipetepete/keymap.c b/keyboards/preonic/keymaps/ipetepete/keymap.c
index c7de586eaac9..22fc2ae91a1b 100644
--- a/keyboards/preonic/keymaps/ipetepete/keymap.c
+++ b/keyboards/preonic/keymaps/ipetepete/keymap.c
@@ -20,6 +20,7 @@
 enum preonic_layers {
   _QWERTY,
   _GAMER,
+  _MAC,
   _LOWER,
   _RAISE,
   _SPCFN,
@@ -29,6 +30,7 @@ enum preonic_layers {
 enum preonic_keycodes {
   QWERTY = SAFE_RANGE,
   GAMER,
+  MAC,
   LOWER,
   RAISE,
   SPCFN,
@@ -64,7 +66,7 @@ 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_DEL,  \
   ESCCTRL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT,  \
-  KC_RALT, KC_LALT, KC_LGUI, KC_LCTRL, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+  KC_RALT, KC_LALT, KC_LGUI, KC_LCTL, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
 /* Gamer
  * ,-----------------------------------------------------------------------------------.
@@ -86,6 +88,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC, KC_SPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
+[_MAC] = LAYOUT_preonic_grid( \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  KC_RALT, KC_LCTL, KC_LALT, KC_LGUI,  _______, _______, _______, _______, _______, _______, _______, _______ \
+),
+
 [_SPCFN] = LAYOUT_preonic_grid( \
 _______, _______, _______, _______, _______, _______, _______, _______,_______,KC_MINS,  KC_EQL, KC_DEL,  \
 KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC, _______, KC_UP,   _______, _______, _______,\
@@ -154,7 +164,7 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QWERTY,  GAMER,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  MAC, _______, _______, _______, _______, \
   RESET,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG\
 )
 
@@ -175,13 +185,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           }
           return false;
           break;
-
+        case MAC:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_MAC);
+          }
+          return false;
+          break;
         case LOWER:
           if (record->event.pressed) {
             layer_on(_LOWER);
             update_tri_layer(_LOWER, _RAISE, _ADJUST);
           } else {
-            layer_off(_LOWER);
+          layer_off(_LOWER);
             update_tri_layer(_LOWER, _RAISE, _ADJUST);
           }
           return false;

From 891fb63e3940bbd07ab8d42ec715e8f55cb268e5 Mon Sep 17 00:00:00 2001
From: peter <peter.peterson.iv@gmail.com>
Date: Tue, 8 Oct 2019 09:39:19 -0700
Subject: [PATCH 08/18] preonic map update

---
 keyboards/preonic/keymaps/ipetepete/keymap.c | 35 ++++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/keyboards/preonic/keymaps/ipetepete/keymap.c b/keyboards/preonic/keymaps/ipetepete/keymap.c
index c7de586eaac9..7b82b2500001 100644
--- a/keyboards/preonic/keymaps/ipetepete/keymap.c
+++ b/keyboards/preonic/keymaps/ipetepete/keymap.c
@@ -19,6 +19,7 @@
 
 enum preonic_layers {
   _QWERTY,
+  _MAC,
   _GAMER,
   _LOWER,
   _RAISE,
@@ -28,6 +29,7 @@ enum preonic_layers {
 
 enum preonic_keycodes {
   QWERTY = SAFE_RANGE,
+  MAC,
   GAMER,
   LOWER,
   RAISE,
@@ -66,6 +68,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT,  \
   KC_RALT, KC_LALT, KC_LGUI, KC_LCTRL, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | EsCtl|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Alt | GUI   | Ctrl  |Lower |  SpaceFN    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_MAC] = LAYOUT_preonic_grid( \
+  _______,  _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, \
+  _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  \
+  _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, \
+  _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,  \
+  KC_RALT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
 /* Gamer
  * ,-----------------------------------------------------------------------------------.
  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
@@ -107,8 +129,8 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_preonic_grid( \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-  KC_TILD, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \
+  KC_HOME,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_END, \
+  KC_TILD, KC_F11,   KC_F2,   KC_F13, _______,  _______, _______,   _______, _______, _______,_______,_______,\
   _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
   _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PIPE, KC_BSLS, KC_MINS, KC_PLUS, KC_LPRN, KC_RPRN, KC_DEL, \
   _______, _______, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL, HYPER \
@@ -152,7 +174,7 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QWERTY,  GAMER,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QWERTY,  GAMER,   MAC, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   RESET,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG\
@@ -175,6 +197,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           }
           return false;
           break;
+        case MAC:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_MAC);
+          }
+          return false;
+          break;
+
 
         case LOWER:
           if (record->event.pressed) {

From a93e269c57bbe31a801a4f9628e3d2b20377e7f6 Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Mon, 3 Aug 2020 15:39:38 -0700
Subject: [PATCH 09/18] cleaning up old repo

---
 keyboards/lets_split/keymaps/ipetepete     |   1 +
 keyboards/planck/keymaps/ipetepete         |   1 +
 keyboards/xd75/keymaps/ipetepete/config.h  |  32 +++++
 keyboards/xd75/keymaps/ipetepete/keymap.c  | 135 +++++++++++++++++++++
 keyboards/xd75/keymaps/ipetepete/readme.md |   5 +
 keyboards/xd75/keymaps/ipetepete/rules.mk  |  20 +++
 6 files changed, 194 insertions(+)
 create mode 160000 keyboards/lets_split/keymaps/ipetepete
 create mode 160000 keyboards/planck/keymaps/ipetepete
 create mode 100644 keyboards/xd75/keymaps/ipetepete/config.h
 create mode 100644 keyboards/xd75/keymaps/ipetepete/keymap.c
 create mode 100644 keyboards/xd75/keymaps/ipetepete/readme.md
 create mode 100644 keyboards/xd75/keymaps/ipetepete/rules.mk

diff --git a/keyboards/lets_split/keymaps/ipetepete b/keyboards/lets_split/keymaps/ipetepete
new file mode 160000
index 000000000000..4e2a246f5d53
--- /dev/null
+++ b/keyboards/lets_split/keymaps/ipetepete
@@ -0,0 +1 @@
+Subproject commit 4e2a246f5d5334a1d3ce3f225891c1a5596ed2a4
diff --git a/keyboards/planck/keymaps/ipetepete b/keyboards/planck/keymaps/ipetepete
new file mode 160000
index 000000000000..4a7bb5efe672
--- /dev/null
+++ b/keyboards/planck/keymaps/ipetepete
@@ -0,0 +1 @@
+Subproject commit 4a7bb5efe672a05c299afc0a0216ab35802cd7e9
diff --git a/keyboards/xd75/keymaps/ipetepete/config.h b/keyboards/xd75/keymaps/ipetepete/config.h
new file mode 100644
index 000000000000..6a274b220b0d
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2017 Benjamin Kesselring
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include QMK_KEYBOARD_CONFIG_H
+//#include "../../config.h"
+
+// place overrides here
+
+
+
+#undef BACKLIGHT_BREATHING
+
+//#define BACKLIGHT_BREATHING
+//#undef BACKLIGHT_LEVELS
+//#define BACKLIGHT_LEVELS 3
+#endif
diff --git a/keyboards/xd75/keymaps/ipetepete/keymap.c b/keyboards/xd75/keymaps/ipetepete/keymap.c
new file mode 100644
index 000000000000..52e5214ac9f6
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/keymap.c
@@ -0,0 +1,135 @@
+/* Copyright 2017 Wunder
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include "xd75.h"
+
+
+// Layer shorthand
+enum layers{
+  _QWERTY = 0,
+  _LOWER,
+  _GAMR,
+  _SPCFN,
+  _FUN,
+};
+
+enum keycodes{
+  QWERTY = SAFE_RANGE,
+  FUNC,
+  LO,
+  UP,
+  SPCFN,
+  LED,
+  GAMER
+};
+
+// Needs clean up, I don't think I'm using all of these
+#define ESCCTRL CTL_T(KC_ESC)
+#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
+#define ROT_LED M(LED)
+#define HYPER MT(MOD_HYPR, KC_ENT)
+#define ENTSFT SFT_T(KC_ENT)
+#define KC_FUN MO(_FUN)
+#define APPTOG LGUI(KC_TAB) // toggles last two apps used
+#define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
+#define SPCRGT LCTL(KC_RGHT) // Switch workspaces
+#define SPCLFT LCTL(KC_LEFT)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_QWERTY] = {
+        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5,  KC_F10,  KC_F11,  KC_F12,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
+        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T,  KC_F7,   KC_F8,   KC_F9,     KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
+        {ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,  KC_F4,   KC_F5,   KC_F6,     KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
+        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,  KC_F1,   KC_F2,   KC_F3,     KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
+        {KC_FUN,KC_LALT, KC_LGUI,KC_LCTL,MO(_LOWER), KC_SPFN, KC_HOME, KC_PGDN, KC_END, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, HYPER,KC_FUN},
+    },
+    [_GAMR] = {
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,  KC_SPC,KC_SPFN,KC_LEFT, KC_DOWN, KC_LEFT, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
+    },
+    [_LOWER] = {
+        {KC_ESC, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______},
+        {APPTOG,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_7   , KC_8   , KC_9   , KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  XXXXXXX},
+        {APPWIN,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_4   , KC_5   , KC_6   , KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX},
+        {_______, _______, _______, _______, _______, KC_PIPE, KC_1   , KC_2   , KC_3   , KC_BSLS, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, KC_0,    KC_PDOT, KC_EQL ,  _______, _______, _______, _______, _______, _______},
+    },
+    [_SPCFN] = {
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_MINS,  KC_EQL, KC_DEL},
+        {KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, _______, _______, _______, KC_RBRC, _______, KC_UP,   _______, _______, _______},
+        {_______, _______, KC_HOME, KC_PGDN, KC_END,  KC_LCBR, _______, _______, _______, KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______},
+        {_______, _______, _______, _______, _______, KC_LPRN, _______, _______, _______,   KC_RPRN, _______, _______, _______, _______, _______},
+        {_______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, KC_MUTE, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY},
+    },
+
+    [_FUN] = {
+        {RESET,   _______,   _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, _______, _______, _______, BL_DEC, BL_INC, BL_ON},
+        {_______, QWERTY,_______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, BL_STEP, BL_OFF },
+         {_______, _______,   _______, _______, _______, GAMER, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
+        {KC_NLCK, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+        {_______, _______,   _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______},
+    }
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record){
+  if(record->event.pressed){
+    switch(keycode){
+      // Flip RGB mode on game/qwerty mode
+      case QWERTY:
+        if(record->event.pressed){
+          layer_off(_GAMR);
+          layer_on(_QWERTY);
+          rgblight_mode(1);
+            //rgblight_setrgb(40, 80, 255);
+        }
+        return true;
+      case GAMER:
+        if(record->event.pressed){
+          layer_on(_GAMR);
+          rgblight_mode(10);
+            //rgblight_setrgb(255, 40, 40);
+        }
+        return true;
+      default:
+        return true;
+    }
+  }
+  return true;
+}
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+            #ifdef BACKLIGHT_ENABLE
+            #endif
+          } else {
+            unregister_code(KC_RSFT);
+          }
+        break;
+      }
+    return MACRO_NONE;
+};
diff --git a/keyboards/xd75/keymaps/ipetepete/readme.md b/keyboards/xd75/keymaps/ipetepete/readme.md
new file mode 100644
index 000000000000..05e7b12fb641
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/readme.md
@@ -0,0 +1,5 @@
+# 75 keys of goodness
+
+Nothing too far from default except I use SPACE as a function key for 
+arrow keys under the right hand like WASD plus a few small changes
+
diff --git a/keyboards/xd75/keymaps/ipetepete/rules.mk b/keyboards/xd75/keymaps/ipetepete/rules.mk
new file mode 100644
index 000000000000..bb01c4641a8d
--- /dev/null
+++ b/keyboards/xd75/keymaps/ipetepete/rules.mk
@@ -0,0 +1,20 @@
+# Copyright 2013 Jun Wako <wakojun@gmail.com>
+#
+# 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 <http://www.gnu.org/licenses/>.
+
+BACKLIGHT_ENABLE = yes
+ifndef QUANTUM_DIR
+
+  include ../../../../Makefile
+endif

From 403208bd5e3ff3fbed078c690da33440a4830696 Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Mon, 28 Sep 2020 08:07:27 -0700
Subject: [PATCH 10/18] cleaning up to match upstream

---
 keyboards/planck/keymaps/ipetepete            |   1 -
 keyboards/preonic/keymaps/ipetepete/config.h  |  44 ---
 keyboards/preonic/keymaps/ipetepete/keymap.c  | 367 ------------------
 keyboards/preonic/keymaps/ipetepete/readme.md |  24 --
 keyboards/preonic/keymaps/ipetepete/rules.mk  |  14 -
 5 files changed, 450 deletions(-)
 delete mode 160000 keyboards/planck/keymaps/ipetepete
 delete mode 100644 keyboards/preonic/keymaps/ipetepete/config.h
 delete mode 100644 keyboards/preonic/keymaps/ipetepete/keymap.c
 delete mode 100644 keyboards/preonic/keymaps/ipetepete/readme.md
 delete mode 100644 keyboards/preonic/keymaps/ipetepete/rules.mk

diff --git a/keyboards/planck/keymaps/ipetepete b/keyboards/planck/keymaps/ipetepete
deleted file mode 160000
index 4a7bb5efe672..000000000000
--- a/keyboards/planck/keymaps/ipetepete
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4a7bb5efe672a05c299afc0a0216ab35802cd7e9
diff --git a/keyboards/preonic/keymaps/ipetepete/config.h b/keyboards/preonic/keymaps/ipetepete/config.h
deleted file mode 100644
index 9f63d796a095..000000000000
--- a/keyboards/preonic/keymaps/ipetepete/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(ZELDA_PUZZLE), \
-                                  SONG(MARIO_THEME) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-//#define AUDIO_CLICKY
-#define TAP_CODE_DELAY 100
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/preonic/keymaps/ipetepete/keymap.c b/keyboards/preonic/keymaps/ipetepete/keymap.c
deleted file mode 100644
index 5c7223453c1a..000000000000
--- a/keyboards/preonic/keymaps/ipetepete/keymap.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _GAMER,
-  _MAC,
-  _LOWER,
-  _RAISE,
-  _SPCFN,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  GAMER,
-  MAC,
-  LOWER,
-  RAISE,
-  SPCFN,
-  BACKLIT,
-  ESCCTRL
-};
-
-#define MEDIA_KEY_DELAY 10
-
-#define ESCCTRL CTL_T(KC_ESC)
-#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
-#define HYPER MT(MOD_HYPR, KC_ENT)
-#define ENTSFT SFT_T(KC_ENT)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | EsCtl|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Alt | GUI   | Ctrl  |Lower |  SpaceFN    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  \
-  ESCCTRL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ENTSFT,  \
-  KC_RALT, KC_LALT, KC_LGUI, KC_LCTRL, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-),
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | EsCtl|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Alt | GUI   | Ctrl  |Lower |  SpaceFN    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_MAC] = LAYOUT_preonic_grid( \
-  _______,  _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, \
-  _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  \
-  _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, \
-  _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,  \
-  KC_RALT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPFN, KC_SPFN, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-),
-/* Gamer
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | EsCtl|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |EntSft|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |  Space      |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMER] = LAYOUT_preonic_grid( \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC, KC_SPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-),
-[_SPCFN] = LAYOUT_preonic_grid( \
-_______, _______, _______, _______, _______, _______, _______, _______,_______,KC_MINS,  KC_EQL, KC_DEL,  \
-KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC, _______, KC_UP,   _______, _______, _______,\
-_______, _______, KC_HOME, KC_PGDN, KC_END,  KC_LCBR, KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______,\
-_______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______,\
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______\
-),
-/* RAISE
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid( \
-  KC_HOME,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_END, \
-  KC_TILD, KC_F11,   KC_F2,   KC_F13, _______,  _______, _______,   _______, _______, _______,_______,_______,\
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PIPE, KC_BSLS, KC_MINS, KC_PLUS, KC_LPRN, KC_RPRN, KC_DEL, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL, HYPER \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
-
- */
-[_LOWER] = LAYOUT_preonic_grid( \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-  KC_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,   _______, \
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_PIPE, KC_BSLS,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Qwerty|Gamer |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RESET|      |      |      |      |             |      |      |      |      |DEBUG |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid( \
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QWERTY,  GAMER,   MAC, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
-  RESET,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG\
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case GAMER:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_GAMER);
-          }
-          return false;
-          break;
-        case MAC:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_MAC);
-          }
-          return false;
-          break;
-
-
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            PORTE &= ~(1<<6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            PORTE |= (1<<6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-  uint16_t held_keycode_timer = timer_read();
-
-  switch(biton32(layer_state)){
-    case _LOWER:
-      if(clockwise){
-        register_code(KC_MNXT);
-        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
-          // noop
-        }
-        unregister_code(KC_MNXT);
-      }else{
-        register_code(KC_MPRV);
-        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
-          // noop
-        }
-        unregister_code(KC_MPRV);
-
-      }
-      break;
-    case _RAISE:
-      if (muse_mode) {
-          if (clockwise) {
-            muse_offset++;
-          } else {
-            muse_offset--;
-          }
-      }else{
-        if(clockwise){
-          register_code(KC_PGUP);
-          while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
-            // noop
-          }
-          unregister_code(KC_PGUP);
-        }else{
-            register_code(KC_PGDN);
-            while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
-              // noop
-            }
-            unregister_code(KC_PGDN);
-          }
-        }
-      break;
-    case _SPCFN:
-      if(clockwise){
-        tap_code(KC_WH_U);
-      }else{
-        tap_code(KC_WH_D);
-      }
-      break;
-    default:
-      if (clockwise) {
-        register_code(KC_VOLU);
-        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
-          // noop
-        }
-        unregister_code(KC_VOLU);
-      } else {
-        register_code(KC_VOLD);
-        while(timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){
-          // noop
-        }
-        unregister_code(KC_VOLD);
-      }
-  }
-}
-
-void dip_update(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/ipetepete/readme.md b/keyboards/preonic/keymaps/ipetepete/readme.md
deleted file mode 100644
index 725b47494e40..000000000000
--- a/keyboards/preonic/keymaps/ipetepete/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Mostly default...
-
-## SpaceFN _The most awesome use of Space_
-
-This layer adds arrow keys under the right hand on the home row, just hold space. Also...
-
-Under the left hand
-- Home
-- End
-- PageUp
-- PageDown
-
-Center columns house the ever useful [],{},() on TY, GH, BN respectively.
-
-## Gamer 
-
-This is the base layer but with SpaceFN turned off so space acts normally, you know for like jumping and stuff.
-
-## Other conveniences
-
-Tap `Esc` for `Esc` hold for `Ctl`. Much easier to do shortcuts with the pinky.
-
-Tap `Enter` for `Enter` hold for `RSFT`. If you learned to touch type by using the "correct" shift key, this gives
-you right shift where it would normally be on a staggered keyboard.
diff --git a/keyboards/preonic/keymaps/ipetepete/rules.mk b/keyboards/preonic/keymaps/ipetepete/rules.mk
deleted file mode 100644
index 74439af1a212..000000000000
--- a/keyboards/preonic/keymaps/ipetepete/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-SRC += muse.c
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = yes            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-API_SYSEX_ENABLE = no

From 412ce3c0d3a7ea019d4d108ebd2e50c6570aeef3 Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Mon, 28 Sep 2020 08:10:42 -0700
Subject: [PATCH 11/18] more cleanup

---
 .gitignore                                 |   1 -
 keyboards/xd75/keymaps/ipetepete/config.h  |  32 -----
 keyboards/xd75/keymaps/ipetepete/keymap.c  | 135 ---------------------
 keyboards/xd75/keymaps/ipetepete/readme.md |   5 -
 keyboards/xd75/keymaps/ipetepete/rules.mk  |  20 ---
 5 files changed, 193 deletions(-)
 delete mode 100644 keyboards/xd75/keymaps/ipetepete/config.h
 delete mode 100644 keyboards/xd75/keymaps/ipetepete/keymap.c
 delete mode 100644 keyboards/xd75/keymaps/ipetepete/readme.md
 delete mode 100644 keyboards/xd75/keymaps/ipetepete/rules.mk

diff --git a/.gitignore b/.gitignore
index ce3a2a23028d..91d283e69ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,3 @@ __pycache__
 
 # Allow to exist but don't include it in the repo
 user_song_list.h
-*.orig
diff --git a/keyboards/xd75/keymaps/ipetepete/config.h b/keyboards/xd75/keymaps/ipetepete/config.h
deleted file mode 100644
index 6a274b220b0d..000000000000
--- a/keyboards/xd75/keymaps/ipetepete/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include QMK_KEYBOARD_CONFIG_H
-//#include "../../config.h"
-
-// place overrides here
-
-
-
-#undef BACKLIGHT_BREATHING
-
-//#define BACKLIGHT_BREATHING
-//#undef BACKLIGHT_LEVELS
-//#define BACKLIGHT_LEVELS 3
-#endif
diff --git a/keyboards/xd75/keymaps/ipetepete/keymap.c b/keyboards/xd75/keymaps/ipetepete/keymap.c
deleted file mode 100644
index 52e5214ac9f6..000000000000
--- a/keyboards/xd75/keymaps/ipetepete/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-#include "xd75.h"
-
-
-// Layer shorthand
-enum layers{
-  _QWERTY = 0,
-  _LOWER,
-  _GAMR,
-  _SPCFN,
-  _FUN,
-};
-
-enum keycodes{
-  QWERTY = SAFE_RANGE,
-  FUNC,
-  LO,
-  UP,
-  SPCFN,
-  LED,
-  GAMER
-};
-
-// Needs clean up, I don't think I'm using all of these
-#define ESCCTRL CTL_T(KC_ESC)
-#define KC_SPFN LT(_SPCFN, KC_SPC) // press for space, hold for function layer (aka spacefn)
-#define ROT_LED M(LED)
-#define HYPER MT(MOD_HYPR, KC_ENT)
-#define ENTSFT SFT_T(KC_ENT)
-#define KC_FUN MO(_FUN)
-#define APPTOG LGUI(KC_TAB) // toggles last two apps used
-#define APPWIN LGUI(KC_GRV) // toggles app windows (Mac/Linux)
-#define SPCRGT LCTL(KC_RGHT) // Switch workspaces
-#define SPCLFT LCTL(KC_LEFT)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_QWERTY] = {
-        {KC_GRV,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5,  KC_F10,  KC_F11,  KC_F12,    KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_BSPC},
-        {KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T,  KC_F7,   KC_F8,   KC_F9,     KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSLS},
-        {ESCCTRL, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,  KC_F4,   KC_F5,   KC_F6,     KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT},
-        {KC_LSFT, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,  KC_F1,   KC_F2,   KC_F3,     KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, ENTSFT},
-        {KC_FUN,KC_LALT, KC_LGUI,KC_LCTL,MO(_LOWER), KC_SPFN, KC_HOME, KC_PGDN, KC_END, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, HYPER,KC_FUN},
-    },
-    [_GAMR] = {
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {KC_FUN,KC_LGUI,KC_LALT,KC_LCTL,  KC_SPC,KC_SPFN,KC_LEFT, KC_DOWN, KC_LEFT, KC_SPFN, KC_RCTL, KC_RALT, KC_RGUI, MOD_HYPR,KC_FUN},
-    },
-    [_LOWER] = {
-        {KC_ESC, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______},
-        {APPTOG,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_7   , KC_8   , KC_9   , KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  XXXXXXX},
-        {APPWIN,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_4   , KC_5   , KC_6   , KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX},
-        {_______, _______, _______, _______, _______, KC_PIPE, KC_1   , KC_2   , KC_3   , KC_BSLS, _______, _______, _______, _______, _______},
-        {_______, _______, _______, _______, _______, _______, KC_0,    KC_PDOT, KC_EQL ,  _______, _______, _______, _______, _______, _______},
-    },
-    [_SPCFN] = {
-        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_MINS,  KC_EQL, KC_DEL},
-        {KC_GRV,  _______, _______, KC_PGUP, _______, KC_LBRC, _______, _______, _______, KC_RBRC, _______, KC_UP,   _______, _______, _______},
-        {_______, _______, KC_HOME, KC_PGDN, KC_END,  KC_LCBR, _______, _______, _______, KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______},
-        {_______, _______, _______, _______, _______, KC_LPRN, _______, _______, _______,   KC_RPRN, _______, _______, _______, _______, _______},
-        {_______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, KC_MUTE, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY},
-    },
-
-    [_FUN] = {
-        {RESET,   _______,   _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, _______, _______, _______, BL_DEC, BL_INC, BL_ON},
-        {_______, QWERTY,_______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, BL_STEP, BL_OFF },
-         {_______, _______,   _______, _______, _______, GAMER, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______},
-        {KC_NLCK, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, _______,   _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______},
-    }
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record){
-  if(record->event.pressed){
-    switch(keycode){
-      // Flip RGB mode on game/qwerty mode
-      case QWERTY:
-        if(record->event.pressed){
-          layer_off(_GAMR);
-          layer_on(_QWERTY);
-          rgblight_mode(1);
-            //rgblight_setrgb(40, 80, 255);
-        }
-        return true;
-      case GAMER:
-        if(record->event.pressed){
-          layer_on(_GAMR);
-          rgblight_mode(10);
-            //rgblight_setrgb(255, 40, 40);
-        }
-        return true;
-      default:
-        return true;
-    }
-  }
-  return true;
-}
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/xd75/keymaps/ipetepete/readme.md b/keyboards/xd75/keymaps/ipetepete/readme.md
deleted file mode 100644
index 05e7b12fb641..000000000000
--- a/keyboards/xd75/keymaps/ipetepete/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 75 keys of goodness
-
-Nothing too far from default except I use SPACE as a function key for 
-arrow keys under the right hand like WASD plus a few small changes
-
diff --git a/keyboards/xd75/keymaps/ipetepete/rules.mk b/keyboards/xd75/keymaps/ipetepete/rules.mk
deleted file mode 100644
index bb01c4641a8d..000000000000
--- a/keyboards/xd75/keymaps/ipetepete/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-
-  include ../../../../Makefile
-endif

From b7955031e48cf15831b92eb00410389aded63a30 Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Mon, 28 Sep 2020 08:12:40 -0700
Subject: [PATCH 12/18] removing old keymaps

---
 keyboards/lets_split/keymaps/ipetepete | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 keyboards/lets_split/keymaps/ipetepete

diff --git a/keyboards/lets_split/keymaps/ipetepete b/keyboards/lets_split/keymaps/ipetepete
deleted file mode 160000
index e1c6c4657a41..000000000000
--- a/keyboards/lets_split/keymaps/ipetepete
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e1c6c4657a414ca3a4c2b5b11e8b8bf0574c2f2e

From e4f6df6276591a5a659def35736dd2413ce3e396 Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Mon, 28 Sep 2020 08:15:13 -0700
Subject: [PATCH 13/18] Added BM60 Poker

---
 keyboards/bm60poker/bm60poker.c               |  84 +++++++++++
 keyboards/bm60poker/bm60poker.h               |  35 +++++
 keyboards/bm60poker/config.h                  |  74 ++++++++++
 keyboards/bm60poker/info.json                 |  76 ++++++++++
 keyboards/bm60poker/keymaps/default/keymap.c  |  34 +++++
 .../bm60poker/keymaps/ipetepete/keymap.c      | 132 ++++++++++++++++++
 .../bm60poker/keymaps/ipetepete/readme.md     |   1 +
 .../bm60poker/keymaps/ipetepete/rules.mk      |   1 +
 keyboards/bm60poker/readme.md                 |  15 ++
 keyboards/bm60poker/rules.mk                  |  29 ++++
 10 files changed, 481 insertions(+)
 create mode 100644 keyboards/bm60poker/bm60poker.c
 create mode 100644 keyboards/bm60poker/bm60poker.h
 create mode 100644 keyboards/bm60poker/config.h
 create mode 100644 keyboards/bm60poker/info.json
 create mode 100644 keyboards/bm60poker/keymaps/default/keymap.c
 create mode 100644 keyboards/bm60poker/keymaps/ipetepete/keymap.c
 create mode 100644 keyboards/bm60poker/keymaps/ipetepete/readme.md
 create mode 100644 keyboards/bm60poker/keymaps/ipetepete/rules.mk
 create mode 100644 keyboards/bm60poker/readme.md
 create mode 100644 keyboards/bm60poker/rules.mk

diff --git a/keyboards/bm60poker/bm60poker.c b/keyboards/bm60poker/bm60poker.c
new file mode 100644
index 000000000000..556e9224382a
--- /dev/null
+++ b/keyboards/bm60poker/bm60poker.c
@@ -0,0 +1,84 @@
+/* Copyright 2020 REPLACE_WITH_YOUR_NAME
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include "bm60poker.h"
+
+// Override these in your individual keymap file
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+
+    matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+    // put your looping keyboard code here
+    // runs every cycle (a lot)
+
+    matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    // put your per-action keyboard code here
+    // runs for every action, just before processing by the firmware
+
+    return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+    led_set_user(usb_led);
+}
+
+
+// DO NOT EDIT
+led_config_t g_led_config = { {
+  { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 },
+  { 14,     15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27 },
+  { 28,     NO_LED, 29,     30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40 },
+  { NO_LED, 41,     42,     43,     44,     45,     46,     47,     48,     49,     50,     51, NO_LED,     52 },
+  { 53,     54,     55,     NO_LED, NO_LED, NO_LED, 56,     NO_LED, NO_LED, 57,     58, NO_LED,     59,     60 }
+}, {
+    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
+    {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 202,   0 },
+    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  ,
+    {   7,  16 }, {  22,  16 }, {  37,  16 }, {  52,  16 }, {  67,  16 }, {  82,  16 }, {  97,  16 }, { 112,  16 }, { 127,  16 }, { 142,  16 }, { 157,  16 }, { 172,  16 }, { 187,  16 }, { 206,  16 },
+    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
+    {  11,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 }, { 198,  32 },
+    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
+    {  18,  48 }, {  30,  48 }, {  45,  48 }, {  60,  48 }, {  75,  48 }, {  90,  48 }, { 105,  48 }, { 120,  48 }, { 135,  48 }, { 150,  48 }, { 165,  48 }, { 191,  48 },
+    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+    {   3,  64 }, {  22,  64 }, {  33,  64 }, { 101,  64 }, { 135,  64 }, { 153,  64 }, { 210,  64 }, { 225,  64 },
+    // UNDERGLOW
+    {   216, 32 }, {  180,  32 }, {  144, 32 }, { 108,  32 }, { 72,  32 }, { 36,  32 }
+}, {
+    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  ,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+    1, 1, 1, 4, 1, 1, 1, 1,
+    // UNDERGLOW
+    2, 2, 2, 2, 2, 2
+} };
+
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/bm60poker/bm60poker.h b/keyboards/bm60poker/bm60poker.h
new file mode 100644
index 000000000000..7d60192ca2ad
--- /dev/null
+++ b/keyboards/bm60poker/bm60poker.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 REPLACE_WITH_YOUR_NAME
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,          \
+    K31,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,            \
+    K40,  K41,  K42,              K46,                K49,  K4A,  K4C,  K4D      \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
+    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
+    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   KC_NO, K4C,   K4D   }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/bm60poker/config.h b/keyboards/bm60poker/config.h
new file mode 100644
index 000000000000..d65d7e9b8f45
--- /dev/null
+++ b/keyboards/bm60poker/config.h
@@ -0,0 +1,74 @@
+/*
+Copyright 2020 REPLACE_WITH_YOUR_NAME
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4B50 // "KP"
+#define PRODUCT_ID      0xEF8C
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KP Republic
+#define PRODUCT         BM60POKER
+#define DESCRIPTION     An RGB 60% hotswappable standard ansi layout board
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN E2
+#define DRIVER_LED_TOTAL 67
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 67
+    #define RGB_MATRIX_KEYPRESSES
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 5 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//     #define RGBLIGHT_EFFECT_BREATHING
+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//     #define RGBLIGHT_EFFECT_SNAKE
+//     #define RGBLIGHT_EFFECT_KNIGHT
+//     #define RGBLIGHT_EFFECT_CHRISTMAS
+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//     #define RGBLIGHT_EFFECT_RGB_TEST
+//     #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/bm60poker/info.json b/keyboards/bm60poker/info.json
new file mode 100644
index 000000000000..f90df81a89c1
--- /dev/null
+++ b/keyboards/bm60poker/info.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "BM60POKER",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "key_count": 61,
+            "layout": [
+                {"label":"K00 (B0,D0)", "x":0, "y":0},
+                {"label":"K01 (B0,D1)", "x":1, "y":0},
+                {"label":"K02 (B0,D2)", "x":2, "y":0},
+                {"label":"K03 (B0,D3)", "x":3, "y":0},
+                {"label":"K04 (B0,D5)", "x":4, "y":0},
+                {"label":"K05 (B0,D4)", "x":5, "y":0},
+                {"label":"K06 (B0,D6)", "x":6, "y":0},
+                {"label":"K07 (B0,D7)", "x":7, "y":0},
+                {"label":"K08 (B0,B4)", "x":8, "y":0},
+                {"label":"K09 (B0,B5)", "x":9, "y":0},
+                {"label":"K0A (B0,B6)", "x":10, "y":0},
+                {"label":"K0B (B0,C6)", "x":11, "y":0},
+                {"label":"K0C (B0,C7)", "x":12, "y":0},
+                {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2},
+                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
+                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
+                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
+                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
+                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
+                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
+                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
+                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
+                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
+                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
+                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
+                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
+                {"label":"K1D (B1,F7)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
+                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
+                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
+                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
+                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
+                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
+                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
+                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
+                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
+                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
+                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
+                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
+                {"label":"K2D (B2,F7)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K31 (B3,D1)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
+                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
+                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
+                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
+                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
+                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
+                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
+                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
+                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
+                {"label":"K3B (B3,C6)", "x":11.25, "y":3},
+                {"label":"K3D (B3,F7)", "x":12.25, "y":3, "w":2.75},
+                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25},
+                {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (E6,C7)", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4D (E6,F7)", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/bm60poker/keymaps/default/keymap.c b/keyboards/bm60poker/keymaps/default/keymap.c
new file mode 100644
index 000000000000..71df760f4f68
--- /dev/null
+++ b/keyboards/bm60poker/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 REPLACE_WITH_YOUR_NAME
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   KC_RGUI,   MO(1),     KC_RCTL
+    ),
+    [1] = LAYOUT(
+        RESET,   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_DEL,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______
+    ),
+
+};
diff --git a/keyboards/bm60poker/keymaps/ipetepete/keymap.c b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
new file mode 100644
index 000000000000..fc7ebb16ab09
--- /dev/null
+++ b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
@@ -0,0 +1,132 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+_qwerty,
+_gamer,
+_colemak,
+_fn,
+_rgb,
+_spcfn
+};
+
+
+enum keycodes {
+glight = SAFE_RANGE,
+gamer,
+qwerty,
+colemak
+};
+
+#define KC_SPFN LT(_spcfn, KC_SPC) // press for space, hold for function layer (aka spacefn)
+
+bool show_wasd = false;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_qwerty] = LAYOUT(
+        KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
+        CTL_T(KC_ESC), 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_LCTL,        KC_LGUI, KC_LALT,                            KC_SPFN,                             KC_RALT, KC_RCTL, MO(_fn),   MO(_rgb)
+    ),
+    // Gamer standard qwerty layout but with normal space for jumping etc
+    [_gamer] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            KC_SPACE,                            _______, _______, _______, _______
+    ),
+    [_colemak] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  _______, _______, _______,
+        _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,          _______,
+        _______,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    _______, _______, _______,           _______,
+        _______, _______, _______,                            KC_SPFN,                            _______, _______, _______,  _______
+    ),
+    [_fn] = LAYOUT(
+        KC_GESC, 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_DEL,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
+        KC_MPLY,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
+        qwerty, colemak, gamer,                            _______,                            _______, _______, _______, _______
+    ),
+    [_rgb] = LAYOUT(
+        _______, 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_DEL,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [_spcfn] = LAYOUT(
+        _______, SGUI(1), SGUI(2), SGUI(3), SGUI(4), SGUI(5), SGUI(6), SGUI(7),  SGUI(8), SGUI(9), SGUI(0), _______,  _______, KC_DEL,
+        _______, _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC,  _______, KC_UP,   _______, _______, _______,  _______, _______,
+        KC_CAPS, _______, _______, KC_PGDN, _______, KC_LCBR, KC_RCBR,  KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, KC_LPRN, KC_RPRN,  _______, _______, _______, _______,           _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+      case qwerty:
+        if (record->event.pressed) {
+            layer_clear();
+            layer_on(_qwerty);
+            set_single_persistent_default_layer(_qwerty);
+        }
+        return false;
+        break;
+      case colemak:
+        if (record->event.pressed) {
+            layer_clear();
+            layer_on(_colemak);
+        }
+        return false;
+        break;
+      case gamer:
+        if (record->event.pressed) {
+            layer_clear();
+            layer_on(_gamer);
+        }
+        return false;
+        break;
+
+  }
+  return true;
+}
+
+void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
+  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
+    }
+  }
+}
+
+
+void rgb_matrix_indicators_kb(void)
+{
+	if (!g_suspend_state && rgb_matrix_config.enable) {
+        switch (biton32(layer_state)) {
+            //case _qwerty:
+            //    rgb_matrix_set_color(26, 0xFF, 0x00, 0x00);
+            //    break;
+            case _colemak:
+                rgb_matrix_set_color(55, 0xFF, 0xFF, 0xFF);
+                break;
+            case _spcfn:
+                rgb_matrix_set_color(22, 0xFF, 0x00, 0x00);
+                rgb_matrix_set_color(35, 0xFF, 0x00, 0x00);
+                rgb_matrix_set_color(36, 0xFF, 0x00, 0x00);
+                rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
+                break;
+            case _gamer:
+                rgb_matrix_set_color(16, 0xFF, 0x00, 0xFF);
+                rgb_matrix_set_color(29, 0xFF, 0x00, 0xFF);
+                rgb_matrix_set_color(30, 0xFF, 0x00, 0xFF);
+                rgb_matrix_set_color(31, 0xFF, 0x00, 0xFF);
+                break;
+        }
+    }
+}
diff --git a/keyboards/bm60poker/keymaps/ipetepete/readme.md b/keyboards/bm60poker/keymaps/ipetepete/readme.md
new file mode 100644
index 000000000000..7d381ff125ba
--- /dev/null
+++ b/keyboards/bm60poker/keymaps/ipetepete/readme.md
@@ -0,0 +1 @@
+# Simple 60% for coding
diff --git a/keyboards/bm60poker/keymaps/ipetepete/rules.mk b/keyboards/bm60poker/keymaps/ipetepete/rules.mk
new file mode 100644
index 000000000000..3a025ba3a393
--- /dev/null
+++ b/keyboards/bm60poker/keymaps/ipetepete/rules.mk
@@ -0,0 +1 @@
+NKRO_ENABLE = yes # USB Nkey Rollover
diff --git a/keyboards/bm60poker/readme.md b/keyboards/bm60poker/readme.md
new file mode 100644
index 000000000000..62dde405c469
--- /dev/null
+++ b/keyboards/bm60poker/readme.md
@@ -0,0 +1,15 @@
+# BM60 Poker 60% Mechanical Keyboard RGB PCB
+
+A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. 
+
+* Keyboard Maintainer: [ipetepete](https://github.com/ipetepete)
+* Hardware Supported: BM60 POKER RGB
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bm60poker:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+Video tutorials for customizing the layout: [QMK Tutorials](https://www.youtube.com/playlist?list=PLZlceRZZjRugJFL-vnenYnDrbMc6wu_e_) - By MechMerlin
diff --git a/keyboards/bm60poker/rules.mk b/keyboards/bm60poker/rules.mk
new file mode 100644
index 000000000000..1abe328fcddf
--- /dev/null
+++ b/keyboards/bm60poker/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+RGB_MATRIX_ENABLE = WS2812
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/

From f9053cad6b67d86e2e7aa36af065686668a3c519 Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Thu, 1 Oct 2020 13:44:53 -0700
Subject: [PATCH 14/18] Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/bm60poker/bm60poker.c               | 36 ++-----------------
 keyboards/bm60poker/bm60poker.h               |  5 +--
 keyboards/bm60poker/config.h                  |  6 +---
 keyboards/bm60poker/info.json                 |  4 +--
 keyboards/bm60poker/keymaps/default/keymap.c  |  4 +--
 .../bm60poker/keymaps/ipetepete/keymap.c      | 17 +++++----
 keyboards/bm60poker/rules.mk                  | 18 ++++------
 7 files changed, 21 insertions(+), 69 deletions(-)

diff --git a/keyboards/bm60poker/bm60poker.c b/keyboards/bm60poker/bm60poker.c
index 556e9224382a..12db673bf6ba 100644
--- a/keyboards/bm60poker/bm60poker.c
+++ b/keyboards/bm60poker/bm60poker.c
@@ -15,36 +15,7 @@
  */
 #include "bm60poker.h"
 
-// Override these in your individual keymap file
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-    led_set_user(usb_led);
-}
-
-
-// DO NOT EDIT
+#ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
   { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 },
   { 14,     15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27 },
@@ -78,7 +49,4 @@ led_config_t g_led_config = { {
     // UNDERGLOW
     2, 2, 2, 2, 2, 2
 } };
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
+#endif
diff --git a/keyboards/bm60poker/bm60poker.h b/keyboards/bm60poker/bm60poker.h
index 7d60192ca2ad..3ff9bfa4f40e 100644
--- a/keyboards/bm60poker/bm60poker.h
+++ b/keyboards/bm60poker/bm60poker.h
@@ -17,7 +17,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_60_ansi( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
     K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
     K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,          \
@@ -30,6 +30,3 @@
     { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D   }, \
     { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   KC_NO, K4C,   K4D   }, \
 }
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/bm60poker/config.h b/keyboards/bm60poker/config.h
index d65d7e9b8f45..5289ddf0b83a 100644
--- a/keyboards/bm60poker/config.h
+++ b/keyboards/bm60poker/config.h
@@ -21,11 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x4B50 // "KP"
-#define PRODUCT_ID      0xEF8C
+#define PRODUCT_ID      0xEF8E
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KP Republic
 #define PRODUCT         BM60POKER
-#define DESCRIPTION     An RGB 60% hotswappable standard ansi layout board
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -69,6 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/bm60poker/info.json b/keyboards/bm60poker/info.json
index f90df81a89c1..d2e13ca46de2 100644
--- a/keyboards/bm60poker/info.json
+++ b/keyboards/bm60poker/info.json
@@ -5,8 +5,7 @@
     "width": 15,
     "height": 5,
     "layouts": {
-        "LAYOUT": {
-            "key_count": 61,
+        "LAYOUT_60_ansi": {
             "layout": [
                 {"label":"K00 (B0,D0)", "x":0, "y":0},
                 {"label":"K01 (B0,D1)", "x":1, "y":0},
@@ -72,5 +71,4 @@
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/bm60poker/keymaps/default/keymap.c b/keyboards/bm60poker/keymaps/default/keymap.c
index 71df760f4f68..ea518a882e04 100644
--- a/keyboards/bm60poker/keymaps/default/keymap.c
+++ b/keyboards/bm60poker/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_ansi(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         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_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   KC_RGUI,   MO(1),     KC_RCTL
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_60_ansi(
         RESET,   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_DEL,
         _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/bm60poker/keymaps/ipetepete/keymap.c b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
index fc7ebb16ab09..00b599122b6a 100644
--- a/keyboards/bm60poker/keymaps/ipetepete/keymap.c
+++ b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
@@ -11,8 +11,7 @@ _spcfn
 
 
 enum keycodes {
-glight = SAFE_RANGE,
-gamer,
+gamer = SAFE_RANGE,
 qwerty,
 colemak
 };
@@ -22,7 +21,7 @@ colemak
 bool show_wasd = false;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_qwerty] = LAYOUT(
+    [_qwerty] = LAYOUT_60_ansi(
         KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         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,
         CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -30,35 +29,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPFN,                             KC_RALT, KC_RCTL, MO(_fn),   MO(_rgb)
     ),
     // Gamer standard qwerty layout but with normal space for jumping etc
-    [_gamer] = LAYOUT(
+    [_gamer] = LAYOUT_60_ansi(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            KC_SPACE,                            _______, _______, _______, _______
     ),
-    [_colemak] = LAYOUT(
+    [_colemak] = LAYOUT_60_ansi(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
         _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  _______, _______, _______,
         _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,          _______,
         _______,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    _______, _______, _______,           _______,
         _______, _______, _______,                            KC_SPFN,                            _______, _______, _______,  _______
     ),
-    [_fn] = LAYOUT(
+    [_fn] = LAYOUT_60_ansi(
         KC_GESC, 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_DEL,
         _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPLY,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
         qwerty, colemak, gamer,                            _______,                            _______, _______, _______, _______
     ),
-    [_rgb] = LAYOUT(
+    [_rgb] = LAYOUT_60_ansi(
         _______, 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_DEL,
         _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     ),
-    [_spcfn] = LAYOUT(
+    [_spcfn] = LAYOUT_60_ansi(
         _______, SGUI(1), SGUI(2), SGUI(3), SGUI(4), SGUI(5), SGUI(6), SGUI(7),  SGUI(8), SGUI(9), SGUI(0), _______,  _______, KC_DEL,
         _______, _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC,  _______, KC_UP,   _______, _______, _______,  _______, _______,
         KC_CAPS, _______, _______, KC_PGDN, _______, KC_LCBR, KC_RCBR,  KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______,
@@ -108,7 +107,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
 void rgb_matrix_indicators_kb(void)
 {
 	if (!g_suspend_state && rgb_matrix_config.enable) {
-        switch (biton32(layer_state)) {
+        switch (get_highest_layer(layer_state)) {
             //case _qwerty:
             //    rgb_matrix_set_color(26, 0xFF, 0x00, 0x00);
             //    break;
diff --git a/keyboards/bm60poker/rules.mk b/keyboards/bm60poker/rules.mk
index 1abe328fcddf..ca6a7955d236 100644
--- a/keyboards/bm60poker/rules.mk
+++ b/keyboards/bm60poker/rules.mk
@@ -7,23 +7,17 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no     # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = WS2812
-
-# generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/

From 955cd26256bcdd5d8ba39eb9c6033a557482be09 Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Thu, 1 Oct 2020 13:46:24 -0700
Subject: [PATCH 15/18] Added license

---
 keyboards/bm60poker/keymaps/ipetepete/keymap.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/keyboards/bm60poker/keymaps/ipetepete/keymap.c b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
index 00b599122b6a..4ba90f07de43 100644
--- a/keyboards/bm60poker/keymaps/ipetepete/keymap.c
+++ b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
@@ -1,3 +1,19 @@
+
+/* Copyright 2020 ipetepete
+  * 
+  * 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 <http://www.gnu.org/licenses/>. 
+  */ 
 #include QMK_KEYBOARD_H
 
 enum layers {

From 884c29080b1a8b6766bdc7987e986bf654021a82 Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Thu, 1 Oct 2020 13:47:00 -0700
Subject: [PATCH 16/18] updated license

---
 keyboards/bm60poker/bm60poker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/bm60poker/bm60poker.c b/keyboards/bm60poker/bm60poker.c
index 12db673bf6ba..a7a335209754 100644
--- a/keyboards/bm60poker/bm60poker.c
+++ b/keyboards/bm60poker/bm60poker.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 REPLACE_WITH_YOUR_NAME
+/* Copyright 2020 ipetepete
  *
  * 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

From c632dce6d89e843edcea3ea7bb5a6e7d5d5dbb91 Mon Sep 17 00:00:00 2001
From: Peter Peterson <peter.peterson.iv@gmail.com>
Date: Thu, 1 Oct 2020 13:47:52 -0700
Subject: [PATCH 17/18] updated license

---
 keyboards/bm60poker/bm60poker.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/bm60poker/bm60poker.h b/keyboards/bm60poker/bm60poker.h
index 3ff9bfa4f40e..02a28377e625 100644
--- a/keyboards/bm60poker/bm60poker.h
+++ b/keyboards/bm60poker/bm60poker.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 REPLACE_WITH_YOUR_NAME
+/* Copyright 2020 ipetepete
  *
  * 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

From 5fae502936d2fbfa0fec2662aa997bae2f37b556 Mon Sep 17 00:00:00 2001
From: Peter P <peter.peterson.iv@gmail.com>
Date: Thu, 1 Oct 2020 14:39:24 -0700
Subject: [PATCH 18/18] Fixed remaining licenses and added layout to rules

---
 keyboards/bm60poker/config.h                   | 2 +-
 keyboards/bm60poker/keymaps/default/keymap.c   | 2 +-
 keyboards/bm60poker/keymaps/ipetepete/keymap.c | 3 ---
 keyboards/bm60poker/rules.mk                   | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/keyboards/bm60poker/config.h b/keyboards/bm60poker/config.h
index 5289ddf0b83a..5eb4ad2a77dd 100644
--- a/keyboards/bm60poker/config.h
+++ b/keyboards/bm60poker/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 REPLACE_WITH_YOUR_NAME
+Copyright 2020 ipetepete
 
 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
diff --git a/keyboards/bm60poker/keymaps/default/keymap.c b/keyboards/bm60poker/keymaps/default/keymap.c
index ea518a882e04..efd74ad134fc 100644
--- a/keyboards/bm60poker/keymaps/default/keymap.c
+++ b/keyboards/bm60poker/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 REPLACE_WITH_YOUR_NAME
+/* Copyright 2020 ipetepete
  *
  * 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
diff --git a/keyboards/bm60poker/keymaps/ipetepete/keymap.c b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
index 4ba90f07de43..e59660242ed5 100644
--- a/keyboards/bm60poker/keymaps/ipetepete/keymap.c
+++ b/keyboards/bm60poker/keymaps/ipetepete/keymap.c
@@ -1,4 +1,3 @@
-
 /* Copyright 2020 ipetepete
   * 
   * This program is free software: you can redistribute it and/or modify 
@@ -34,8 +33,6 @@ colemak
 
 #define KC_SPFN LT(_spcfn, KC_SPC) // press for space, hold for function layer (aka spacefn)
 
-bool show_wasd = false;
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_qwerty] = LAYOUT_60_ansi(
         KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
diff --git a/keyboards/bm60poker/rules.mk b/keyboards/bm60poker/rules.mk
index ca6a7955d236..3f4a00ead5f9 100644
--- a/keyboards/bm60poker/rules.mk
+++ b/keyboards/bm60poker/rules.mk
@@ -21,3 +21,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = WS2812
+LAYOUTS = 60_ansi