Merge pull request #518 from jakllsch/upstream

keymap_extras changes
author: Jack Humbert <jack.humb@gmail.com> 2016-07-21 20:56:54 -0400
committer: GitHub <noreply@github.com> 2016-07-21 20:56:54 -0400
commit: 940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347 (patch)
tree: a9ac37840abf07a069474f3a88b2dd68e80d1aa7
parent: 62a6d3a6f57fa55a016497d88b725cc82c395194 (diff)
parent: 4278d8861526ed285d9d00badcdc8c121454be60 (diff)
download: qmk_firmware-940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347.tar.gz
qmk_firmware-940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347.zip
8 files changed, 20 insertions, 13 deletions
diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h
index e855056e8..17f205977 100644
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@@ -18,18 +18,19 @@
 #define DV_LBRC KC_MINS
 #define DV_RBRC KC_EQL
-#define DV_QUOT KC_Q
+#define DV_QUOT KC_Q
 #define DV_COMM KC_W
 #define DV_DOT  KC_E
 #define DV_P    KC_R
 #define DV_Y    KC_T
 #define DV_F    KC_Y
 #define DV_G    KC_U
-#define DV_C    KC_I
+#define DV_C    KC_I
 #define DV_R    KC_O
 #define DV_L    KC_P
 #define DV_SLSH KC_LBRC
 #define DV_EQL  KC_RBRC
+#define DV_BSLS KC_BSLS
 #define DV_A    KC_A
 #define DV_O    KC_S
@@ -68,7 +69,13 @@
 #define DV_RPRN LSFT(DV_0)
 #define DV_LCBR LSFT(DV_LBRC)
 #define DV_RCBR LSFT(DV_RBRC)
-#define DV_UNDS LSFT(DV_MINS)
-#define DV_PLUS LSFT(DV_EQL)
+#define DV_QUES LSFT(DV_SLSH)
+#define DV_PLUS LSFT(DV_EQL)
+#define DV_PIPE LSFT(DV_BSLS)
+#define DV_UNDS LSFT(DV_MINS)
+#define DV_COLN LSFT(DV_SCLN)
 #endif
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h
index 3fd971357..87d4bb24c 100644
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define FR_CH_ALGR KC_RALT
 // normal characters
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index 2a44c80b1..834c69650 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define NO_ALGR KC_RALT
 // Normal characters
@@ -80,4 +80,4 @@
 #define FR_EURO ALGR(KC_E)
 #define FR_BULT ALGR(FR_DLR)
-#endif
-\ No newline at end of file
+#endif
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index 3f9ae8bad..7e2e0ed44 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define DE_ALGR KC_RALT
 // normal characters
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 6a782bcd7..b66d582a4 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define CH_ALGR KC_RALT
 // normal characters
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 3acb8b698..f8cf4e2e4 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define NO_ALGR KC_RALT
 // Normal characters
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index af76e39fc..4ba568af2 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define NO_ALGR KC_RALT
 // Normal characters
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index 5c5d95179..00c87afc3 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -4,7 +4,7 @@
 #include "keymap.h"
 // Alt gr
-#define ALGR(kc) kc | 0x1400
+#define ALGR(kc) RALT(kc)
 #define NO_ALGR KC_RALT
 // Normal characters
@@ -33,4 +33,4 @@
 #define UK_AACT ALGR(KC_A)
-#endif
-\ No newline at end of file
+#endif
author	Jack Humbert <jack.humb@gmail.com>	2016-07-21 20:56:54 -0400
committer	GitHub <noreply@github.com>	2016-07-21 20:56:54 -0400
commit	940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347 (patch)
tree	a9ac37840abf07a069474f3a88b2dd68e80d1aa7
parent	62a6d3a6f57fa55a016497d88b725cc82c395194 (diff)
parent	4278d8861526ed285d9d00badcdc8c121454be60 (diff)
download	qmk_firmware-940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347.tar.gz qmk_firmware-940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347.zip

diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h index e855056e8..17f205977 100644 --- a/quantum/keymap_extras/keymap_dvorak.h +++ b/quantum/keymap_extras/keymap_dvorak.h
@@ -18,18 +18,19 @@
18	#define DV_LBRC KC_MINS	18	#define DV_LBRC KC_MINS
19	#define DV_RBRC KC_EQL	19	#define DV_RBRC KC_EQL
20		20
21	#define DV_QUOT KC_Q	21	#define DV_QUOT KC_Q
22	#define DV_COMM KC_W	22	#define DV_COMM KC_W
23	#define DV_DOT KC_E	23	#define DV_DOT KC_E
24	#define DV_P KC_R	24	#define DV_P KC_R
25	#define DV_Y KC_T	25	#define DV_Y KC_T
26	#define DV_F KC_Y	26	#define DV_F KC_Y
27	#define DV_G KC_U	27	#define DV_G KC_U
28	#define DV_C KC_I	28	#define DV_C KC_I
29	#define DV_R KC_O	29	#define DV_R KC_O
30	#define DV_L KC_P	30	#define DV_L KC_P
31	#define DV_SLSH KC_LBRC	31	#define DV_SLSH KC_LBRC
32	#define DV_EQL KC_RBRC	32	#define DV_EQL KC_RBRC
		33	#define DV_BSLS KC_BSLS
