summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-11 08:47:07 +0000
committerQMK Bot <hello@qmk.fm>2021-01-11 08:47:07 +0000
commit3bc436988d0a58fdd735495f07aa741660ab8e71 (patch)
treecc29932c27f363ee13e1fa36da7d5695979b8dc8
parent5193a8d569ef96d5e675a210abc1c4a2e980fdaa (diff)
parentd8b9825a8bb9d249ead4194accf47b13014e5346 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/1upkeyboards/1up60hse/config.h1
-rw-r--r--keyboards/1upkeyboards/1up60hte/config.h1
-rw-r--r--keyboards/1upkeyboards/1up60rgb/config.h1
-rw-r--r--keyboards/1upkeyboards/super16/config.h1
-rw-r--r--keyboards/1upkeyboards/sweet16/config.h1
-rw-r--r--keyboards/2key2crawl/config.h1
-rw-r--r--keyboards/30wer/config.h1
-rw-r--r--keyboards/40percentclub/25/config.h1
-rw-r--r--keyboards/40percentclub/4pack/config.h1
-rw-r--r--keyboards/40percentclub/4x4/config.h1
-rw-r--r--keyboards/40percentclub/5x5/config.h1
-rw-r--r--keyboards/40percentclub/6lit/config.h1
-rw-r--r--keyboards/40percentclub/foobar/config.h1
-rw-r--r--keyboards/40percentclub/gherkin/config.h1
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/mjt/config.h2
-rw-r--r--keyboards/40percentclub/half_n_half/config.h1
-rw-r--r--keyboards/40percentclub/i75/config.h1
-rw-r--r--keyboards/40percentclub/luddite/config.h1
-rw-r--r--keyboards/40percentclub/mf68/config.h1
-rw-r--r--keyboards/40percentclub/mf68/keymaps/68keys/config.h2
-rw-r--r--keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h4
-rw-r--r--keyboards/40percentclub/nano/config.h1
-rw-r--r--keyboards/40percentclub/nein/config.h1
-rw-r--r--keyboards/40percentclub/nori/config.h1
-rw-r--r--keyboards/40percentclub/tomato/config.h1
-rw-r--r--keyboards/40percentclub/ut47/config.h1
-rw-r--r--keyboards/4by3/config.h1
-rw-r--r--keyboards/4pplet/aekiso60/rev_a/config.h1
-rw-r--r--keyboards/4pplet/steezy60/rev_a/config.h1
-rw-r--r--keyboards/4pplet/waffling60/rev_a/config.h1
-rw-r--r--keyboards/6ball/config.h1
-rw-r--r--keyboards/7skb/rev1/config.h1
-rw-r--r--keyboards/9key/config.h1
-rw-r--r--keyboards/abacus/config.h1
-rw-r--r--keyboards/absinthe/config.h1
-rw-r--r--keyboards/abstract/ellipse/rev1/config.h1
-rw-r--r--keyboards/acheron/austin/config.h1
-rw-r--r--keyboards/acheron/elongate/config.h1
-rw-r--r--keyboards/acheron/keebspcb/config.h1
-rw-r--r--keyboards/acheron/shark/config.h1
-rw-r--r--keyboards/acr60/config.h1
-rw-r--r--keyboards/adelheid/config.h1
-rw-r--r--keyboards/adkb96/rev1/config.h1
-rw-r--r--keyboards/aeboards/aegis/config.h1
-rw-r--r--keyboards/ai03/equinox/config.h1
-rw-r--r--keyboards/ai03/lunar/config.h1
-rw-r--r--keyboards/ai03/orbit/config.h1
-rw-r--r--keyboards/ai03/orbit_x/config.h1
-rw-r--r--keyboards/ai03/polaris/config.h1
-rw-r--r--keyboards/ai03/quasar/config.h1
-rw-r--r--keyboards/akb/eb46/config.h1
-rw-r--r--keyboards/akb/raine/config.h1
-rw-r--r--keyboards/al1/config.h1
-rw-r--r--keyboards/alf/dc60/config.h1
-rw-r--r--keyboards/alf/x11/config.h1
-rw-r--r--keyboards/alf/x2/config.h1
-rw-r--r--keyboards/allison/config.h1
-rw-r--r--keyboards/allison_numpad/config.h1
-rwxr-xr-xkeyboards/alpha/config.h1
-rw-r--r--keyboards/alps64/config.h1
-rwxr-xr-xkeyboards/alu84/config.h1
-rwxr-xr-xkeyboards/amj40/config.h1
-rw-r--r--keyboards/amj60/config.h1
-rw-r--r--keyboards/amj96/config.h1
-rw-r--r--keyboards/amjkeyboard/amj66/config.h1
-rw-r--r--keyboards/amjpad/config.h1
-rw-r--r--keyboards/anavi/macropad8/config.h1
-rw-r--r--keyboards/angel17/alpha/config.h1
-rw-r--r--keyboards/angel17/rev1/config.h1
-rw-r--r--keyboards/angel64/alpha/config.h1
-rw-r--r--keyboards/angel64/rev1/config.h1
-rw-r--r--keyboards/aos/tkl/config.h1
-rw-r--r--keyboards/arabica37/rev1/config.h1
-rw-r--r--keyboards/arisu/config.h1
-rw-r--r--keyboards/ash1800/config.h1
-rw-r--r--keyboards/ashpil/modelm_usbc/config.h1
-rw-r--r--keyboards/at101_bh/config.h1
-rw-r--r--keyboards/at_at/660m/config.h1
-rw-r--r--keyboards/atomic/config.h1
-rw-r--r--keyboards/atreus/config.h1
-rw-r--r--keyboards/atreus62/config.h1
-rw-r--r--keyboards/atreus62/keymaps/atreus52/config.h2
-rw-r--r--keyboards/atxkb/1894/config.h1
-rw-r--r--keyboards/aves65/config.h1
-rw-r--r--tmk_core/common/report.h6
-rw-r--r--tmk_core/protocol/vusb/vusb.c123
-rw-r--r--tmk_core/protocol/vusb/vusb.h21
87 files changed, 104 insertions, 136 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 7fc55b04db..bc1c8a0400 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER 1upkeyboards
#define PRODUCT 1up60hse
-#define DESCRIPTION A custom 60% keyboard
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index c3ba030de9..81fa0e1eb6 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER 1upkeyboards
#define PRODUCT 1up60hte
-#define DESCRIPTION A custom 60% keyboard
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 46e08a5160..c78fc3e52b 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER 1upkeyboards
#define PRODUCT 1UP RGB Underglow PCB
-#define DESCRIPTION 60% keyboard with RGB underglow
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 3f0d468b7b..23114c7c69 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER 1upkeyboards
#define PRODUCT super16
-#define DESCRIPTION A 4x4 custom macropad
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
index 0fc117c5a1..f858685b8f 100644
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ b/keyboards/1upkeyboards/sweet16/config.h
@@ -6,7 +6,6 @@
#define VENDOR_ID 0x6F75 // OU
#define MANUFACTURER 1up Keyboards
#define PRODUCT Sweet16
-#define DESCRIPTION 4x4 grid
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index b93dcc7fa7..27a94a00ca 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0002
#define MANUFACTURER WoodKeys.click
#define PRODUCT 2Key2Crawl
-#define DESCRIPTION ATX Keycrawl 2018
/* key matrix size */
#define MATRIX_ROWS 2
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h
index 5a89a35f0d..d4f656edca 100644
--- a/keyboards/30wer/config.h
+++ b/keyboards/30wer/config.h
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0000
#define MANUFACTURER 8o7wer
#define PRODUCT 30wer
-#define DESCRIPTION Gherkin style construction 30% staggered pcb kit
/* key matrix size */
#define MATRIX_ROWS 3
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 01ca061a16..ab71fa6cf4 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x0F25
#define MANUFACTURER di0ib
#define PRODUCT The 5x5 Keyboard
-#define DESCRIPTION A split 50 key keyboard
#define USE_SERIAL
/* serial.c configuration for split keyboard */
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index 7ccf21ef80..73ec28bd70 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER 40percentclub
#define PRODUCT 4pack
-#define DESCRIPTION A 1x4 custom macropad
/* key matrix size */
#define MATRIX_ROWS 1
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index 810f3cf295..bcd2ba2dbf 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -10,7 +10,6 @@
#define DEVICE_VER 0x4444
#define MANUFACTURER di0ib
#define PRODUCT The 4x4 Keyboard
-#define DESCRIPTION A modular compact keyboard
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 54515583af..c907d79c89 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -10,7 +10,6 @@
#define DEVICE_VER 0x05B5
#define MANUFACTURER di0ib
#define PRODUCT The 5x5 Keyboard
-#define DESCRIPTION A 25 or 50 or 75 key keyboard
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 4efa4c99bc..6c63198626 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x0F61
#define MANUFACTURER di0ib
#define PRODUCT The 6lit Macropad
-#define DESCRIPTION A split 12 key Macropad
#define USE_SERIAL
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index e501259830..0c9dfd345e 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x0F00
#define MANUFACTURER di0ib
#define PRODUCT The foobar Keyboard
-#define DESCRIPTION A split 30 key keyboard
#define USE_SERIAL
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 4dc794e347..1307ca2e15 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER 40 Percent Club
#define PRODUCT Gherkin
-#define DESCRIPTION A 30 key ortholinear keyboard
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/config.h b/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
index 9fe94bcd21..ce9d5ab2ae 100644
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
@@ -2,6 +2,4 @@
/* USB Device descriptor parameter */
#undef MANUFACTURER
-#undef DESCRIPTION
#define MANUFACTURER Some Guy
-#define DESCRIPTION 30 percent disaster
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index e5ea48dd82..5213a7ecfd 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x4A1F
#define MANUFACTURER di0ib
#define PRODUCT half_n_half
-#define DESCRIPTION A small split ortholinear custom keyboard with 2 thumb buttons
/* key matrix size */
#define MATRIX_ROWS 4*2
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
index 69124bc7a3..18197f0b1e 100644
--- a/keyboards/40percentclub/i75/config.h
+++ b/keyboards/40percentclub/i75/config.h
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x0175
#define MANUFACTURER di0ib
#define PRODUCT i75
-#define DESCRIPTION i75 15x5 ortholinear keyboard
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 63158f6c41..90d84c56e1 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x1001
#define MANUFACTURER di0ib
#define PRODUCT Luddite
-#define DESCRIPTION Luddite Keyboard
/* key matrix size */
#define MATRIX_ROWS 8
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 7c5a0cd5e2..1ff2c189e5 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0101
#define MANUFACTURER di0ib
#define PRODUCT MF68
-#define DESCRIPTION Magicforce 68 with programmable PCB replacement
/* key matrix size */
#define MATRIX_ROWS 8
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/config.h b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
index a0a576b7bf..651c17069d 100644
--- a/keyboards/40percentclub/mf68/keymaps/68keys/config.h
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
@@ -6,10 +6,8 @@
#undef DEVICE_VER
#undef MANUFACTURER
#undef PRODUCT
-#undef DESCRIPTION
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0A0C
#define DEVICE_VER 0x0068
#define MANUFACTURER 68Keys.io
#define PRODUCT The 68Keys.io Keyboard
-#define DESCRIPTION A 68 keys mechanical keyboard
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h b/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
index 7d96ab9e24..bc5de30f2f 100644
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
+++ b/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
@@ -21,10 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Overrides for Feather 32u4 Bluefruit */
-/* USB Device descriptor parameter */
-#undef DESCRIPTION
-#define DESCRIPTION Magicforce 68 BLE
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index 8ee6963e49..aa4a64d07d 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER di0ib
#define PRODUCT Nano
-#define DESCRIPTION 8 key microswitch board
/* key matrix size */
#define MATRIX_ROWS 2
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index b96f5fbe5d..46c166207f 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x9999
#define MANUFACTURER di0ib
#define PRODUCT The nein Keyboard
-#define DESCRIPTION 9 key macropad
/* key matrix size */
#define MATRIX_ROWS 3
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 8e24ef88e1..9c9cdbcee3 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x0444
#define MANUFACTURER di0ib
#define PRODUCT The nori Keyboard
-#define DESCRIPTION A modular compact keyboard
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index e131ce5c20..a083223a1f 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER 40 Percent Club
#defin