diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-04-07 23:32:14 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-04-07 23:32:14 -0700 |
| commit | 1f778684276e90609c183045a72c96c3c12d452c (patch) | |
| tree | 75257bcb0b5f607ef7bcb70dccd6b73d9f7d7d07 /keyboards/s60_x/keymaps/ansi_qwertz/keymap.c | |
| parent | 958521c3596452eef77e9ad69734ad955120b2b5 (diff) | |
| download | qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.tar.gz qmk_firmware-1f778684276e90609c183045a72c96c3c12d452c.zip | |
More Configurator Warning Fixes (#2716)
* mf68_ble did not have the correct .c and .h files
* Fix JC65 KEYMAP to LAYOUT
* Change KEYMAP to LAYOUT for s60_x
* Convert KEYMAP to LAYOUT for lets_split boards
* Convert KEYMAP to LAYOUT
* more fixes to keymap for iris
* convert KEYMAP to LAYOUT for levinson keyboard
* change losinggeneration's KEYMAP to LAYOUT
* convert KEYMAP to LAYOUT
* convert KEYMAP to LAYOUT for nyquist
* convert KEYMAP to LAYOUT
* convert KEYMAP to LAYOUT for viterbi
* convert KEYMAP to LAYOUT
* convert KEYMAP and its subsidiries to the LAYOUT standard
* convert KEYMAP and its subsidiries to the new LAYOUT standard
Diffstat (limited to 'keyboards/s60_x/keymaps/ansi_qwertz/keymap.c')
| -rw-r--r-- | keyboards/s60_x/keymaps/ansi_qwertz/keymap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c b/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c index ebb3aece3..c8ad8ae33 100644 --- a/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c +++ b/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c | |||
| @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 100 | * |Fn2 |Gui |Alt | SpaceFn |Alt |Left|Down|Right| | 100 | * |Fn2 |Gui |Alt | SpaceFn |Alt |Left|Down|Right| |
| 101 | * `-----------------------------------------------------------' | 101 | * `-----------------------------------------------------------' |
| 102 | */ | 102 | */ |
| 103 | [DEFAULT] = KEYMAP( | 103 | [DEFAULT] = LAYOUT( |
| 104 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, \ | 104 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, \ |
| 105 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ | 105 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ |
| 106 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ | 106 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ |
| @@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 121 | * | |RSft| | Space | | | | | | 121 | * | |RSft| | Space | | | | | |
| 122 | * `-----------------------------------------------------------' | 122 | * `-----------------------------------------------------------' |
| 123 | */ | 123 | */ |
| 124 | [GAMING] = KEYMAP( | 124 | [GAMING] = LAYOUT( |
| 125 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 125 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 126 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 126 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 127 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 127 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| @@ -134,16 +134,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 134 | * ,-----------------------------------------------------------. | 134 | * ,-----------------------------------------------------------. |
| 135 | * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|RES| | 135 | * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|RES| |
| 136 | * |-----------------------------------------------------------| | 136 | * |-----------------------------------------------------------| |
| 137 | * | | | | |Prv|Ply|Nxt| Ü | | Ö | |Prt|Slk|Pau | | 137 | * | | | | |Prv|Ply|Nxt| � | | � | |Prt|Slk|Pau | |
| 138 | * |-----------------------------------------------------------| | 138 | * |-----------------------------------------------------------| |
| 139 | * | | Ä | ß | |Vl-|Mut|Vl+| | | | | |PEnt | | 139 | * | | � | � | |Vl-|Mut|Vl+| | | | | |PEnt | |
| 140 | * |-----------------------------------------------------------| | 140 | * |-----------------------------------------------------------| |
| 141 | * | | | | |MicMut|Cal| | | | |Pau |PUp |Fn1 | | 141 | * | | | | |MicMut|Cal| | | | |Pau |PUp |Fn1 | |
| 142 | * |-----------------------------------------------------------| | 142 | * |-----------------------------------------------------------| |
| 143 | * | | | | | |Home|PDn |End | | 143 | * | | | | | |Home|PDn |End | |
| 144 | * `-----------------------------------------------------------' | 144 | * `-----------------------------------------------------------' |
| 145 | */ | 145 | */ |
| 146 | [FUNCTION] = KEYMAP( | 146 | [FUNCTION] = LAYOUT( |
| 147 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, RESET, \ | 147 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, RESET, \ |
| 148 | _______, _______, KC_CM_W, KC_CM_E, KC_MPRV, KC_MPLY, KC_MNXT, KC_CM_U, KC_CM_I, KC_CM_O, KC_CM_P, KC_PSCR, KC_SLCK, KC_PAUS, \ | 148 | _______, _______, KC_CM_W, KC_CM_E, KC_MPRV, KC_MPLY, KC_MNXT, KC_CM_U, KC_CM_I, KC_CM_O, KC_CM_P, KC_PSCR, KC_SLCK, KC_PAUS, \ |
| 149 | _______, KC_CM_A, KC_CM_S, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_CM_K, KC_CM_L, _______, _______, _______, KC_PENT, \ | 149 | _______, KC_CM_A, KC_CM_S, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_CM_K, KC_CM_L, _______, _______, _______, KC_PENT, \ |
| @@ -212,9 +212,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 212 | #ifndef DONT_REVIVE_DEADKEYS | 212 | #ifndef DONT_REVIVE_DEADKEYS |
| 213 | bool shift_active = keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LSFT)); | 213 | bool shift_active = keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LSFT)); |
| 214 | bool altgr_active = keyboard_report->mods & (MOD_BIT(KC_RALT)); | 214 | bool altgr_active = keyboard_report->mods & (MOD_BIT(KC_RALT)); |
| 215 | if ((keycode == KC_QUOT && !altgr_active) || | 215 | if ((keycode == KC_QUOT && !altgr_active) || |
| 216 | keycode == KC_GRV || | 216 | keycode == KC_GRV || |
| 217 | (keycode == KC_6 && shift_active)) | 217 | (keycode == KC_6 && shift_active)) |
| 218 | { | 218 | { |
| 219 | if (record->event.pressed) { | 219 | if (record->event.pressed) { |
| 220 | register_code(keycode); | 220 | register_code(keycode); |
| @@ -234,4 +234,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 234 | 234 | ||
| 235 | void led_set_user(uint8_t usb_led) { | 235 | void led_set_user(uint8_t usb_led) { |
| 236 | 236 | ||
| 237 | } \ No newline at end of file | 237 | } |
