Merge branch 'master' into j3rn-keymap

2 files changed, 177 insertions, 0 deletions

diff --git a/quantum/keymap_extras/keymap_french_osx.h b/quantum/keymap_extras/keymap_french_osx.h
new file mode 100644
index 0000000000..eb31bfb4d0
--- /dev/null
+++ b/quantum/keymap_extras/keymap_french_osx.h
@@ -0,0 +1,77 @@
+#ifndef KEYMAP_FRENCH_OSX_H
+#define KEYMAP_FRENCH_OSX_H
+
+#include "keymap_common.h"
+
+// Normal characters
+#define FR_AT 	KC_GRV
+#define FR_AMP	KC_1
+#define FR_EACU	KC_2
+#define FR_QUOT	KC_3
+#define FR_APOS	KC_4
+#define FR_LPRN	KC_5
+#define FR_SECT	KC_6
+#define FR_EGRV	KC_7
+#define FR_EXLM	KC_8
+#define FR_CCED	KC_9
+#define FR_AGRV	KC_0
+#define FR_RPRN	KC_MINS
+#define FR_MINS	KC_EQL
+
+#define FR_A 	KC_Q
+#define FR_Z	KC_W
+#define FR_CIRC	KC_LBRC
+#define FR_DLR	KC_RBRC
+
+#define FR_Q 	KC_A
+#define FR_M 	KC_SCLN
+#define FR_UGRV	KC_QUOT
+#define FR_GRV	KC_NUHS
+
+#define FR_LESS	KC_NUBS
+#define FR_W	KC_Z
+#define FR_COMM	KC_M
+#define FR_SCLN	KC_COMM
+#define FR_COLN	KC_DOT
+#define FR_EQL	KC_SLSH
+
+// Shifted characters
+#define FR_HASH	LSFT(KC_GRV)
+#define FR_1 	LSFT(KC_1)
+#define FR_2 	LSFT(KC_2)
+#define FR_3 	LSFT(KC_3)
+#define FR_4 	LSFT(KC_4)
+#define FR_5 	LSFT(KC_5)
+#define FR_6 	LSFT(KC_6)
+#define FR_7 	LSFT(KC_7)
+#define FR_8 	LSFT(KC_8)
+#define FR_9 	LSFT(KC_9)
+#define FR_0 	LSFT(KC_0)
+#define FR_UNDS	LSFT(FR_MINS)
+
+#define FR_UMLT	LSFT(FR_CIRC)
+#define FR_ASTR	LSFT(FR_DLR)
+
+#define FR_PERC	LSFT(FR_UGRV)
+#define FR_PND	LSFT(FR_GRV)
+
+#define FR_GRTR	LSFT(FR_LESS)
+#define FR_QUES	LSFT(FR_COMM)
+#define FR_DOT	LSFT(FR_SCLN)
+#define FR_SLSH	LSFT(FR_COLN)
+#define FR_PLUS	LSFT(FR_EQL)
+
+// Alted characters
+#define FR_LCBR	LALT(KC_5)
+#define FR_RCBR	LALT(FR_RPRN)
+#define FR_EURO	LALT(KC_E)
+#define FR_BULT	LALT(FR_DLR)
+#define FR_TILD	LALT(KC_N)
+
+// Shift+Alt-ed characters
+#define FR_LBRC	LSFT(LALT(KC_5))
+#define FR_RBRC	LSFT(LALT(FR_RPRN))
+#define FR_PIPE	LSFT(LALT(KC_L))
+#define FR_BSLS	LSFT(LALT(FR_COLN))
+
+#endif
\ No newline at end of file
diff --git a/quantum/keymap_extras/keymap_german_osx.h b/quantum/keymap_extras/keymap_german_osx.h
new file mode 100644
index 0000000000..b011561e2f
--- /dev/null
+++ b/quantum/keymap_extras/keymap_german_osx.h
@@ -0,0 +1,100 @@
+#ifndef KEYMAP_GERMAN_OSX
+#define KEYMAP_GERMAN_OSX
+
+#ifdef KEYMAP_GERMAN
+	#warning redefining german keys
+#endif
+#include "keymap_common.h"
+
+// Alt gr
+
+// normal characters
+#define DE_Z KC_Y
+#define DE_Y KC_Z
+
+#define DE_A KC_A 
+#define DE_B KC_B
+#define DE_C KC_C
+#define DE_D KC_D
+#define DE_E KC_E
+#define DE_F KC_F
+#define DE_G KC_G
+#define DE_H KC_H
+#define DE_I KC_I
+#define DE_J KC_J
+#define DE_K KC_K
+#define DE_L KC_L
+#define DE_M KC_M
+#define DE_N KC_N
+#define DE_O KC_O
+#define DE_P KC_P
+#define DE_Q KC_Q
+#define DE_R KC_R
+#define DE_S KC_S
+#define DE_T KC_T
+#define DE_U KC_U
+#define DE_V KC_V
+#define DE_W KC_W
+#define DE_X KC_X
+
+#define DE_0 KC_0
+#define DE_1 KC_1
+#define DE_2 KC_2
+#define DE_3 KC_3
+#define DE_4 KC_4
+#define DE_5 KC_5
+#define DE_6 KC_6
+#define DE_7 KC_7
+#define DE_8 KC_8
+#define DE_9 KC_9
+
+#define DE_DOT KC_DOT
+#define DE_COMM KC_COMM
+
+#define DE_SS KC_MINS
+#define DE_AE KC_QUOT
+#define DE_UE KC_LBRC
+#define DE_OE KC_SCLN
+
+#define DE_CIRC KC_NUBS // accent circumflex ^ and ring °
+#define DE_ACUT KC_EQL // accent acute ´ and grave `
+#define DE_PLUS KC_RBRC // + and * and ~
+#define DE_HASH KC_BSLS // # and '
+#define DE_LESS KC_GRV // < and > and |
+#define DE_MINS KC_SLSH // - and _
+
+// shifted characters
+#define DE_RING LSFT(DE_CIRC) // °
+#define DE_EXLM LSFT(KC_1) // !
+#define DE_DQOT LSFT(KC_2) // "
+#define DE_PARA LSFT(KC_3) // §
+#define DE_DLR  LSFT(KC_4) // $
+#define DE_PERC LSFT(KC_5) // %
+#define DE_AMPR LSFT(KC_6) // &
+#define DE_SLSH LSFT(KC_7) // /
+#define DE_LPRN LSFT(KC_8) // (
+#define DE_RPRN LSFT(KC_9) // )
+#define DE_EQL  LSFT(KC_0) // =
+#define DE_QST  LSFT(DE_SS) // ?
+#define DE_GRV  LSFT(DE_ACUT) // `
+#define DE_ASTR LSFT(DE_PLUS) // *
+#define DE_QUOT LSFT(DE_HASH) // '
+#define DE_MORE LSFT(DE_LESS) // >
+#define DE_COLN LSFT(KC_DOT) // :
+#define DE_SCLN LSFT(KC_COMM) // ;
+#define DE_UNDS LSFT(DE_MINS) // _
+
+// Alt-ed characters
+#define DE_SQ2 LALT(KC_2) // ²
+#define DE_SQ3 LALT(KC_3) // ³
+#define DE_LCBR LALT(KC_7) // {
+#define DE_LBRC LALT(KC_5) // [
+#define DE_RBRC LALT(KC_6) // ]
+#define DE_RCBR LALT(KC_9) // }
+#define DE_BSLS LALT(LSFT(KC_7)) // backslash
+#define DE_AT  LALT(DE_L) // @
+#define DE_EURO LALT(KC_E) // €
+#define DE_TILD LALT(DE_N) // ~
+#define DE_PIPE LALT(DE_7) // |
+
+#endif