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
| @@ -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; | |||
| } | |||
+ 3
- 3
orphan/phantom/keymap_iso.h
View 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) | |||
| }; | |||
Loading…