summaryrefslogtreecommitdiff
path: root/keyboards/ergoslab
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergoslab')
-rw-r--r--keyboards/ergoslab/ergoslab.c1
-rw-r--r--keyboards/ergoslab/ergoslab.h7
-rw-r--r--keyboards/ergoslab/rev1/config.h10
-rw-r--r--keyboards/ergoslab/rev1/info.json8
-rw-r--r--keyboards/ergoslab/rev1/rev1.h2
5 files changed, 8 insertions, 20 deletions
diff --git a/keyboards/ergoslab/ergoslab.c b/keyboards/ergoslab/ergoslab.c
deleted file mode 100644
index 6f2796c07c..0000000000
--- a/keyboards/ergoslab/ergoslab.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergoslab.h"
diff --git a/keyboards/ergoslab/ergoslab.h b/keyboards/ergoslab/ergoslab.h
deleted file mode 100644
index 8b02490543..0000000000
--- a/keyboards/ergoslab/ergoslab.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_ergoslab_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index ccb95e9b67..414de0ed15 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#define RGBLED_NUM 2 // Number of LEDs
// FIXME this following line should enable our layer status LEDs to work on both
// sides without need to wire them into a chain. It doesn't though. Uncommenting
diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
index 9133612a18..5f00b666d1 100644
--- a/keyboards/ergoslab/rev1/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -8,9 +8,17 @@
"pid": "0x5148",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/ergoslab/rev1/rev1.h b/keyboards/ergoslab/rev1/rev1.h
index bf99a17b23..d7fd53a31e 100644
--- a/keyboards/ergoslab/rev1/rev1.h
+++ b/keyboards/ergoslab/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "ergoslab.h"
-
#include "quantum.h"
#define LAYOUT_ergoslab( \