From d14f72e2f73309ab61fee8945a95bb3266cdffe7 Mon Sep 17 00:00:00 2001 From: Erik Pettersson Date: Sat, 26 Nov 2016 09:58:21 +0100 Subject: [PATCH 1/2] Fix to make phantom board compile --- orphan/phantom/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From ed538bdeb4ca6a8c70a0f992ab542a8fecae79e4 Mon Sep 17 00:00:00 2001 From: Erik Pettersson Date: Mon, 28 Nov 2016 13:19:50 +0100 Subject: [PATCH 2/2] Fix error in media layer for phantom iso keymap. --- orphan/phantom/keymap_iso.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) };