diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-25 23:26:02 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-25 23:26:02 +0300 |
| commit | 523dff3005193f72247addff70c8cb238ac6164b (patch) | |
| tree | 43b0835c0dc3b59ad7366b8ae77acfb8e21fdc98 /keyboards/atomic | |
| parent | 2e3834edea1bc2f83477dff1a423adc87c357471 (diff) | |
| parent | 4321f0af7d34f794a372964be49d225442671c45 (diff) | |
| download | qmk_firmware-523dff3005193f72247addff70c8cb238ac6164b.tar.gz qmk_firmware-523dff3005193f72247addff70c8cb238ac6164b.zip | |
Merge branch 'master' into makefile_overhaul
Diffstat (limited to 'keyboards/atomic')
| -rw-r--r-- | keyboards/atomic/keymaps/pvc/keymap.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c index f16ec8a6e..b02e89d2c 100644 --- a/keyboards/atomic/keymaps/pvc/keymap.c +++ b/keyboards/atomic/keymaps/pvc/keymap.c | |||
| @@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 154 | 154 | ||
| 155 | /* UPPER | 155 | /* UPPER |
| 156 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | 156 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. |
| 157 | * | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE | | 157 | * | PRINT | BR TOG | BR SP+ | BR SP- | BR RST | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE | |
| 158 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | 158 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| 159 | * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS | | 159 | * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS | |
| 160 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | 160 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| |
| @@ -180,9 +180,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 180 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | 180 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| 181 | * | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS | | 181 | * | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS | |
| 182 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | 182 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| |
| 183 | * | | ^ | * | + | - | ; | : | _ | ' | " | ` | | XXXXXX . | HOME | | 183 | * | | ^ | * | + | - | / | \ | _ | ' | " | ` | | XXXXXX . | HOME | |
| 184 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | 184 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| |
| 185 | * | | | | & | ! | ~ | / | \ | = | < | > | ? | XXXXXX . | | END | | 185 | * | | | | & | ! | ~ | ; | : | = | < | > | ? | XXXXXX . | | END | |
| 186 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | 186 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| |
| 187 | * | | | | | | | | | | | | | | | | 187 | * | | | | | | | | | | | | | | | |
| 188 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 188 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| @@ -191,16 +191,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 191 | [LAYER_LOWER] = { // LOWER | 191 | [LAYER_LOWER] = { // LOWER |
| 192 | { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, | 192 | { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, |
| 193 | { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS }, | 193 | { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS }, |
| 194 | { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME }, | 194 | { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME }, |
| 195 | { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END }, | 195 | { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END }, |
| 196 | { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ }, | 196 | { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ }, |
| 197 | }, | 197 | }, |
| 198 | 198 | ||
| 199 | /* FUNCTION | ||
| 200 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 201 | * | NUM LK | | | | | | | | | | | | | XXXXXX . | | ||
| 202 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 203 | * | SCR LK | F13 | F14 | F15 | F16 | | | | | | | | | | | | ||
| 204 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 205 | * | CAP LK | F17 | F18 | F19 | F20 | | | | | | | | XXXXXX . | | | ||
| 206 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 207 | * | | F21 | F22 | F23 | F24 | | | | | | | XXXXXX . | VOL UP | MUTE | | ||
| 208 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 209 | * | | | | | | PLAY/PAUSE | | | | | | PTRACK | VOL DN | NTRACK | | ||
| 210 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 211 | */ | ||
| 212 | |||
| 199 | [LAYER_FUNCTION] = { // FUNCTION | 213 | [LAYER_FUNCTION] = { // FUNCTION |
| 200 | { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, | 214 | { KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX }, |
| 201 | { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_PAUS }, | 215 | { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, |
| 202 | { KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_PSCR }, | 216 | { KC_CAPS, KC_F17, KC_F18, KC_F19, KC_F20, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, XXXXXXX }, |
| 203 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_VOLU, KC_MUTE }, | 217 | { _______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_VOLU, KC_MUTE }, |
| 204 | { _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT }, | 218 | { _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT }, |
| 205 | }, | 219 | }, |
| 206 | 220 | ||