1 files changed, 60 insertions, 20 deletions

diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h
index ad66a636e..92f8f22d2 100644..100755
--- a/users/ericgebhart/ericgebhart.h
+++ b/users/ericgebhart/ericgebhart.h
@@ -1,32 +1,72 @@
 #pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@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 ericgebhart
 #define ericgebhart
 
 #include QMK_KEYBOARD_H
-#include "base_layers.h"
+#include "core_keysets.h"
+#include "layouts.h"
+#include "layers.h"
+#if defined(OLED_ENABLE)
+#    include "oled_stuff.h"
+#endif
 
 
 //#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
+/* Define layer names */
+enum userspace_layers {
+    _DVORAK = 0,
+    _QWERTY,
+    _COLEMAK,
+    _BEAKL,
+    //_WORKMAN,
+    //_NORMAN,
+    //_MALTRON,
+    //_EUCALYN,
+    //_CARPLAX,
+    _DVORAK_BP, // beginning of Bepo
+    _BEAKL_BP,
+    _BEPO,
+    _LAYERS,
+    _NAV,   // transient layers
+    _SYMB,
+    _SYMB_BP,
+    _KEYPAD,
+    _KEYPAD_BP,
+    _TOPROWS,
+    _TOPROWS_BP,
+    _RGB,
+    _ADJUST,
+};
 
-#define DVORAK 0 // dvorak layout (default)
-#define QWERTY 1
-#define COLEMAK 2
-#define WORKMAN 3
-#define NORMAN 4
-// bepo layers
-#define DVORAK_ON_BEPO 6 // dvorak layout (default)
-#define BEPO 7 // Bepo
-// non-default layers
-#define SYMB 8 // symbols and numbers
-#define SYMB_ON_BEPO 9 // symbols and numbers
-#define MDIA 10 // mouse knd media eys
-#define LAYERS 11 // layers and right mousekeys.
-#define XMONAD 12 // xmonad ie. dvorak.
-#define XMONAD_FR 13 // xmonad ie. dvorak.
-#define KEYPAD 14 // number and Fkey pads
-#define KEYPAD_ON_BEPO 15 // number and Fkey pads.
-#define _RGB 16 // RGB stuff.
-
+// clang-format off
+typedef union {
+  uint32_t raw;
+  struct {
+    bool    rgb_layer_change     :1;
+    bool    is_overwatch         :1;
+    bool    nuke_switch          :1;
+    bool    swapped_numbers      :1;
+    bool    rgb_matrix_idle_anim :1;
+  };
+} userspace_config_t;
+// clang-format on
+extern userspace_config_t userspace_config;
 
 #endif