aboutsummaryrefslogtreecommitdiff
path: root/keyboards/preonic
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-24 14:57:58 +0000
committerQMK Bot <hello@qmk.fm>2021-01-24 14:57:58 +0000
commitd44e3dc021d45d3e131b67d3c45fc43494738d3e (patch)
tree8be38b78ca66339602b9cff3b4320967ac8072bb /keyboards/preonic
parent95ecd4e1d25b88ace01ab39931df81b25438941e (diff)
parent8ab6efdc804fe7c7666b4c9f7962e288b39448d2 (diff)
downloadqmk_firmware-d44e3dc021d45d3e131b67d3c45fc43494738d3e.tar.gz
qmk_firmware-d44e3dc021d45d3e131b67d3c45fc43494738d3e.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/preonic')
-rw-r--r--keyboards/preonic/keymaps/default/keymap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index 7ee985ea1..6fec14d4f 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
108 * |------+------+------+------+------+-------------+------+------+------+------+------| 108 * |------+------+------+------+------+-------------+------+------+------+------+------|
109 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | 109 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
110 * |------+------+------+------+------+------|------+------+------+------+------+------| 110 * |------+------+------+------+------+------|------+------+------+------+------+------|
111 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | | | 111 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | |
112 * |------+------+------+------+------+------+------+------+------+------+------+------| 112 * |------+------+------+------+------+------+------+------+------+------+------+------|
113 * | | | | | | | | Next | Vol- | Vol+ | Play | 113 * | | | | | | | | Next | Vol- | Vol+ | Play |
114 * `-----------------------------------------------------------------------------------' 114 * `-----------------------------------------------------------------------------------'
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
129 * |------+------+------+------+------+-------------+------+------+------+------+------| 129 * |------+------+------+------+------+-------------+------+------+------+------+------|
130 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | 130 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
131 * |------+------+------+------+------+------|------+------+------+------+------+------| 131 * |------+------+------+------+------+------|------+------+------+------+------+------|
132 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | | | 132 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | Pg Up| Pg Dn| |
133 * |------+------+------+------+------+------+------+------+------+------+------+------| 133 * |------+------+------+------+------+------+------+------+------+------+------+------|
134 * | | | | | | | | Next | Vol- | Vol+ | Play | 134 * | | | | | | | | Next | Vol- | Vol+ | Play |
135 * `-----------------------------------------------------------------------------------' 135 * `-----------------------------------------------------------------------------------'
@@ -146,9 +146,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
146 * ,-----------------------------------------------------------------------------------. 146 * ,-----------------------------------------------------------------------------------.
147 * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | 147 * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
148 * |------+------+------+------+------+------+------+------+------+------+------+------| 148 * |------+------+------+------+------+------+------+------+------+------+------+------|
149 * | | Reset| | | | | | | | | | Del | 149 * | | Reset| Debug| | | | |TermOf|TermOn| | | Del |
150 * |------+------+------+------+------+-------------+------+------+------+------+------| 150 * |------+------+------+------+------+-------------+------+------+------+------+------|
151 * | | | |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | 151 * | | |Aud cy|Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
152 * |------+------+------+------+------+------|------+------+------+------+------+------| 152 * |------+------+------+------+------+------|------+------+------+------+------+------|
153 * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | 153 * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | |
154 * |------+------+------+------+------+------+------+------+------+------+------+------| 154 * |------+------+------+------+------+------+------+------+------+------+------+------|