aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/keymap_extras
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-18 14:30:24 -0400
committerGitHub <noreply@github.com>2016-06-18 14:30:24 -0400
commitdb32864ce7029d758f57729cc2f75e051a28d0a2 (patch)
treef3ac60d9c826a9ad5ef5bc4d199efaddae156ba6 /quantum/keymap_extras
parent1923cffd41d9d71cd9f434092654dba05513137b (diff)
downloadfirmware-db32864ce7029d758f57729cc2f75e051a28d0a2.tar.gz
firmware-db32864ce7029d758f57729cc2f75e051a28d0a2.tar.bz2
firmware-db32864ce7029d758f57729cc2f75e051a28d0a2.zip
Cleans up quantum/keymap situation, removes extra lufa folders (#416)
* sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff
Diffstat (limited to 'quantum/keymap_extras')
-rw-r--r--quantum/keymap_extras/keymap_bepo.h2
-rw-r--r--quantum/keymap_extras/keymap_colemak.h2
-rw-r--r--quantum/keymap_extras/keymap_dvorak.h2
-rw-r--r--quantum/keymap_extras/keymap_fr_ch.h2
-rw-r--r--quantum/keymap_extras/keymap_french.h2
-rw-r--r--quantum/keymap_extras/keymap_french_osx.h2
-rw-r--r--quantum/keymap_extras/keymap_german.h2
-rw-r--r--quantum/keymap_extras/keymap_german_ch.h2
-rw-r--r--quantum/keymap_extras/keymap_german_osx.h2
-rw-r--r--quantum/keymap_extras/keymap_neo2.h2
-rw-r--r--quantum/keymap_extras/keymap_nordic.h2
-rw-r--r--quantum/keymap_extras/keymap_plover.h2
-rw-r--r--quantum/keymap_extras/keymap_spanish.h2
-rw-r--r--quantum/keymap_extras/keymap_uk.h2
14 files changed, 14 insertions, 14 deletions
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 1ab2d63dd..4c3096054 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -2,7 +2,7 @@
#ifndef KEYMAP_BEPO_H
#define KEYMAP_BEPO_H
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#ifndef ALTGR
diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h
index 8a418c615..b8d615748 100644
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_COLEMAK_H
#define KEYMAP_COLEMAK_H
-#include "keymap_common.h"
+#include "keymap.h"
// For software implementation of colemak
#define CM_Q KC_Q
#define CM_W KC_W
diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h
index 93e355bf9..e855056e8 100644
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_DVORAK_H
#define KEYMAP_DVORAK_H
-#include "keymap_common.h"
+#include "keymap.h"
// Normal characters
#define DV_GRV KC_GRV
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h
index d3884c19a..3fd971357 100644
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_FR_CH
#define KEYMAP_FR_CH
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index e03a121a2..2a44c80b1 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_FRENCH_H
#define KEYMAP_FRENCH_H
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400
diff --git a/quantum/keymap_extras/keymap_french_osx.h b/quantum/keymap_extras/keymap_french_osx.h
index eb31bfb4d..004d73ee2 100644
--- a/quantum/keymap_extras/keymap_french_osx.h
+++ b/quantum/keymap_extras/keymap_french_osx.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_FRENCH_OSX_H
#define KEYMAP_FRENCH_OSX_H
-#include "keymap_common.h"
+#include "keymap.h"
// Normal characters
#define FR_AT KC_GRV
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index dbad26f8a..3f9ae8bad 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_GERMAN
#define KEYMAP_GERMAN
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 0874abf7d..6a782bcd7 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_SWISS_GERMAN
#define KEYMAP_SWISS_GERMAN
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400
diff --git a/quantum/keymap_extras/keymap_german_osx.h b/quantum/keymap_extras/keymap_german_osx.h
index ee725bad5..b2040a278 100644
--- a/quantum/keymap_extras/keymap_german_osx.h
+++ b/quantum/keymap_extras/keymap_german_osx.h
@@ -4,7 +4,7 @@
#ifdef KEYMAP_GERMAN
#warning redefining german keys
#endif
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index a35ba55a5..b54cb74b9 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_NEO2
#define KEYMAP_NEO2
-#include "keymap_common.h"
+#include "keymap.h"
#include "keymap_extras/keymap_german.h"
#define NEO_A KC_D
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 7ef41fb79..3acb8b698 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_NORDIC_H
#define KEYMAP_NORDIC_H
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400
diff --git a/quantum/keymap_extras/keymap_plover.h b/quantum/keymap_extras/keymap_plover.h
index 98e57ab7b..9b88f7d84 100644
--- a/quantum/keymap_extras/keymap_plover.h
+++ b/quantum/keymap_extras/keymap_plover.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_PLOVER_H
#define KEYMAP_PLOVER_H
-#include "keymap_common.h"
+#include "keymap.h"
#define PV_NUM KC_1
#define PV_LS KC_Q
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index 7f980afbc..512d8a374 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_SPANISH_H
#define KEYMAP_SPANISH_H
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index 5b4bd3c0d..5c5d95179 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_UK_H
#define KEYMAP_UK_H
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#define ALGR(kc) kc | 0x1400