diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-20 01:41:10 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-20 01:41:10 +0000 |
| commit | 36784a99a92a99372d329eae2b681717ce211d91 (patch) | |
| tree | f707419597ba8751032da0d5485898bf34696298 /keyboards/tkc | |
| parent | d5ab40aa6062b392b0dd1eaa99544dea17408637 (diff) | |
| parent | e0ed2c950d25315461c4025b9649091e113626e3 (diff) | |
| download | qmk_firmware-36784a99a92a99372d329eae2b681717ce211d91.tar.gz qmk_firmware-36784a99a92a99372d329eae2b681717ce211d91.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/tkc')
| -rw-r--r-- | keyboards/tkc/candybar/lefty/config.h | 1 | ||||
| -rw-r--r-- | keyboards/tkc/candybar/righty/config.h | 1 | ||||
| -rw-r--r-- | keyboards/tkc/m0lly/config.h | 1 | ||||
| -rw-r--r-- | keyboards/tkc/osav2/config.h | 1 | ||||
| -rw-r--r-- | keyboards/tkc/tkc1800/config.h | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/keyboards/tkc/candybar/lefty/config.h b/keyboards/tkc/candybar/lefty/config.h index e8a1f0081..cd09363ac 100644 --- a/keyboards/tkc/candybar/lefty/config.h +++ b/keyboards/tkc/candybar/lefty/config.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #define DEVICE_VER 0x0006 | 24 | #define DEVICE_VER 0x0006 |
| 25 | #define MANUFACTURER The Key Company | 25 | #define MANUFACTURER The Key Company |
| 26 | #define PRODUCT Candybar | 26 | #define PRODUCT Candybar |
| 27 | #define DESCRIPTION A compact staggered 40% keyboard with attached numpad | ||
| 28 | 27 | ||
| 29 | /* key matrix size */ | 28 | /* key matrix size */ |
| 30 | #define MATRIX_ROWS 4 | 29 | #define MATRIX_ROWS 4 |
diff --git a/keyboards/tkc/candybar/righty/config.h b/keyboards/tkc/candybar/righty/config.h index 500453784..0be3a5565 100644 --- a/keyboards/tkc/candybar/righty/config.h +++ b/keyboards/tkc/candybar/righty/config.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #define DEVICE_VER 0x0006 | 24 | #define DEVICE_VER 0x0006 |
| 25 | #define MANUFACTURER The Key Company | 25 | #define MANUFACTURER The Key Company |
| 26 | #define PRODUCT Candybar | 26 | #define PRODUCT Candybar |
| 27 | #define DESCRIPTION A compact staggered 40% keyboard with attached numpad | ||
| 28 | 27 | ||
| 29 | /* key matrix size */ | 28 | /* key matrix size */ |
| 30 | #define MATRIX_ROWS 4 | 29 | #define MATRIX_ROWS 4 |
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index 77480995c..886c611b3 100644 --- a/keyboards/tkc/m0lly/config.h +++ b/keyboards/tkc/m0lly/config.h | |||
| @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER The Key Company | 26 | #define MANUFACTURER The Key Company |
| 27 | #define PRODUCT M0lly | 27 | #define PRODUCT M0lly |
| 28 | #define DESCRIPTION QMK keyboard firmware for M0lly | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 5 | 30 | #define MATRIX_ROWS 5 |
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h index db00b0241..8796e088d 100644 --- a/keyboards/tkc/osav2/config.h +++ b/keyboards/tkc/osav2/config.h | |||
| @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER The Key Company | 26 | #define MANUFACTURER The Key Company |
| 27 | #define PRODUCT OSA v2 | 27 | #define PRODUCT OSA v2 |
| 28 | #define DESCRIPTION QMK keyboard firmware for TKC OSA v2 (One Sweet Alice) | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 10 | 30 | #define MATRIX_ROWS 10 |
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h index f54583c2b..edbf872db 100644 --- a/keyboards/tkc/tkc1800/config.h +++ b/keyboards/tkc/tkc1800/config.h | |||
| @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | #define DEVICE_VER 0x0003 | 25 | #define DEVICE_VER 0x0003 |
| 26 | #define MANUFACTURER The Key Company | 26 | #define MANUFACTURER The Key Company |
| 27 | #define PRODUCT TKC1800 | 27 | #define PRODUCT TKC1800 |
| 28 | #define DESCRIPTION QMK keyboard firmware for TKC1800 | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 7 | 30 | #define MATRIX_ROWS 7 |