summaryrefslogtreecommitdiff
path: root/keyboards/mechllama
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechllama')
-rw-r--r--keyboards/mechllama/g35/config.h5
-rw-r--r--keyboards/mechllama/g35/g35.c16
-rw-r--r--keyboards/mechllama/g35/g35.h33
-rw-r--r--keyboards/mechllama/g35/info.json45
-rw-r--r--keyboards/mechllama/g35/v1/config.h3
-rw-r--r--keyboards/mechllama/g35/v1/info.json7
-rw-r--r--keyboards/mechllama/g35/v2/config.h3
-rw-r--r--keyboards/mechllama/g35/v2/info.json7
8 files changed, 56 insertions, 63 deletions
diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h
index e7f24e3985..e3e2bf2fa1 100644
--- a/keyboards/mechllama/g35/config.h
+++ b/keyboards/mechllama/g35/config.h
@@ -17,9 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
-
#define FORCE_NKRO
diff --git a/keyboards/mechllama/g35/g35.c b/keyboards/mechllama/g35/g35.c
deleted file mode 100644
index e3925674fe..0000000000
--- a/keyboards/mechllama/g35/g35.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kaylyn Bogle
- *
- * 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 "g35.h"
diff --git a/keyboards/mechllama/g35/g35.h b/keyboards/mechllama/g35/g35.h
deleted file mode 100644
index 2275272452..0000000000
--- a/keyboards/mechllama/g35/g35.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Kaylyn Bogle
- *
- * 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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, \
- K10, K11, K12, K13, K14, K15, K16, \
- K20, K21, K22, K23, K24, K25, K26, \
- K30, K31, K32, K33, K34, K35, K36, \
- K40, K41, K42, K43, K44, K45, K46 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, }, \
- { K10, K11, K12, K13, K14, K15, K16, }, \
- { K20, K21, K22, K23, K24, K25, K26, }, \
- { K30, K31, K32, K33, K34, K35, K36, }, \
- { K40, K41, K42, K43, K44, K45, K46 } \
-}
diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json
index ae29c4bfbd..739957342a 100644
--- a/keyboards/mechllama/g35/info.json
+++ b/keyboards/mechllama/g35/info.json
@@ -7,11 +7,54 @@
"vid": "0xCEEB",
"pid": "0x0035"
},
+ "ws2812": {
+ "pin": "F7"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.15},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.15},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.15},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3.15},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4, "h": 1.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 4, "h": 1.5},
+ {"matrix": [4, 5], "x": 5, "y": 4, "h": 1.75},
+ {"matrix": [4, 6], "x": 6, "y": 4, "h": 1.75}
+ ]
}
}
}
diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h
index fbda4b7db2..1aee08380c 100644
--- a/keyboards/mechllama/g35/v1/config.h
+++ b/keyboards/mechllama/g35/v1/config.h
@@ -17,7 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 }
-
#define RGBLED_NUM 41
diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json
index 90ac25f360..c5d4c69e7b 100644
--- a/keyboards/mechllama/g35/v1/info.json
+++ b/keyboards/mechllama/g35/v1/info.json
@@ -1,5 +1,10 @@
{
"usb": {
"device_version": "0.0.1"
- }
+ },
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "B5", "B6", "F0", "D5"],
+ "rows": ["F5", "F6", "F4", "F1", "D4"]
+ },
+ "diode_direction": "COL2ROW"
}
diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h
index cd4d6e991c..7c15560a1a 100644
--- a/keyboards/mechllama/g35/v2/config.h
+++ b/keyboards/mechllama/g35/v2/config.h
@@ -17,7 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 }
-
#define RGBLED_NUM 6
diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json
index e557e4d307..563625f428 100644
--- a/keyboards/mechllama/g35/v2/info.json
+++ b/keyboards/mechllama/g35/v2/info.json
@@ -1,5 +1,10 @@
{
"usb": {
"device_version": "0.0.2"
- }
+ },
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "D5"],
+ "rows": ["F5", "F4", "F1", "F0", "D4"]
+ },
+ "diode_direction": "COL2ROW"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 03:21:46 +0000