aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gh60
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-18 01:50:00 +0000
committerQMK Bot <hello@qmk.fm>2021-01-18 01:50:00 +0000
commit82a875056cc431d0424a41bb0b6d52090e98ad98 (patch)
treecdc3c46567bab7080a6a74e4bc31327a0bd7c91e /keyboards/gh60
parent31c57aab35e6fd49c4c8336f449419afe7630e93 (diff)
parentcc3f2e2865f317604d9781f12d0cefe0e3f74275 (diff)
downloadqmk_firmware-82a875056cc431d0424a41bb0b6d52090e98ad98.tar.gz
qmk_firmware-82a875056cc431d0424a41bb0b6d52090e98ad98.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/gh60')
-rw-r--r--keyboards/gh60/revc/config.h1
-rw-r--r--keyboards/gh60/revc/keymaps/dbroqua/config.h1
-rw-r--r--keyboards/gh60/revc/keymaps/robotmaxtron/config.h1
-rw-r--r--keyboards/gh60/satan/config.h1
-rw-r--r--keyboards/gh60/satan/keymaps/admiralStrokers/config.h1
-rw-r--r--keyboards/gh60/satan/keymaps/ben_iso/config.h1
-rw-r--r--keyboards/gh60/satan/keymaps/fakb/config.h1
7 files changed, 0 insertions, 7 deletions
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h
index ccb95a989..6628d78f6 100644
--- a/keyboards/gh60/revc/config.h
+++ b/keyboards/gh60/revc/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 geekhack 26#define MANUFACTURER geekhack
27#define PRODUCT GH60 Rev C 27#define PRODUCT GH60 Rev C
28#define DESCRIPTION t.m.k. keyboard firmware for GH60
29 28
30/* key matrix size */ 29/* key matrix size */
31#define MATRIX_ROWS 5 30#define MATRIX_ROWS 5
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
index 8952200e0..5d1a777a4 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua/config.h
+++ b/keyboards/gh60/revc/keymaps/dbroqua/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26#define DEVICE_VER 0x0001 26#define DEVICE_VER 0x0001
27#define MANUFACTURER geekhack 27#define MANUFACTURER geekhack
28#define PRODUCT GH60 28#define PRODUCT GH60
29#define DESCRIPTION t.m.k. keyboard firmware for GH60
30 29
31/* key matrix size */ 30/* key matrix size */
32#define MATRIX_ROWS 5 31#define MATRIX_ROWS 5
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
index 1cc41d183..7cfcf8d45 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26#define DEVICE_VER 0x0001 26#define DEVICE_VER 0x0001
27#define MANUFACTURER geekhack 27#define MANUFACTURER geekhack
28#define PRODUCT GH60 28#define PRODUCT GH60
29#define DESCRIPTION t.m.k. keyboard firmware for GH60
30 29
31/* key matrix size */ 30/* key matrix size */
32#define MATRIX_ROWS 5 31#define MATRIX_ROWS 5
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 0efbcd799..2b87f925d 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/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 SATAN 26#define MANUFACTURER SATAN
27#define PRODUCT GH60 Satan 27#define PRODUCT GH60 Satan
28#define DESCRIPTION 60% keyboard with backlight and WS2812 support
29 28
30/* key matrix size */ 29/* key matrix size */
31#define MATRIX_ROWS 5 30#define MATRIX_ROWS 5
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
index c8d40730f..b1c1600e9 100644
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define DEVICE_VER 0x0003 27#define DEVICE_VER 0x0003
28#define MANUFACTURER SATAN 28#define MANUFACTURER SATAN
29#define PRODUCT GH60 29#define PRODUCT GH60
30#define DESCRIPTION QMK keyboard firmware for Satan GH60 with WS2812 support
31 30
32/* key matrix size */ 31/* key matrix size */
33#define MATRIX_ROWS 5 32#define MATRIX_ROWS 5
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/config.h b/keyboards/gh60/satan/keymaps/ben_iso/config.h
index 84d55698c..e59015dcb 100644
--- a/keyboards/gh60/satan/keymaps/ben_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/ben_iso/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define DEVICE_VER 0x0003 27#define DEVICE_VER 0x0003
28#define MANUFACTURER SATAN 28#define MANUFACTURER SATAN
29#define PRODUCT GH60 29#define PRODUCT GH60
30#define DESCRIPTION QMK keyboard firmware for Satan GH60 with WS2812 support
31 30
32/*MOUSE CONFIG OPTIONS */ 31/*MOUSE CONFIG OPTIONS */
33 32
diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
index dc182753d..fcdf1f152 100644
--- a/keyboards/gh60/satan/keymaps/fakb/config.h
+++ b/keyboards/gh60/satan/keymaps/fakb/config.h
@@ -9,7 +9,6 @@
9#define DEVICE_VER 0x0003 9#define DEVICE_VER 0x0003
10#define MANUFACTURER SATAN 10#define MANUFACTURER SATAN
11#define PRODUCT GH60 11#define PRODUCT GH60
12#define DESCRIPTION QMK keyboard firmware for Satan GH60 with WS2812 support
13 12
14/* key matrix size */ 13/* key matrix size */
15#define MATRIX_ROWS 5 14#define MATRIX_ROWS 5