summaryrefslogtreecommitdiff
path: root/keyboards/rate/pistachio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rate/pistachio')
-rw-r--r--keyboards/rate/pistachio/info.json197
-rw-r--r--keyboards/rate/pistachio/pistachio.c18
-rw-r--r--keyboards/rate/pistachio/pistachio.h25
-rw-r--r--keyboards/rate/pistachio/rev1/config.h16
-rw-r--r--keyboards/rate/pistachio/rev1/info.json7
-rw-r--r--keyboards/rate/pistachio/rev1/rev1.c18
-rw-r--r--keyboards/rate/pistachio/rev2/config.h16
-rw-r--r--keyboards/rate/pistachio/rev2/info.json7
-rw-r--r--keyboards/rate/pistachio/rev2/rev2.c19
9 files changed, 116 insertions, 207 deletions
diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json
index 109e2fa50c..e07d02061d 100644
--- a/keyboards/rate/pistachio/info.json
+++ b/keyboards/rate/pistachio/info.json
@@ -1,8 +1,8 @@
{
- "keyboard_name": "pistachio",
+ "keyboard_name": "pistachio",
"manufacturer": "rate",
- "url": "",
- "maintainer": "rate",
+ "url": "",
+ "maintainer": "rate",
"usb": {
"vid": "0x5255",
"pid": "0xD0C2",
@@ -12,98 +12,105 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"ESC", "x":1.25, "y":0.25},
- {"label":"F1", "x":2.75, "y":0.25},
- {"label":"F2", "x":3.75, "y":0.25},
- {"label":"F3", "x":4.75, "y":0.25},
- {"label":"F4", "x":5.75, "y":0.25},
- {"label":"DEL", "x":7.25, "y":0.25},
- {"label":"F5", "x":9.5, "y":0.25},
- {"label":"F6", "x":10.5, "y":0.25},
- {"label":"F7", "x":11.5, "y":0.25},
- {"label":"F8", "x":12.5, "y":0.25},
- {"label":"F9", "x":14, "y":0.25},
- {"label":"F10", "x":15, "y":0.25},
- {"label":"F11", "x":16, "y":0.25},
- {"label":"F12", "x":17, "y":0.25},
- {"label":"\u25b6\u25b6|", "x":0, "y":1.75},
- {"label":"E/J", "x":1.25, "y":1.75},
- {"label":"!", "x":2.25, "y":1.75},
- {"label":"\"", "x":3.25, "y":1.75},
- {"label":"#", "x":4.25, "y":1.75},
- {"label":"$", "x":5.25, "y":1.75},
- {"label":"%", "x":6.25, "y":1.75},
- {"label":"&", "x":7.25, "y":1.75},
- {"label":"'", "x":10, "y":1.75},
- {"label":"(", "x":11, "y":1.75},
- {"label":")", "x":12, "y":1.75},
- {"label":"", "x":13, "y":1.75},
- {"label":"=", "x":14, "y":1.75},
- {"label":"~", "x":15, "y":1.75},
- {"label":"\\", "x":16, "y":1.75},
- {"label":"\u2190", "x":17, "y":1.75},
- {"label":"Delete", "x":18.25, "y":1.75},
- {"label":"\u25b6||", "x":0, "y":2.75},
- {"label":"Tab", "x":1.25, "y":2.75, "w":1.5},
- {"label":"Q", "x":2.75, "y":2.75},
- {"label":"W", "x":3.75, "y":2.75},
- {"label":"E", "x":4.75, "y":2.75},
- {"label":"R", "x":5.75, "y":2.75},
- {"label":"T", "x":6.75, "y":2.75},
- {"label":"Y", "x":9.5, "y":2.75},
- {"label":"U", "x":10.5, "y":2.75},
- {"label":"I", "x":11.5, "y":2.75},
- {"label":"O", "x":12.5, "y":2.75},
- {"label":"P", "x":13.5, "y":2.75},
- {"label":"`", "x":14.5, "y":2.75},
- {"label":"{", "x":15.5, "y":2.75},
- {"label":"Home", "x":18.25, "y":2.75},
- {"label":"\ud83d\udd07", "x":0, "y":3.75},
- {"label":"CapsLock", "x":1.25, "y":3.75, "w":1.75},
- {"label":"A", "x":3, "y":3.75},
- {"label":"S", "x":4, "y":3.75},
- {"label":"D", "x":5, "y":3.75},
- {"label":"F", "x":6, "y":3.75},
- {"label":"G", "x":7, "y":3.75},
- {"label":"H", "x":9.75, "y":3.75},
- {"label":"J", "x":10.75, "y":3.75},
- {"label":"K", "x":11.75, "y":3.75},
- {"label":"L", "x":12.75, "y":3.75},
- {"label":"+", "x":13.75, "y":3.75},
- {"label":"*", "x":14.75, "y":3.75},
- {"label":"}", "x":15.75, "y":3.75},
- {"label":"Enter", "x":16.75, "y":2.75, "w":1.25, "h":2},
- {"label":"End", "x":18.25, "y":3.75},
- {"label":"VolUP", "x":0, "y":4.75},
- {"label":"Shift", "x":1.25, "y":4.75, "w":2.25},
- {"label":"Z", "x":3.5, "y":4.75},
- {"label":"X", "x":4.5, "y":4.75},
- {"label":"C", "x":5.5, "y":4.75},
- {"label":"V", "x":6.5, "y":4.75},
- {"label":"B", "x":7.5, "y":4.75},
- {"label":"N", "x":10.25, "y":4.75},
- {"label":"M", "x":11.25, "y":4.75},
- {"label":"<", "x":12.25, "y":4.75},
- {"label":">", "x":13.25, "y":4.75},
- {"label":"?", "x":14.25, "y":4.75},
- {"label":"_", "x":15.25, "y":4.75},
- {"label":"Shift", "x":16.25, "y":4.75, "w":1.75},
- {"label":"Page", "x":18.25, "y":4.75},
- {"label":"VolDW", "x":0, "y":5.75},
- {"label":"Ctrl", "x":1.25, "y":5.75, "w":1.25},
- {"label":"Win", "x":2.5, "y":5.75},
- {"label":"Alt", "x":3.5, "y":5.75, "w":1.25},
- {"label":"Enter", "x":4.75, "y":5.75},
- {"label":"\u7121\u5909\u63db", "x":5.75, "y":5.75},
- {"x":6.75, "y":5.75, "w":1.25},
- {"x":10.5, "y":5.75, "w":1.25},
- {"label":"\u5909\u63db", "x":11.75, "y":5.75},
- {"label":"\u5de6\u30af\u30ea\u30c3\u30af", "x":12.75, "y":5.75},
- {"label":"Insert", "x":13.75, "y":5.75},
- {"label":"Alt", "x":14.75, "y":5.75},
- {"label":"Menu", "x":15.75, "y":5.75},
- {"label":"Ctrl", "x":16.75, "y":5.75, "w":1.25},
- {"label":"Page", "x":18.25, "y":5.75}]
+ "layout": [
+ {"x":1.25, "y":0},
+ {"x":2.75, "y":0},
+ {"x":3.75, "y":0},
+ {"x":4.75, "y":0},
+ {"x":5.75, "y":0},
+ {"x":7.25, "y":0},
+ {"x":9.5, "y":0},
+ {"x":10.5, "y":0},
+ {"x":11.5, "y":0},
+ {"x":12.5, "y":0},
+ {"x":14, "y":0},
+ {"x":15, "y":0},
+ {"x":16, "y":0},
+ {"x":17, "y":0},
+
+ {"x":0, "y":1.5},
+ {"x":1.25, "y":1.5},
+ {"x":2.25, "y":1.5},
+ {"x":3.25, "y":1.5},
+ {"x":4.25, "y":1.5},
+ {"x":5.25, "y":1.5},
+ {"x":6.25, "y":1.5},
+ {"x":7.25, "y":1.5},
+ {"x":10, "y":1.5},
+ {"x":11, "y":1.5},
+ {"x":12, "y":1.5},
+ {"x":13, "y":1.5},
+ {"x":14, "y":1.5},
+ {"x":15, "y":1.5},
+ {"x":16, "y":1.5},
+ {"x":17, "y":1.5},
+ {"x":18.25, "y":1.5},
+
+ {"x":0, "y":2.5},
+ {"x":1.25, "y":2.5, "w":1.5},
+ {"x":2.75, "y":2.5},
+ {"x":3.75, "y":2.5},
+ {"x":4.75, "y":2.5},
+ {"x":5.75, "y":2.5},
+ {"x":6.75, "y":2.5},
+ {"x":9.5, "y":2.5},
+ {"x":10.5, "y":2.5},
+ {"x":11.5, "y":2.5},
+ {"x":12.5, "y":2.5},
+ {"x":13.5, "y":2.5},
+ {"x":14.5, "y":2.5},
+ {"x":15.5, "y":2.5},
+ {"x":18.25, "y":2.5},
+
+ {"x":0, "y":3.5},
+ {"x":1.25, "y":3.5, "w":1.75},
+ {"x":3, "y":3.5},
+ {"x":4, "y":3.5},
+ {"x":5, "y":3.5},
+ {"x":6, "y":3.5},
+ {"x":7, "y":3.5},
+ {"x":9.75, "y":3.5},
+ {"x":10.75, "y":3.5},
+ {"x":11.75, "y":3.5},
+ {"x":12.75, "y":3.5},
+ {"x":13.75, "y":3.5},
+ {"x":14.75, "y":3.5},
+ {"x":15.75, "y":3.5},
+ {"x":16.75, "y":2.5, "w":1.25, "h":2},
+ {"x":18.25, "y":3.5},
+
+ {"x":0, "y":4.5},
+ {"x":1.25, "y":4.5, "w":2.25},
+ {"x":3.5, "y":4.5},
+ {"x":4.5, "y":4.5},
+ {"x":5.5, "y":4.5},
+ {"x":6.5, "y":4.5},
+ {"x":7.5, "y":4.5},
+ {"x":10.25, "y":4.5},
+ {"x":11.25, "y":4.5},
+ {"x":12.25, "y":4.5},
+ {"x":13.25, "y":4.5},
+ {"x":14.25, "y":4.5},
+ {"x":15.25, "y":4.5},
+ {"x":16.25, "y":4.5, "w":1.75},
+ {"x":18.25, "y":4.5},
+
+ {"x":0, "y":5.5},
+ {"x":1.25, "y":5.5, "w":1.25},
+ {"x":2.5, "y":5.5},
+ {"x":3.5, "y":5.5, "w":1.25},
+ {"x":4.75, "y":5.5},
+ {"x":5.75, "y":5.5},
+ {"x":6.75, "y":5.5, "w":1.25},
+ {"x":10.5, "y":5.5, "w":1.25},
+ {"x":11.75, "y":5.5},
+ {"x":12.75, "y":5.5},
+ {"x":13.75, "y":5.5},
+ {"x":14.75, "y":5.5},
+ {"x":15.75, "y":5.5},
+ {"x":16.75, "y":5.5, "w":1.25},
+ {"x":18.25, "y":5.5}
+ ]
}
}
}
diff --git a/keyboards/rate/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c
deleted file mode 100644
index 2a850f64a4..0000000000
--- a/keyboards/rate/pistachio/pistachio.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 rate
- *
- * 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 "pistachio.h"
-
diff --git a/keyboards/rate/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h
deleted file mode 100644
index 7bf2c59ad6..0000000000
--- a/keyboards/rate/pistachio/pistachio.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 rate
- *
- * 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"
-
-#if defined(KEYBOARD_rate_pistachio_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_rate_pistachio_rev2)
-# include "rev2.h"
-#endif
diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index cd6121de45..e1f218f682 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
@@ -17,24 +17,8 @@ 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 { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3}
-
#define USE_I2C
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN D2
#define RGBLIGHT_SPLIT
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
new file mode 100644
index 0000000000..0ecbe691df
--- /dev/null
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/rate/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c
deleted file mode 100644
index 5824157f53..0000000000
--- a/keyboards/rate/pistachio/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 rate
-
-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 "rev1.h"
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index 5a7c35a936..20e6f23c67 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -17,24 +17,8 @@ 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 { B5, B4, E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3}
-
#define USE_I2C
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Split hand configration */
#define SPLIT_HAND_MATRIX_GRID D4,D3
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
new file mode 100644
index 0000000000..992a866125
--- /dev/null
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
+ "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/rate/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c
deleted file mode 100644
index c6e64a526d..0000000000
--- a/keyboards/rate/pistachio/rev2/rev2.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 rate
-
-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 "rev2.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 06:13:38 +0000