From: Xyverz <xyverz@gmail.com>
Date: Tue, 18 Apr 2017 03:20:27 +0000 (-0700)
Subject: Merge branch 'tv44_revamp'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e11cb44926162fd3df72cdebae9867edf403c538;p=qmk_firmware.git

Merge branch 'tv44_revamp'
---

e11cb44926162fd3df72cdebae9867edf403c538
diff --cc keyboards/tv44/keymaps/xyverz/keymap.c
index f237073c0,d09a11c35..9c1b3076e
--- a/keyboards/tv44/keymaps/xyverz/keymap.c
+++ b/keyboards/tv44/keymaps/xyverz/keymap.c
@@@ -4,19 -4,28 +4,38 @@@
  
  extern keymap_config_t keymap_config;
  
- #define _DV 0
- #define _QW 1
- #define _CM 2
- #define _L1 3
- #define _L2 4
+ enum planck_layers {
+   _QWERTY,
+   _COLEMAK,
+   _DVORAK,
+   _LOWER,
+   _RAISE,
+   _ADJUST
+ };
+ 
+ enum planck_keycodes {
+   DVORAK = SAFE_RANGE,
+   QWERTY,
+   COLEMAK,
+   LOWER,
+   RAISE,
+   ADJUST
+ };
  
++<<<<<<< HEAD
 +// Macro name shortcuts
 +#define DVORAK M(_DV)
 +#define QWERTY M(_QW)
 +#define COLEMAK M(_CM)
 +#define ESCLOWR LT(_L1, KC_ESC)
 +#define MINSRSE LT(_L2, KC_MINS)
 +#define QUOTRSE LT(_L2, KC_QUOT)
++=======
+ // Layer-Tapping macros
+ #define ESCLOWR LT(_LOWER, KC_ESC)
+ #define MINSRSE LT(_RAISE, KC_MINS)
+ #define QUOTRSE LT(_RAISE, KC_QUOT)
++>>>>>>> tv44_revamp
  
  // Fillers to make layering more clear
  #define _______ KC_TRNS