aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Uhl <felix.uhl@outlook.de>2016-08-18 11:56:44 +0200
committerFelix Uhl <felix.uhl@outlook.de>2016-08-18 11:56:44 +0200
commit73f13c8f26f7f3777cec9d3036628a7dd6021ee9 (patch)
tree2a9f15363e37b676bb66a2500bd4489a3eddc41d
parenta72dc6da70923aa6f5127e719529e9631bce20f0 (diff)
downloadqmk_firmware-73f13c8f26f7f3777cec9d3036628a7dd6021ee9.tar.gz
qmk_firmware-73f13c8f26f7f3777cec9d3036628a7dd6021ee9.zip
Bugfixes
-rw-r--r--keyboards/s60-x/keymaps/ansi_qwertz/keymap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/keymap.c b/keyboards/s60-x/keymaps/ansi_qwertz/keymap.c
index 9f59f12fa..317a245be 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/s60-x/keymaps/ansi_qwertz/keymap.c
@@ -82,7 +82,7 @@ enum custom_keycodes {
82// KC_CM_V, 82// KC_CM_V,
83 KC_CM_W, 83 KC_CM_W,
84// KC_CM_X, 84// KC_CM_X,
85// KC_CM_Y, 85 KC_CM_Y,
86 KC_CM_Z 86 KC_CM_Z
87}; 87};
88 88
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
145 */ 145 */
146 [FUNCTION] = KEYMAP( 146 [FUNCTION] = KEYMAP(
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, \
150 _______, _______, KC_CM_Y, _______, KC_CM_C, MICMUTE, KC_CALC, KC_CM_N, KC_CM_M, _______, _______, _______, _______, KC_PGUP, KC_GMLK, \ 150 _______, _______, KC_CM_Y, _______, KC_CM_C, MICMUTE, KC_CALC, KC_CM_N, KC_CM_M, _______, _______, _______, _______, KC_PGUP, KC_GMLK, \
151 _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 151 _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
@@ -179,16 +179,16 @@ bool process_german(uint16_t keycode, keyrecord_t *record) {
179 uint16_t send_code = 0; 179 uint16_t send_code = 0;
180 if (record->event.pressed) { 180 if (record->event.pressed) {
181 switch (keycode) { 181 switch (keycode) {
182 case KC_C_AM: 182 case KC_CM_A:
183 send_code = KC_Q; 183 send_code = KC_Q;
184 break; 184 break;
185 case KC_C_OM: 185 case KC_CM_O:
186 send_code = KC_P; 186 send_code = KC_P;
187 break; 187 break;
188 case KC_C_UM: 188 case KC_CM_U:
189 send_code = KC_Y; 189 send_code = KC_Y;
190 break; 190 break;
191 case KC_C_SM: 191 case KC_CM_S:
192 send_code = KC_S; 192 send_code = KC_S;
193 break; 193 break;
194 } 194 }
@@ -204,6 +204,7 @@ bool process_german(uint16_t keycode, keyrecord_t *record) {
204 return false; 204 return false;
205 } 205 }
206 } 206 }
207 return true;
207} 208}
208 209
209bool process_record_user(uint16_t keycode, keyrecord_t *record) { 210bool process_record_user(uint16_t keycode, keyrecord_t *record) {