summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-07-25 20:12:15 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-25 20:12:15 -0700
commit7a8c139d072ca8919e685affa1001b4199d52255 (patch)
tree4cf77998b593a7143422c5917c946b09e9be99c5 /keyboards
parent49892272a08766aa270ca5c2aa6f5a108f33bdda (diff)
downloadqmk_firmware-7a8c139d072ca8919e685affa1001b4199d52255.tar.gz
qmk_firmware-7a8c139d072ca8919e685affa1001b4199d52255.zip
Keyboard: E6V2 Layout Fix (#3490)
* add yanfali's patch to get rid of the e6v2 directory in configurator * fix matrix for 60_ansi
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/e6v2/e6v2.c1
-rw-r--r--keyboards/e6v2/e6v2.h14
-rw-r--r--keyboards/e6v2/le/le.h16
-rw-r--r--keyboards/e6v2/oe/oe.h2
-rw-r--r--keyboards/e6v2/rules.mk1
5 files changed, 9 insertions, 25 deletions
diff --git a/keyboards/e6v2/e6v2.c b/keyboards/e6v2/e6v2.c
deleted file mode 100644
index e7d5fe9e36..0000000000
--- a/keyboards/e6v2/e6v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "e6v2.h" \ No newline at end of file
diff --git a/keyboards/e6v2/e6v2.h b/keyboards/e6v2/e6v2.h
deleted file mode 100644
index 5190a3e826..0000000000
--- a/keyboards/e6v2/e6v2.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef E6V2_H
-#define E6V2_H
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_e6v2_oe
- #include "oe.h"
-#endif
-
-#ifdef KEYBOARD_e6v2_le
- #include "le.h"
-#endif
-
-#endif \ No newline at end of file
diff --git a/keyboards/e6v2/le/le.h b/keyboards/e6v2/le/le.h
index f0ec35747a..380efd2a7a 100644
--- a/keyboards/e6v2/le/le.h
+++ b/keyboards/e6v2/le/le.h
@@ -1,7 +1,7 @@
#ifndef LE_H
#define LE_H
-#include "../e6v2.h"
+#include "quantum.h"
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0D, \
@@ -23,14 +23,14 @@
K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K43, K44, K47, K4A, K4B, K4D, K4E \
+ K40, K42, K43, K47, K4A, K4B, K4D, K4E \
)\
{\
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, KC_NO, KC_NO, K43, K44, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E }, \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
+ { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
+ { K40, KC_NO, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E }, \
}
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/e6v2/oe/oe.h b/keyboards/e6v2/oe/oe.h
index 2cfecb0be1..0746039fe7 100644
--- a/keyboards/e6v2/oe/oe.h
+++ b/keyboards/e6v2/oe/oe.h
@@ -1,7 +1,7 @@
#ifndef OE_H
#define OE_H
-#include "../e6v2.h"
+#include "quantum.h"
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
diff --git a/keyboards/e6v2/rules.mk b/keyboards/e6v2/rules.mk
deleted file mode 100644
index 0909ba2ce4..0000000000
--- a/keyboards/e6v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = e6v2/oe \ No newline at end of file