Browse Source
Merge pull request #410 from erikpe/master
phantom: Fix compile error and incorrectly aligned ISO layoutmaster
tmk
7 years ago
2 changed files with 4 additions and 4 deletions
+ 1
- 1
orphan/phantom/keymap.c
View File
| if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { | if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { | ||||
| action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); | action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); | ||||
| } else { | } else { | ||||
| action.code = ACTION_NO; | |||||
| return (action_t)ACTION_NO; | |||||
| } | } | ||||
| return action; | return action; | ||||
| } | } |
+ 3
- 3
orphan/phantom/keymap_iso.h
View File
| /* 1: media keys */ | /* 1: media keys */ | ||||
| KEYMAP_ISO(\ | 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,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,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ | ||||
| TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) | TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) | ||||
| }; | }; |
Loading…