Merge pull request #410 from erikpe/master
authortmk <tmk@users.noreply.github.com>
Tue, 29 Nov 2016 13:52:48 +0000 (22:52 +0900)
committerGitHub <noreply@github.com>
Tue, 29 Nov 2016 13:52:48 +0000 (22:52 +0900)
phantom: Fix compile error and incorrectly aligned ISO layout

orphan/phantom/keymap.c
orphan/phantom/keymap_iso.h

index a040434f2478113b6c242f7b35c7708d2247b4cf..81180aa53a9ad708923aa84e33df6abb0ffaaebc 100644 (file)
@@ -145,7 +145,7 @@ action_t keymap_fn_to_action(uint8_t keycode)
     if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) {
         action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]);
     } else {
-        action.code = ACTION_NO;
+        return (action_t)ACTION_NO;
     }
     return action;
 }
index 80e507318c27cb55444ec159de2940ff6bdf46c7..af92e25eb2c8581f77abaf8836fc0c7d787a7d31 100644 (file)
@@ -11,9 +11,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 1: media keys */
     KEYMAP_ISO(\
         TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      TRNS,TRNS,SLEP, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,           TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL,      TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,                      \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS,      TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,           TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSEL,                      \
         TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     CAPS,           TRNS,      \
         TRNS,TRNS,TRNS,               TRNS,               TRNS,TRNS,TRNS,TRNS,      TRNS,TRNS,TRNS)
 };
Imprint / Impressum