summaryrefslogtreecommitdiff
path: root/keyboards/gh60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gh60')
-rw-r--r--keyboards/gh60/revc/config.h20
-rw-r--r--keyboards/gh60/revc/info.json5
-rw-r--r--keyboards/gh60/revc/keymaps/dbroqua/config.h2
-rw-r--r--keyboards/gh60/revc/keymaps/maxr1998/config.h2
-rw-r--r--keyboards/gh60/revc/keymaps/robotmaxtron/config.h2
-rw-r--r--keyboards/gh60/revc/keymaps/sethbc/rules.mk0
-rw-r--r--keyboards/gh60/revc/revc.c1
-rw-r--r--keyboards/gh60/satan/config.h10
-rw-r--r--keyboards/gh60/satan/info.json8
-rw-r--r--keyboards/gh60/satan/keymaps/fakb/config.h4
-rw-r--r--keyboards/gh60/satan/keymaps/iso_split_rshift/config.h4
-rw-r--r--keyboards/gh60/satan/keymaps/olligranlund_iso/config.h4
-rw-r--r--keyboards/gh60/satan/satan.c1
-rw-r--r--keyboards/gh60/v1p3/config.h19
-rw-r--r--keyboards/gh60/v1p3/info.json8
-rw-r--r--keyboards/gh60/v1p3/v1p3.c16
16 files changed, 30 insertions, 76 deletions
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h
index fdeb69cae2..baf09cebb5 100644
--- a/keyboards/gh60/revc/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -17,26 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
- #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-// Rev A
-// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 }
-// Rev B/C
- #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json
index 052eaea8a3..9db9441171 100644
--- a/keyboards/gh60/revc/info.json
+++ b/keyboards/gh60/revc/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B2",
"on_state": 0
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
index 82775a83a4..a65ca08e65 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua/config.h
+++ b/keyboards/gh60/revc/keymaps/dbroqua/config.h
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
#define RGBLED_NUM 11
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h
index 3013308bb2..bc926a289f 100644
--- a/keyboards/gh60/revc/keymaps/maxr1998/config.h
+++ b/keyboards/gh60/revc/keymaps/maxr1998/config.h
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
-#define RGB_DI_PIN F4 // pin the DI on the WS2812B is hooked-up to
+#define WS2812_DI_PIN F4 // pin the DI on the WS2812B is hooked-up to
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
index 4ffa701ab8..cef899ee12 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/gh60/revc/keymaps/sethbc/rules.mk b/keyboards/gh60/revc/keymaps/sethbc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/gh60/revc/keymaps/sethbc/rules.mk
+++ /dev/null
diff --git a/keyboards/gh60/revc/revc.c b/keyboards/gh60/revc/revc.c
deleted file mode 100644
index 47dd5410f0..0000000000
--- a/keyboards/gh60/revc/revc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "revc.h"
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index ce76bc8233..1fbb35b3a2 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -33,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Underglow configuration
*/
-#define RGB_DI_PIN E2
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index 88a09cb3f6..76b1af9f06 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -8,10 +8,18 @@
"pid": "0x0002",
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 4
},
+ "ws2812": {
+ "pin": "E2"
+ },
"indicators": {
"caps_lock": "B2",
"on_state": 0
diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
index f7314a8671..5ca8aa1da5 100644
--- a/keyboards/gh60/satan/keymaps/fakb/config.h
+++ b/keyboards/gh60/satan/keymaps/fakb/config.h
@@ -12,5 +12,5 @@
#define MOUSEKEY_WHEEL_MAX_SPEED 1
#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B2
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B2
diff --git a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
index 27c1372da1..6795cf6c97 100644
--- a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
// only change
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B2
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B2
#endif
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
index 30269196f3..75c1632908 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
@@ -3,8 +3,8 @@
#define BACKLIGHT_LEVELS 10
// Underlight configuration
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B2
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B2
#undef RGBLED_NUM
#define RGBLED_NUM 16 // Number of LEDs
#undef RGBLIGHT_HUE_STEP
diff --git a/keyboards/gh60/satan/satan.c b/keyboards/gh60/satan/satan.c
deleted file mode 100644
index cd65084455..0000000000
--- a/keyboards/gh60/satan/satan.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "satan.h"
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
index a7d7231e25..7b5012a4c0 100644
--- a/keyboards/gh60/v1p3/config.h
+++ b/keyboards/gh60/v1p3/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json
index 4806535fd0..afdcf9cd74 100644
--- a/keyboards/gh60/v1p3/info.json
+++ b/keyboards/gh60/v1p3/info.json
@@ -8,10 +8,18 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4", "B5"],
+ "rows": ["B0", "B1", "B2", "B3", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 15
},
+ "ws2812": {
+ "pin": "F0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_hhkb", "64_ansi"],
diff --git a/keyboards/gh60/v1p3/v1p3.c b/keyboards/gh60/v1p3/v1p3.c
deleted file mode 100644
index bf41fb2174..0000000000
--- a/keyboards/gh60/v1p3/v1p3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 noroadsleft
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "v1p3.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 12:38:03 +0000