Merge pull request qmk#53 from sboesebeck/master

minor updates
sethherr · Dec 22, 2015 · b1fbd4c · b1fbd4c
2 parents 4011901 + 370e902
commit b1fbd4c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/keyboard/ergodox_ez/keymaps/keymap_de_osx_highres.png b/keyboard/ergodox_ez/keymaps/keymap_de_osx_highres.png
diff --git 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,19 +135,19 @@ 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
 ),
 // 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
@@ -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