Merge remote-tracking branch 'origin/master' into develop

3 files changed, 74 insertions, 0 deletions

diff --git a/keyboards/kinesis/keymaps/ericgebhart/keymap.c b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
new file mode 100644
index 0000000000..731e257b05
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,53 @@
+/*
+  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/>.
+*/
+#include "keymap_bepo.h"
+#include "ericgebhart.h"
+
+#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
+
+#define Kinesis_base(...)        Base_4x6_4_6(__VA_ARGS__)
+#define Kinesis_bepo_base(...)   Base_bepo_4x6_4_6(__VA_ARGS__)
+#define Kinesis_bepo_base6(...)  Base_bepo6_4x6_4_6(__VA_ARGS__)
+#define Kinesis_transient(...)   Transient6_4x6_4_6(__VA_ARGS__)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  // Qwerty Base layers
+  [_DVORAK]  = Kinesis_base(___NUMS___, ___DVORAK___),
+  [_QWERTY]  = Kinesis_base(___NUMS___, ___QWERTY___),
+  [_COLEMAK] = Kinesis_base(___NUMS___, ___COLEMAK_DH___),
+  [_BEAKL]   = Kinesis_base(___BKLNUMS___, ___BEAKL15___),
+  // Bepo Base layers
+  [_DVORAK_BP] = Kinesis_bepo_base(___NUMS_BP___, ___DVORAK_FR___),
+  [_BEAKL_BP]  = Kinesis_bepo_base(___BKLNUMS_BP___,   ___BEAKL15_FR___),
+
+  [_BEPO]      = Kinesis_bepo_base6(___BEPO6___),
+
+  // transient layers.
+  // Switch to using a transient layer macro
+  [_SYMB]    = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___),
+  [_SYMB_BP] = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___),
+
+  [_TOPROWS]    = Kinesis_transient(___12___, ___TOPROWS_3x12___),
+  [_TOPROWS_BP] = Kinesis_transient(___12___, ___TOPROWS_BP_3x12___),
+
+  [_NAV]    = Kinesis_transient(___12___, ___NAV_3x12___),
+  [_LAYERS] = Kinesis_transient(___12___, ___LAYERS_3x12___),
+  [_ADJUST] = Kinesis_transient(___12___, ___ADJUST_3x12___),
+  //[_RGB]    = Kinesis_transient(___12___, ___RGB_3x12___),
+};
diff --git a/keyboards/kinesis/keymaps/ericgebhart/readme.md b/keyboards/kinesis/keymaps/ericgebhart/readme.md
new file mode 100644
index 0000000000..3a47968596
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/readme.md
@@ -0,0 +1,5 @@
+Overview
+========
+
+These are my keymaps. There isn't much here. Go take a look at my Userspace readme.
+That's where all the code is.
diff --git a/keyboards/kinesis/keymaps/ericgebhart/rules.mk b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
new file mode 100644
index 0000000000..61115e927a
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
@@ -0,0 +1,16 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+