diff options
| author | commandlinedesign <commandlinedesign@gmail.com> | 2016-07-23 19:32:02 -0700 |
|---|---|---|
| committer | commandlinedesign <commandlinedesign@gmail.com> | 2016-07-23 19:32:02 -0700 |
| commit | fbafb9449e381858d19d8a9a7436ee6b5a078cf3 (patch) | |
| tree | 31c62d401bc2d77e9094440d4e27e0c69d0ce423 | |
| parent | 9b3708f830ed06f74e555decebbcc0d5d152ffe3 (diff) | |
| download | qmk_firmware-fbafb9449e381858d19d8a9a7436ee6b5a078cf3.tar.gz qmk_firmware-fbafb9449e381858d19d8a9a7436ee6b5a078cf3.zip | |
Resolved errors
| -rw-r--r-- | keyboards/preonic/keymaps/CMD-Preonic/keymap.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c index c7a5be121..f0bcacb41 100644 --- a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c +++ b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define _COLEMAK 1 | 13 | #define _COLEMAK 1 |
| 14 | #define _DVORAK 2 | 14 | #define _DVORAK 2 |
| 15 | #define _GAME 3 | 15 | #define _GAME 3 |
| 16 | #define _ARROW 12 | ||
| 16 | #define _NUMPAD 13 | 17 | #define _NUMPAD 13 |
| 17 | #define _LOWER 14 | 18 | #define _LOWER 14 |
| 18 | #define _RAISE 15 | 19 | #define _RAISE 15 |
| @@ -23,6 +24,7 @@ | |||
| 23 | #define COLEMAK M(_COLEMAK) | 24 | #define COLEMAK M(_COLEMAK) |
| 24 | #define DVORAK M(_DVORAK) | 25 | #define DVORAK M(_DVORAK) |
| 25 | #define GAME M(_GAME) | 26 | #define GAME M(_GAME) |
| 27 | #define ARROW M(_ARROW) | ||
| 26 | #define NUMPAD M(_NUMPAD) | 28 | #define NUMPAD M(_NUMPAD) |
| 27 | #define LOWER M(_LOWER) | 29 | #define LOWER M(_LOWER) |
| 28 | #define RAISE M(_RAISE) | 30 | #define RAISE M(_RAISE) |
| @@ -47,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 47 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | | 49 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | |
| 48 | * `-----------------------------------------------------------------------------------' | 50 | * `-----------------------------------------------------------------------------------' |
| 49 | */ | 51 | */ |
| 50 | [_QWERTY] = { | 52 | [_QWERTY] = { |
| 51 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 53 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, |
| 52 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH}, | 54 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH}, |
| 53 | {LT(_RAISE, KC_ENT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 55 | {LT(_RAISE, KC_ENT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, |
| @@ -134,10 +136,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 134 | [_NUMPAD] = { | 136 | [_NUMPAD] = { |
| 135 | {KC_ESC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, _______, _______, _______, _______, _______, _______, _______, _______}, | 137 | {KC_ESC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, _______, _______, _______, _______, _______, _______, _______, _______}, |
| 136 | {KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, _______, _______, _______, _______, _______, _______, _______, _______}, | 138 | {KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, _______, _______, _______, _______, _______, _______, _______, _______}, |
| 137 | {KC_KP4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______, _______, _______, _______, _______, _______, _______}, | 139 | {KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______, _______, _______, _______, _______, _______, _______}, |
| 138 | {KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, _______, _______, _______, _______, _______, _______, _______, _______}, | 140 | {KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, _______, _______, _______, _______, _______, _______, _______, _______}, |
| 139 | {KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, _______, _______, _______, _______, _______, _______, _______, _______}, | 141 | {KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, _______, _______, _______, _______, _______, _______, _______, _______}, |
| 140 | }, | 142 | }, |
| 141 | /* Lower | 143 | /* Lower |
| 142 | * ,-----------------------------------------------------------------------------------. | 144 | * ,-----------------------------------------------------------------------------------. |
| 143 | * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Del | | 145 | * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Del | |
| @@ -146,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 146 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 148 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 147 | * | | Left | Down | Right| Refr MLeft| MDn |MRight| * | 4 | 5 | 6 | | 149 | * | | Left | Down | Right| Refr MLeft| MDn |MRight| * | 4 | 5 | 6 | |
| 148 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 150 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 149 | * | Vol+| Prev | Play | Next | Back | MWDn| MBtn3| MWUp | - | 1 | 2 | 3 | | 151 | * | Vol+| Prev | Play | Next | Back | MWDn| MBtn3| MWUp | - | 1 | 2 | 3 | |
| 150 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 152 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 151 | * | Vol- | Pause| Ins | Print| | | | + | Enter| 0 | . | | 153 | * | Vol- | Pause| Ins | Print| | | | + | Enter| 0 | . | |
| 152 | * `-----------------------------------------------------------------------------------' | 154 | * `-----------------------------------------------------------------------------------' |
| @@ -154,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 154 | [_LOWER] = { | 156 | [_LOWER] = { |
| 155 | {KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL}, | 157 | {KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL}, |
| 156 | {KC_MUTE, KC_BSPC, KC_UP, KC_DEL, KC_WWW_FORWARD, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_KP_SLASH, KC_KP_7, KC_KP_8, KC_KP_9}, | 158 | {KC_MUTE, KC_BSPC, KC_UP, KC_DEL, KC_WWW_FORWARD, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_KP_SLASH, KC_KP_7, KC_KP_8, KC_KP_9}, |
| 157 | {_______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_WWW_REFRESH, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_KP_ASTERISK, KC_KP4, KC_KP_5, KC_KP_6}, | 159 | {_______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_WWW_REFRESH, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_KP_ASTERISK, KC_KP_4, KC_KP_5, KC_KP_6}, |
| 158 | {KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_WWW_BACK, KC_MS_WH_DOWN, KC_MS_BTN3, KC_MS_WH_UP, KC_KP_MINUS, KC_KP_1, KC_KP_2, KC_KP_3}, | 160 | {KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_WWW_BACK, KC_MS_WH_DOWN, KC_MS_BTN3, KC_MS_WH_UP, KC_KP_MINUS, KC_KP_1, KC_KP_2, KC_KP_3}, |
| 159 | {KC_VOLD, KC_PAUSE, KC_INS, KC_PSCREEN, _______, _______, _______, _______, KC_KP_PLUS, KC_KP_ENTER, KC_KP_0, KC_KP_DOT} | 161 | {KC_VOLD, KC_PAUSE, KC_INS, KC_PSCREEN, _______, _______, _______, _______, KC_KP_PLUS, KC_KP_ENTER, KC_KP_0, KC_KP_DOT} |
| 160 | }, | 162 | }, |
| @@ -188,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 188 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 190 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 189 | * | | | |Aud On|AudOff|MidiOn|MdiOff| | | | | | | 191 | * | | | |Aud On|AudOff|MidiOn|MdiOff| | | | | | |
| 190 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 192 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 191 | * | |Voice-|Voice+|Mus On|MusOff| Sleep| Wake | Arrow| Game | | | | | 193 | * | |Voice-|Voice+|Mus On|MusOff| Sleep| Wake | Arrow| Game |NUMPAD| | | |
| 192 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 194 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 193 | * | | | | | | Reset | | | | | | | 195 | * | | | | | | Reset | | | | | | |
| 194 | * `-----------------------------------------------------------------------------------' | 196 | * `-----------------------------------------------------------------------------------' |
| @@ -197,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 197 | {_______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______}, | 199 | {_______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______}, |
| 198 | {_______, RESET, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, KC_DEL}, | 200 | {_______, RESET, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, KC_DEL}, |
| 199 | {_______, _______, _______, AU_ON, AU_OFF, MI_ON, MI_OFF, QWERTY, COLEMAK, DVORAK, _______, _______}, | 201 | {_______, _______, _______, AU_ON, AU_OFF, MI_ON, MI_OFF, QWERTY, COLEMAK, DVORAK, _______, _______}, |
| 200 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, ARROW, GAME, _______, _______, _______}, | 202 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, ARROW, GAME, NUMPAD, _______, _______}, |
| 201 | {_______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, _______} | 203 | {_______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, _______} |
| 202 | } | 204 | } |
| 203 | 205 | ||
| @@ -271,6 +273,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 271 | persistant_default_layer_set(1UL<<_NUMPAD); | 273 | persistant_default_layer_set(1UL<<_NUMPAD); |
| 272 | } | 274 | } |
| 273 | break; | 275 | break; |
| 276 | case _ARROW: | ||
| 277 | if (record->event.pressed) { | ||
| 278 | #ifdef AUDIO_ENABLE | ||
| 279 | PLAY_NOTE_ARRAY(tone_colemak, false, 0); | ||
| 280 | #endif | ||
| 281 | persistant_default_layer_set(1UL<<_LOWER); | ||
| 282 | } | ||
| 283 | break; | ||
| 274 | case _LOWER: | 284 | case _LOWER: |
| 275 | if (record->event.pressed) { | 285 | if (record->event.pressed) { |
| 276 | layer_on(_LOWER); | 286 | layer_on(_LOWER); |
