From: tmk <tmk@users.noreply.github.com>
Date: Tue, 29 Nov 2016 13:52:48 +0000 (+0900)
Subject: Merge pull request #410 from erikpe/master
X-Git-Url: https://git.gir.st/tmk_keyboard.git/commitdiff_plain/611a9388f9c5a3f61525d01dee0e3754750a74ce?hp=7ecbdf3b41f884a2970f62cb91259fc8a38f2e58

Merge pull request #410 from erikpe/master

phantom: Fix compile error and incorrectly aligned ISO layout
---

diff --git a/orphan/phantom/keymap.c b/orphan/phantom/keymap.c
index a040434f..81180aa5 100644
--- a/orphan/phantom/keymap.c
+++ b/orphan/phantom/keymap.c
@@ -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;
 }
diff --git a/orphan/phantom/keymap_iso.h b/orphan/phantom/keymap_iso.h
index 80e50731..af92e25e 100644
--- a/orphan/phantom/keymap_iso.h
+++ b/orphan/phantom/keymap_iso.h
@@ -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)
 };