33		34
34	#define DV_A KC_A	35	#define DV_A KC_A
35	#define DV_O KC_S	36	#define DV_O KC_S
@@ -68,7 +69,13 @@
68	#define DV_RPRN LSFT(DV_0)	69	#define DV_RPRN LSFT(DV_0)
69	#define DV_LCBR LSFT(DV_LBRC)	70	#define DV_LCBR LSFT(DV_LBRC)
70	#define DV_RCBR LSFT(DV_RBRC)	71	#define DV_RCBR LSFT(DV_RBRC)
71	#define DV_UNDS LSFT(DV_MINS)	72
72	#define DV_PLUS LSFT(DV_EQL)	73	#define DV_QUES LSFT(DV_SLSH)
		74	#define DV_PLUS LSFT(DV_EQL)
		75	#define DV_PIPE LSFT(DV_BSLS)
		76
		77	#define DV_UNDS LSFT(DV_MINS)
		78
		79	#define DV_COLN LSFT(DV_SCLN)
73		80
74	#endif	81	#endif


diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h index 3fd971357..87d4bb24c 100644 --- a/quantum/keymap_extras/keymap_fr_ch.h +++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define FR_CH_ALGR KC_RALT	8	#define FR_CH_ALGR KC_RALT
9		9
10	// normal characters	10	// normal characters


diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h index 2a44c80b1..834c69650 100644 --- a/quantum/keymap_extras/keymap_french.h +++ b/quantum/keymap_extras/keymap_french.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define NO_ALGR KC_RALT	8	#define NO_ALGR KC_RALT
9		9
10	// Normal characters	10	// Normal characters
@@ -80,4 +80,4 @@
80	#define FR_EURO ALGR(KC_E)	80	#define FR_EURO ALGR(KC_E)
81	#define FR_BULT ALGR(FR_DLR)	81	#define FR_BULT ALGR(FR_DLR)
82		82
83	#endif \ No newline at end of file	83	#endif


diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h index 3f9ae8bad..7e2e0ed44 100644 --- a/quantum/keymap_extras/keymap_german.h +++ b/quantum/keymap_extras/keymap_german.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define DE_ALGR KC_RALT	8	#define DE_ALGR KC_RALT
9		9
10	// normal characters	10	// normal characters


diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h index 6a782bcd7..b66d582a4 100644 --- a/quantum/keymap_extras/keymap_german_ch.h +++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define CH_ALGR KC_RALT	8	#define CH_ALGR KC_RALT
9		9
10	// normal characters	10	// normal characters


diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h index 3acb8b698..f8cf4e2e4 100644 --- a/quantum/keymap_extras/keymap_nordic.h +++ b/quantum/keymap_extras/keymap_nordic.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define NO_ALGR KC_RALT	8	#define NO_ALGR KC_RALT
9		9
10	// Normal characters	10	// Normal characters


diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h index af76e39fc..4ba568af2 100644 --- a/quantum/keymap_extras/keymap_spanish.h +++ b/quantum/keymap_extras/keymap_spanish.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define NO_ALGR KC_RALT	8	#define NO_ALGR KC_RALT
9		9
10	// Normal characters	10	// Normal characters


diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h index 5c5d95179..00c87afc3 100644 --- a/quantum/keymap_extras/keymap_uk.h +++ b/quantum/keymap_extras/keymap_uk.h
@@ -4,7 +4,7 @@
4	#include "keymap.h"	4	#include "keymap.h"
5		5
6	// Alt gr	6	// Alt gr
7	#define ALGR(kc) kc \| 0x1400	7	#define ALGR(kc) RALT(kc)
8	#define NO_ALGR KC_RALT	8	#define NO_ALGR KC_RALT
9		9
10	// Normal characters	10	// Normal characters
@@ -33,4 +33,4 @@
33		33
34	#define UK_AACT ALGR(KC_A)	34	#define UK_AACT ALGR(KC_A)
35		35
36	#endif \ No newline at end of file	36	#endif