summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2015-12-21 19:31:31 -0500
committerJack Humbert <jack.humb@gmail.com>2015-12-21 19:31:31 -0500
commitb1fbd4c9ca83258f14c1cd90337241d2edc7005d (patch)
tree770fc59786d1b0fc289de6f93607bbeffde0d5f2
parent40119017f2cc240f54d356dfaf01db9e06b3702c (diff)
parent370e9028acb0bcd2a7bf816b8007f989a68b0fda (diff)
Merge pull request #53 from sboesebeck/master
minor updates
-rw-r--r--keyboard/ergodox_ez/keymaps/keymap_de_osx_highres.pngbin0 -> 755855 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/keymap_osx_de.c16
-rw-r--r--keyboard/ergodox_ez/keymaps/keymap_osx_de.hex14
3 files changed, 15 insertions, 15 deletions
diff --git a/keyboard/ergodox_ez/keymaps/keymap_de_osx_highres.png b/keyboard/ergodox_ez/keymaps/keymap_de_osx_highres.png
new file mode 100644
index 0000000000..c16436f2c3
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/keymap_de_osx_highres.png
Binary files differ
diff --git a/keyboard/ergodox_ez/keymaps/keymap_osx_de.c b/keyboard/ergodox_ez/keymaps/keymap_osx_de.c
index bd7be78a34..1705eb7d68 100644
--- a/keyboard/ergodox_ez/keymaps/keymap_osx_de.c
+++ b/keyboard/ergodox_ez/keymaps/keymap_osx_de.c
@@ -67,9 +67,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | # | $ | \ | / | . |------| |------| / | ( | ) | { | } | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | ^ | % | | | ~ | | | | & | < | > | " | ' | |
+ * | | | ^ | % | | | ~ | | | | & | < | > | " | ' | ? |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | ! | | |
+ * | | | | | | | | | . | ! | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | | | | | |
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_TRNS, DE_BSLS, DE_LBRC, DE_RBRC, DE_PIPE, DE_HASH, KC_F12,
DE_SLSH, DE_LPRN, DE_RPRN, DE_LCBR, DE_RCBR, KC_TRNS,
- KC_TRNS, DE_AMPR, DE_LESS, DE_MORE, DE_DQOT, DE_QUOT, KC_TRNS,
+ KC_TRNS, DE_AMPR, DE_LESS, DE_MORE, DE_DQOT, DE_QUOT, DE_QST,
KC_TRNS,KC_DOT, KC_EXLM, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
@@ -135,8 +135,8 @@ KEYMAP(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_MUTE, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,
+ KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_RIGHT,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_WBAK
@@ -144,10 +144,10 @@ KEYMAP(
// Cursor layer
KEYMAP(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboard/ergodox_ez/keymaps/keymap_osx_de.hex b/keyboard/ergodox_ez/keymaps/keymap_osx_de.hex
index 221cceb5c9..a66ce6a24b 100644
--- a/keyboard/ergodox_ez/keymaps/keymap_osx_de.hex
+++ b/keyboard/ergodox_ez/keymaps/keymap_osx_de.hex
@@ -33,21 +33,21 @@
:100200006400010001004100261426026402370048
:1002100001004200641424141F021E020100430066
:1002200031002714310201000100440045000100A3
-:1002300001000100000001000100010001000100B7
+:100230002D02010000000100010001000100010089
:1002400000000100010001000100010001000100A7
:100250000100F2000100010001000100F000F100C6
:100260000100F400010001000100F3000100F500AD
:100270000100010001000100010000000100010077
:100280000100000001000000010001000100000069
:100290000100000001000100010001000100000058
-:1002A00001000100010001000100A900010001009E
+:1002A0000100010001000100A800A90001000100F7
:1002B00001000100AC00AA00B6000100010001002D
-:1002C000AB00A800010001000100010001000100D5
-:1002D0000100AE000100010001000100000001006A
+:1002C000AB0050000100010001000100520051008C
+:1002D0000100AE000100010001004F00000001001C
:1002E0000100010001000100000001000100010007
-:1002F00001000100010001000100500001000100A7
-:1003000001000100520051000100F4000100010051
-:1003100001004F000100F500010001000100010093
+:1002F00001000100010001000100010001000100F6
+:1003000001000100010001000100010001000100E5
+:1003100001000100010001000100010001000100D5
:1003200001000000010001000100000001000000C8
:1003300001000100010000000100000001000100B7
:1003400001000100010000000100010001000100A6