summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-01-24 02:33:35 +0100
committerJack Humbert <jack.humb@gmail.com>2016-01-24 02:33:35 +0100
commit544a49329cac78206c0d195f2e7bfd39db05507d (patch)
treebfcd304f7215738909e1241d73a77a426f5a195c /quantum
parenta820533ab770e1919f190c102a091c1060f6302e (diff)
parente5aee62e54d0b6f02ff170f4e9bf1e738d36fb4c (diff)
downloadqmk_firmware-544a49329cac78206c0d195f2e7bfd39db05507d.tar.gz
qmk_firmware-544a49329cac78206c0d195f2e7bfd39db05507d.tar.xz
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
Diffstat (limited to 'quantum')
-rw-r--r--quantum/keymap_common.h2
-rw-r--r--quantum/keymap_extras/keymap_german.h39
2 files changed, 41 insertions, 0 deletions
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
index 2d8b29c77..3db40772e 100644
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@@ -68,6 +68,7 @@ extern const uint16_t fn_actions[];
#define LGUI(kc) kc | 0x0800
#define HYPR(kc) kc | 0x0F00
#define MEH(kc) kc | 0x0700
+#define LCAG(kc) kc | 0x0D00 // Modifier Ctrl Alt and GUI
#define RCTL(kc) kc | 0x1100
#define RSFT(kc) kc | 0x1200
@@ -193,6 +194,7 @@ extern const uint16_t fn_actions[];
#define GUI_T(kc) MT(0x8, kc)
#define C_S_T(kc) MT(0x3, kc) // Control + Shift e.g. for gnome-terminal
#define MEH_T(kc) MT(0x7, kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl
+#define LCAG_T(kc) MT(0xD, kc) // Left control alt and gui
#define ALL_T(kc) MT(0xF, kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
// Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index bea82f022..dbad26f8a 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -11,6 +11,45 @@
#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