summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/ergodox/ez/Makefile2
-rw-r--r--keyboards/ergodox/ez/config.h1
-rw-r--r--keyboards/ergodox/ez/rules.mk2
-rw-r--r--keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.pngbin0 -> 257921 bytes
-rw-r--r--keyboards/ergodox/keymaps/default/readme.md5
-rw-r--r--keyboards/ergodox/keymaps/pvinis/keymap.c24
-rw-r--r--keyboards/ergodox/readme.md11
-rw-r--r--keyboards/lets_split/imgs/left.stlbin0 -> 106984 bytes
-rw-r--r--keyboards/lets_split/imgs/lets split rev2 case.iges17931
-rw-r--r--keyboards/lets_split/imgs/letssplitv2.svg1978
-rw-r--r--keyboards/lets_split/imgs/plate.stlbin0 -> 102484 bytes
-rw-r--r--keyboards/lets_split/imgs/right.stlbin0 -> 135384 bytes
-rw-r--r--keyboards/planck/config.h2
-rw-r--r--keyboards/planck/keymaps/default/Makefile22
-rw-r--r--keyboards/planck/rules.mk12
-rw-r--r--keyboards/preonic/config.h2
-rw-r--r--keyboards/preonic/rules.mk4
-rw-r--r--keyboards/subatomic/keymaps/default/keymap.c280
-rw-r--r--keyboards/xd60/Makefile3
-rw-r--r--keyboards/xd60/arrow-cluster.JPGbin0 -> 1875718 bytes
-rw-r--r--keyboards/xd60/config.h68
-rw-r--r--keyboards/xd60/keymaps/default/keymap.c64
-rw-r--r--keyboards/xd60/keymaps/default/readme.md9
-rw-r--r--keyboards/xd60/keymaps/stanleylai/keymap.c60
-rw-r--r--keyboards/xd60/readme.md13
-rw-r--r--keyboards/xd60/rules.mk65
-rw-r--r--keyboards/xd60/top-view.JPGbin0 -> 2092542 bytes
-rw-r--r--keyboards/xd60/xd60.c25
-rw-r--r--keyboards/xd60/xd60.h43
-rw-r--r--quantum/api.c43
-rw-r--r--quantum/audio/audio.c15
-rw-r--r--quantum/audio/voices.c102
-rw-r--r--quantum/audio/voices.h3
-rwxr-xr-xquantum/light_ws2812.h7
-rw-r--r--quantum/process_keycode/process_music.c9
-rw-r--r--quantum/rgblight.c21
-rw-r--r--quantum/rgblight.h3
-rw-r--r--tmk_core/protocol/lufa/descriptor.c6
-rw-r--r--tmk_core/protocol/lufa/lufa.c2
39 files changed, 18885 insertions, 1952 deletions
diff --git a/keyboards/ergodox/ez/Makefile b/keyboards/ergodox/ez/Makefile
index 9b6121e2c2..1098332b8a 100644
--- a/keyboards/ergodox/ez/Makefile
+++ b/keyboards/ergodox/ez/Makefile
@@ -1,7 +1,7 @@
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration
RGBLIGHT_ENABLE ?= yes
-MIDI_ENABLE ?= yes
+MIDI_ENABLE ?= no
ifndef MAKEFILE_INCLUDED
include ../../../Makefile
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h
index a3dc5bf152..2e273eb973 100644
--- a/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@ -52,6 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MIDI
#define RGBW_BB_TWI
+#define RGBW 1
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk
index 893cfa7a84..64b2db8158 100644
--- a/keyboards/ergodox/ez/rules.mk
+++ b/keyboards/ergodox/ez/rules.mk
@@ -72,7 +72,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
#
SLEEP_LED_ENABLE = no
-API_SYSEX_ENABLE ?= yes
+API_SYSEX_ENABLE ?= no
RGBLIGHT_ENABLE ?= yes
ifndef QUANTUM_DIR
diff --git a/keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png b/keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png
new file mode 100644
index 0000000000..e3c321cc09
--- /dev/null
+++ b/keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png
Binary files differ
diff --git a/keyboards/ergodox/keymaps/default/readme.md b/keyboards/ergodox/keymaps/default/readme.md
index f68138ed62..979ce0f5b8 100644
--- a/keyboards/ergodox/keymaps/default/readme.md
+++ b/keyboards/ergodox/keymaps/default/readme.md
@@ -2,6 +2,9 @@
## Changelog
+* Dec 2016:
+ * Added LED keys
+ * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now.
* Sep 22, 2016:
* Created a new key in layer 1 (bottom-corner key) that resets the EEPROM.
* Feb 2, 2016 (V1.1):
@@ -9,4 +12,4 @@
This is what we ship with out of the factory. :) The image says it all:
-![Default](default_highres.png)
+![Default](default_firmware_v1.2-2.png)
diff --git a/keyboards/ergodox/keymaps/pvinis/keymap.c b/keyboards/ergodox/keymaps/pvinis/keymap.c
index 87ad70c919..3c49118842 100644
--- a/keyboards/ergodox/keymaps/pvinis/keymap.c
+++ b/keyboards/ergodox/keymaps/pvinis/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
+ * | | | | | | |SYSCTL| | | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* |BEGIN |QWERTY| | | |
@@ -66,11 +66,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
,TG(MOUSE)
,KC_BSPC ,KC_LSFT ,TD(TD_LAYR)
- ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
- ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
- ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
- ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
- ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
+ ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
+ ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
+ ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
+ ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
+ ,MO(SYSCTL) ,KC_NO ,KC_NO ,KC_NO ,KC_NO
,TG(SYSCTL) ,KC_NO
,AP_SLCK
@@ -110,11 +110,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
,KC_TRNS
,KC_TRNS ,KC_TRNS ,KC_TRNS
- ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS ,KC_EQL
- ,KC_RBRC ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS
- ,KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,KC_ENT
- ,KC_RPRN ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT
- ,KC_UP ,KC_DOWN ,KC_TRNS ,KC_QUOT ,KC_TRNS
+ ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS ,KC_EQL
+ ,KC_RBRC ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS
+ ,KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,KC_ENT
+ ,KC_RPRN ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT
+ ,KC_TRNS ,KC_DOWN ,KC_TRNS ,KC_QUOT ,KC_TRNS
,KC_TRNS ,KC_TRNS
,KC_TRNS
@@ -246,7 +246,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* /// ,KC_PTRN*/,KC_NO ,KC_MUTE ,KC_HOME ,KC_UP ,KC_END ,KC_NO ,KC_NO
,KC_VOLU ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_NO ,LCTL(LSFT(KC_PWR))
,KC_NO ,KC_VOLD ,KC_MPRV ,KC_MPLY ,KC_MNXT ,KC_NO ,KC_SLEP
- ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_PWR
+ ,KC_TRNS ,KC_NO ,KC_NO ,KC_NO ,KC_PWR
,KC_NO ,KC_NO
,KC_NO
diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md
index 3bbe98fd69..ca3eeba59b 100644
--- a/keyboards/ergodox/readme.md
+++ b/keyboards/ergodox/readme.md
@@ -1,5 +1,7 @@
# The Easy Way
+If you have an ErgoDox EZ, the absolute easiest way for you to customize your firmware is using the [graphical configurator](http://configure.ergodox-ez.com), which uses QMK under the hood.
+
If you can find firmware someone else has made that does what you want, that
is the easiest way to customize your ErgoDox. It requires no programming
experience or the setup of a build environment.
@@ -63,7 +65,7 @@ files. Check them out with:
# Flashing Firmware
-## ErgoDox Ez
+## ErgoDox EZ
The Ez uses the [Teensy Loader](https://www.pjrc.com/teensy/loader.html).
@@ -153,13 +155,10 @@ If you want to send a plain vanilla key, you can look up its code under `doc/key
There are external tools for customizing the layout, but those do not use
the featurs of this qmk firmware. These sites include:
- - [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) for Ez
+ - The official [ErgoDox EZ configurator](http://configure.ergodox-ez.com)
+ - [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) for EZ, works but not officially supported
- [Input Club configurator](https://input.club/configurator-ergodox) for Infinity, provides left and right files
You can also find an existing firmware that you like, for example from:
- [Dozens of community-contributed keymaps](http://qmk.fm/keyboards/ergodox/)
-
-This qmk firmware also provides the ability to customize keymaps, but requires
-a toolchain to build the firmware. See below for instructions on building
-firmware and customizing keymaps.
diff --git a/keyboards/lets_split/imgs/left.stl b/keyboards/lets_split/imgs/left.stl
new file mode 100644
index 0000000000..ea738d6260
--- /dev/null
+++ b/keyboards/lets_split/imgs/left.stl
Binary files differ
diff --git a/keyboards/lets_split/imgs/lets split rev2 case.iges b/keyboards/lets_split/imgs/lets split rev2 case.iges
new file mode 100644
index 0000000000..5677d09704
--- /dev/null
+++ b/keyboards/lets_split/imgs/lets split rev2 case.iges
@@ -0,0 +1,17931 @@
+ S 1
+,,20Hlets split rev2 case,20Hlets split rev2 case,7Hunknown,7Hunknown, G 1
+32,38,7,99,15,,1.,2,2HMM,1,0.08,15H20161218.141108,0.01,10000.,7HunknownG 2
+,7Hunknown,11,0,; G 3
+ 186 1 00000000D 1
+ 186 -5703 1 0 0D 2
+ 186 2 00000000D 3
+ 186 -5705 1 0 0D 4
+ 186 3 00000000D 5
+ 186 -5705 1 0 0D 6
+ 514 4 00010000D 7
+ 514 29 1 0D 8
+ 514 33 00010000D 9
+ 514 7 1 0D 10
+ 514 40 00010000D 11
+ 514 9 1 0D 12
+ 510 49 00010000D 13
+ 510 -5703 1 1 0D 14
+ 510 50 00010000D 15
+ 510 -5703 1 1 0D 16
+ 510 51 00010000D 17
+ 510 -5703 1 1 0D 18
+ 510 52 00010000D 19
+ 510 -5703 1 1 0D 20
+ 510 53 00010000D 21
+ 510 -5703 1 1 0D 22
+ 510 54 00010000D 23
+ 510 -5703 1 1 0D 24
+ 510 55 00010000D 25
+ 510 -5703 1 1 0D 26
+ 510 56 00010000D 27
+ 510 -5703 1 1 0D 28
+ 510 57 00010000D 29
+ 510 -5703 1 1 0D 30
+ 510 58 00010000D 31
+ 510 -5703 1 1 0D 32
+ 510 59 00010000D 33
+ 510 -5703 1 1 0D 34
+ 510 60 00010000D 35
+ 510 -5703 1 1 0D 36
+ 510 61 00010000D 37
+ 510 -5703 1 1 0D 38
+ 510 62 00010000D 39
+ 510 -5703 1 1 0D 40
+ 510 63 00010000D 41
+ 510 -5703 1 1 0D 42
+ 510 64 00010000D 43
+ 510 -5703 1 1 0D 44
+ 510 65 00010000D 45
+ 510 -5703 1 1 0D 46
+ 510 66 00010000D 47
+ 510 -5703 1 1 0D 48
+ 510 67 00010000D 49
+ 510 -5703 1 1 0D 50
+ 510 68 00010000D 51
+ 510 -5703 1 1 0D 52
+ 510 69 00010000D 53
+ 510 -5703 1 1 0D 54
+ 510 70 00010000D 55
+ 510 -5703 1 1 0D 56
+ 510 71 00010000D 57
+ 510 -5703 1 1 0D 58
+ 510 72 00010000D 59
+ 510 -5703 1 1 0D 60
+ 510 73 00010000D 61
+ 510 -5703 1 1 0D 62
+ 510 74 00010000D 63
+ 510 -5703 1 1 0D 64
+ 510 75 00010000D 65
+ 510 -5703 1 1 0D 66
+ 510 76 00010000D 67
+ 510 -5703 1 1 0D 68
+ 510 77 00010000D 69
+ 510 -5703 1 1 0D 70
+ 510 78 00010000D 71
+ 510 -5703 1 1 0D 72
+ 510 79 00010000D 73
+ 510 -5703 1 1 0D 74
+ 510 80 00010000D 75
+ 510 -5703 1 1 0D 76
+ 510 81 00010000D 77
+ 510 -5703 1 1 0D 78
+ 510 82 00010000D 79
+ 510 -5703 1 1 0D 80
+ 510 83 00010000D 81
+ 510 -5703 1 1 0D 82
+ 510 84 00010000D 83
+ 510 -5703 1 1 0D 84
+ 510 85 00010000D 85
+ 510 -5703 1 1 0D 86
+ 510 86 00010000D 87
+ 510 -5703 1 1 0D 88
+ 510 87 00010000D 89
+ 510 -5703 1 1 0D 90
+ 510 88 00010000D 91
+ 510 -5703 1 1 0D 92
+ 510 89 00010000D 93
+ 510 -5703 1 1 0D 94
+ 510 90 00010000D 95
+ 510 -5703 1 1 0D 96
+ 510 91 00010000D 97
+ 510 -5703 1 1 0D 98
+ 510 92 00010000D 99
+ 510 -5703 1 1 0D 100
+ 510 93 00010000D 101
+ 510 -5703 1 1 0D 102
+ 510 94 00010000D 103
+ 510 -5703 1 1 0D 104
+ 510 95 00010000D 105
+ 510 -5703 1 1 0D 106
+ 510 96 00010000D 107
+ 510 -5703 1 1 0D 108
+ 510 97 00010000D 109
+ 510 -5703 1 1 0D 110
+ 510 98 00010000D 111
+ 510 -5703 1 1 0D 112
+ 510 99 00010000D 113
+ 510 -5703 1 1 0D 114
+ 510 100 00010000D 115
+ 510 -5703 1 1 0D 116
+ 510 101 00010000D 117
+ 510 -5703 1 1 0D 118
+ 510 102 00010000D 119
+ 510 -5703 1 1 0D 120
+ 510 103 00010000D 121
+ 510 -5703 1 1 0D 122
+ 510 104 00010000D 123
+ 510 -5703 1 1 0D 124
+ 510 105 00010000D 125
+ 510 -5703 1 1 0D 126
+ 510 106 00010000D 127
+ 510 -5703 1 1 0D 128
+ 510 107 00010000D 129
+ 510 -5703 1 1 0D 130
+ 510 108 00010000D 131
+ 510 -5703 1 1 0D 132
+ 510 109 00010000D 133
+ 510 -5703 1 1 0D 134
+ 510 110 00010000D 135
+ 510 -5703 1 1 0D 136
+ 510 111 00010000D 137
+ 510 -5703 1 1 0D 138
+ 510 112 00010000D 139
+ 510 -5703 1 1 0D 140
+ 510 113 00010000D 141
+ 510 -5703 1 1 0D 142
+ 510 114 00010000D 143
+ 510 -5703 1 1 0D 144
+ 510 115 00010000D 145
+ 510 -5703 1 1 0D 146
+ 510 116 00010000D 147
+ 510 -5703 1 1 0D 148
+ 510 117 00010000D 149
+ 510 -5703 1 1 0D 150
+ 510 118 00010000D 151
+ 510 -5703 1 1 0D 152
+ 510 119 00010000D 153
+ 510 -5703 1 1 0D 154
+ 510 120 00010000D 155
+ 510 -5703 1 1 0D 156
+ 510 121 00010000D 157
+ 510 -5703 1 1 0D 158
+ 510 122 00010000D 159
+ 510 -5703 1 1 0D 160
+ 510 123 00010000D 161
+ 510 -5703 1 1 0D 162
+ 510 124 00010000D 163
+ 510 -5703 1 1 0D 164
+ 510 125 00010000D 165
+ 510 -5703 1 1 0D 166
+ 510 126 00010000D 167
+ 510 -5703 1 1 0D 168
+ 510 127 00010000D 169
+ 510 -5703 1 1 0D 170
+ 510 128 00010000D 171
+ 510 -5703 1 1 0D 172
+ 510 129 00010000D 173
+ 510 -5703 1 1 0D 174
+ 510 130 00010000D 175
+ 510 -5703 1 1 0D 176
+ 510 131 00010000D 177
+ 510 -5703 1 1 0D 178
+ 510 132 00010000D 179
+ 510 -5703 1 1 0D 180
+ 510 133 00010000D 181
+ 510 -5703 1 1 0D 182
+ 510 134 00010000D 183
+ 510 -5703 1 1 0D 184
+ 510 135 00010000D 185
+ 510 -5703 1 1 0D 186
+ 510 136 00010000D 187
+ 510 -5703 1 1 0D 188
+ 510 137 00010000D 189
+ 510 -5703 1 1 0D 190
+ 510 138 00010000D 191
+ 510 -5703 1 1 0D 192
+ 510 139 00010000D 193
+ 510 -5703 1 1 0D 194
+ 510 140 00010000D 195
+ 510 -5703 1 1 0D 196
+ 510 141 00010000D 197
+ 510 -5703 1 1 0D 198
+ 510 142 00010000D 199
+ 510 -5703 1 1 0D 200
+ 510 143 00010000D 201
+ 510 -5703 1 1 0D 202
+ 510 144 00010000D 203
+ 510 -5703 1 1 0D 204
+ 510 145 00010000D 205
+ 510 -5703 1 1 0D 206
+ 510 146 00010000D 207
+ 510 -5703 1 1 0D 208
+ 510 147 00010000D 209
+ 510 -5703 1 1 0D 210
+ 510 148 00010000D 211
+ 510 -5703 1 1 0D 212
+ 510 149 00010000D 213
+ 510 -5703 1 1 0D 214
+ 510 150 00010000D 215
+ 510 -5703 1 1 0D 216
+ 510 151 00010000D 217
+ 510 -5703 1 1 0D 218
+ 510 152 00010000D 219
+ 510 -5703 1 1 0D 220
+ 510 153 00010000D 221
+ 510 -5703 1 1 0D 222
+ 510 154 00010000D 223
+ 510 -5703 1 1 0D 224
+ 510 155 00010000D 225
+ 510 -5703 1 1 0D 226
+ 510 156 00010000D 227
+ 510 -5703 1 1 0D 228
+ 510 157 00010000D 229
+ 510 -5703 1 1 0D 230
+ 510 158 00010000D 231
+ 510 -5703 1 1 0D 232
+ 510 159 00010000D 233
+ 510 -5703 1 1 0D 234
+ 510 160 00010000D 235
+ 510 -5703 1 1 0D 236
+ 510 161 00010000D 237
+ 510 -5703 1 1 0D 238
+ 510 162 00010000D 239
+ 510 -5703 1 1 0D 240
+ 510 163 00010000D 241
+ 510 -5703 1 1 0D 242
+ 510 164 00010000D 243
+ 510 -5703 1 1 0D 244
+ 510 165 00010000D 245
+ 510 -5703 1 1 0D 246
+ 510 166 00010000D 247
+ 510 -5703 1 1 0D 248
+ 510 167 00010000D 249
+ 510 -5703 1 1 0D 250
+ 510 168 00010000D 251
+ 510 -5703 1 1 0D 252
+ 510 169 00010000D 253
+ 510 -5703 1 1 0D 254
+ 510 170 00010000D 255
+ 510 -5703 1 1 0D 256
+ 510 171 00010000D 257
+ 510 -5703 1 1 0D 258
+ 510 172 00010000D 259
+ 510 -5703 1 1 0D 260
+ 510 173 00010000D 261
+ 510 -5703 1 1 0D 262
+ 510 174 00010000D 263
+ 510 -5703 1 1 0D 264
+ 510 175 00010000D 265
+ 510 -5703 1 1 0D 266
+ 510 176 00010000D 267
+ 510 -5703 1 1 0D 268
+ 510 177 00010000D 269
+ 510 -5703 1 1 0D 270
+ 510 178 00010000D 271
+ 510 -5703 1 1 0D 272
+ 510 179 00010000D 273
+ 510 -5703 1 1 0D 274
+ 510 180 00010000D 275
+ 510 -5703 1 1 0D 276
+ 510 181 00010000D 277
+ 510 -5703 1 1 0D 278
+ 510 182 00010000D 279
+ 510 -5703 1 1 0D 280
+ 510 183 00010000D 281
+ 510 -5703 1 1 0D 282
+ 510 184 00010000D 283
+ 510 -5703 1 1 0D 284
+ 510 185 00010000D 285
+ 510 -5703 1 1 0D 286
+ 510 186 00010000D 287
+ 510 -5703 1 1 0D 288