summaryrefslogtreecommitdiff
path: root/keyboards/handwired/pill60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/pill60')
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/config.h22
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/info.json5
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/config.h22
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/info.json5
-rw-r--r--keyboards/handwired/pill60/bluepill/config.h22
-rw-r--r--keyboards/handwired/pill60/bluepill/info.json5
-rw-r--r--keyboards/handwired/pill60/config.h3
-rw-r--r--keyboards/handwired/pill60/info.json100
-rw-r--r--keyboards/handwired/pill60/pill60.c16
9 files changed, 65 insertions, 135 deletions
diff --git a/keyboards/handwired/pill60/blackpill_f401/config.h b/keyboards/handwired/pill60/blackpill_f401/config.h
deleted file mode 100644
index 7de8654319..0000000000
--- a/keyboards/handwired/pill60/blackpill_f401/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-#define MATRIX_COL_PINS \
- { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
-#define MATRIX_ROW_PINS \
- { B4, B3, A15, B13, B5 }
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json
index acd7e83f77..8d85a2e930 100644
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ b/keyboards/handwired/pill60/blackpill_f401/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+ "rows": ["B4", "B3", "A15", "B13", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/handwired/pill60/blackpill_f411/config.h b/keyboards/handwired/pill60/blackpill_f411/config.h
deleted file mode 100644
index 7de8654319..0000000000
--- a/keyboards/handwired/pill60/blackpill_f411/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-#define MATRIX_COL_PINS \
- { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
-#define MATRIX_ROW_PINS \
- { B4, B3, A15, B13, B5 }
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json
index 2517a82403..4e0935f79c 100644
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ b/keyboards/handwired/pill60/blackpill_f411/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+ "rows": ["B4", "B3", "A15", "B13", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F411",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/handwired/pill60/bluepill/config.h b/keyboards/handwired/pill60/bluepill/config.h
deleted file mode 100644
index 1ba5ff2069..0000000000
--- a/keyboards/handwired/pill60/bluepill/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-#define MATRIX_COL_PINS \
- { A8, B11, B10, B15, A10, A1, A2, A3, A4, A5, A6, A7, B0, B1 }
-#define MATRIX_ROW_PINS \
- { B4, B3, A15, B13, B5 }
diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/info.json
index cf993be247..028b1d89d8 100644
--- a/keyboards/handwired/pill60/bluepill/info.json
+++ b/keyboards/handwired/pill60/bluepill/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["A8", "B11", "B10", "B15", "A10", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1"],
+ "rows": ["B4", "B3", "A15", "B13", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino"
}
diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h
index e96fba1db8..399d0f2212 100644
--- a/keyboards/handwired/pill60/config.h
+++ b/keyboards/handwired/pill60/config.h
@@ -15,8 +15,5 @@
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD5
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index 5ab526ce67..0c8f353bff 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -22,66 +22,66 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "Enc", "x": 0, "y": 0, "w": 1},
+ {"label": "Enc", "x": 0, "y": 0},
- {"label": "Esc", "x": 0, "y": 1, "w": 1},
- {"label": "1","x": 1, "y": 1, "w": 1},
- {"label": "2","x": 2, "y": 1, "w": 1},
- {"label": "3","x": 3, "y": 1, "w": 1},
- {"label": "4","x": 4, "y": 1, "w": 1},
- {"label": "5","x": 5, "y": 1, "w": 1},
- {"label": "6","x": 6, "y": 1, "w": 1},
- {"label": "7","x": 7, "y": 1, "w": 1},
- {"label": "8","x": 8, "y": 1, "w": 1},
- {"label": "9","x": 9, "y": 1, "w": 1},
- {"label": "0","x": 10, "y": 1, "w": 1},
- {"label": "-","x": 11, "y": 1, "w": 1},
- {"label": "=","x": 12, "y": 1, "w": 1},
- {"label": "\\","x": 13, "y": 1, "w": 1},
- {"label": "Del","x": 14, "y": 1, "w": 1},
+ {"label": "Esc", "x": 0, "y": 1},
+ {"label": "1","x": 1, "y": 1},
+ {"label": "2","x": 2, "y": 1},
+ {"label": "3","x": 3, "y": 1},
+ {"label": "4","x": 4, "y": 1},
+ {"label": "5","x": 5, "y": 1},
+ {"label": "6","x": 6, "y": 1},
+ {"label": "7","x": 7, "y": 1},
+ {"label": "8","x": 8, "y": 1},
+ {"label": "9","x": 9, "y": 1},
+ {"label": "0","x": 10, "y": 1},
+ {"label": "-","x": 11, "y": 1},
+ {"label": "=","x": 12, "y": 1},
+ {"label": "\\","x": 13, "y": 1},
+ {"label": "Del","x": 14, "y": 1},
{"label": "Tab","x": 0, "y": 2, "w": 1.5},
- {"label": "Q","x": 1.5, "y": 2, "w": 1},
- {"label": "W","x": 2.5, "y": 2, "w": 1},
- {"label": "E","x": 3.5, "y": 2, "w": 1},
- {"label": "R","x": 4.5, "y": 2, "w": 1},
- {"label": "T","x": 5.5, "y": 2, "w": 1},
- {"label": "Y","x": 6.5, "y": 2, "w": 1},
- {"label": "U","x": 7.5, "y": 2, "w": 1},
- {"label": "I","x": 8.5, "y": 2, "w": 1},
- {"label": "O","x": 9.5, "y": 2, "w": 1},
- {"label": "P","x": 10.5, "y": 2, "w": 1},
- {"label": "[","x": 11.5, "y": 2, "w": 1},
- {"label": "]","x": 12.5, "y": 2, "w": 1},
+ {"label": "Q","x": 1.5, "y": 2},
+ {"label": "W","x": 2.5, "y": 2},
+ {"label": "E","x": 3.5, "y": 2},
+ {"label": "R","x": 4.5, "y": 2},
+ {"label": "T","x": 5.5, "y": 2},
+ {"label": "Y","x": 6.5, "y": 2},
+ {"label": "U","x": 7.5, "y": 2},
+ {"label": "I","x": 8.5, "y": 2},
+ {"label": "O","x": 9.5, "y": 2},
+ {"label": "P","x": 10.5, "y": 2},
+ {"label": "[","x": 11.5, "y": 2},
+ {"label": "]","x": 12.5, "y": 2},
{"label": "Backspace","x": 13.5, "y": 2, "w": 1.5},
{"label": "Caps","x": 0, "y": 3, "w": 1.75},
- {"label": "A","x": 1.75, "y": 3, "w": 1},
- {"label": "S","x": 2.75, "y": 3, "w": 1},
- {"label": "D","x": 3.75, "y": 3, "w": 1},
- {"label": "F","x": 4.75, "y": 3, "w": 1},
- {"label": "G","x": 5.75, "y": 3, "w": 1},
- {"label": "H","x": 6.75, "y": 3, "w": 1},
- {"label": "J","x": 7.75, "y": 3, "w": 1},
- {"label": "K","x": 8.75, "y": 3, "w": 1},
- {"label": "L","x": 9.75, "y": 3, "w": 1},
- {"label": ";","x": 10.75, "y": 3, "w": 1},
- {"label": "'","x": 11.75, "y": 3, "w": 1},
+ {"label": "A","x": 1.75, "y": 3},
+ {"label": "S","x": 2.75, "y": 3},
+ {"label": "D","x": 3.75, "y": 3},
+ {"label": "F","x": 4.75, "y": 3},
+ {"label": "G","x": 5.75, "y": 3},
+ {"label": "H","x": 6.75, "y": 3},
+ {"label": "J","x": 7.75, "y": 3},
+ {"label": "K","x": 8.75, "y": 3},
+ {"label": "L","x": 9.75, "y": 3},
+ {"label": ";","x": 10.75, "y": 3},
+ {"label": "'","x": 11.75, "y": 3},
{"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
{"label": "L Shift","x": 0, "y": 4, "w": 2.25},
- {"label": "Z","x": 2.25, "y": 4, "w": 1},
- {"label": "X","x": 3.25, "y": 4, "w": 1},
- {"label": "C","x": 4.25, "y": 4, "w": 1},
- {"label": "V","x": 5.25, "y": 4, "w": 1},
- {"label": "B","x": 6.25, "y": 4, "w": 1},
- {"label": "N","x": 7.25, "y": 4, "w": 1},
- {"label": "M","x": 8.25, "y": 4, "w": 1},
- {"label": ",","x": 9.25, "y": 4, "w": 1},
- {"label": ".","x": 10.25, "y": 4, "w": 1},
- {"label": "/","x": 11.25, "y": 4, "w": 1},
+ {"label": "Z","x": 2.25, "y": 4},
+ {"label": "X","x": 3.25, "y": 4},
+ {"label": "C","x": 4.25, "y": 4},
+ {"label": "V","x": 5.25, "y": 4},
+ {"label": "B","x": 6.25, "y": 4},
+ {"label": "N","x": 7.25, "y": 4},
+ {"label": "M","x": 8.25, "y": 4},
+ {"label": ",","x": 9.25, "y": 4},
+ {"label": ".","x": 10.25, "y": 4},
+ {"label": "/","x": 11.25, "y": 4},
{"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
- {"label": "FN","x": 14, "y": 4, "w": 1},
+ {"label": "FN","x": 14, "y": 4},
{"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
{"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
diff --git a/keyboards/handwired/pill60/pill60.c b/keyboards/handwired/pill60/pill60.c
deleted file mode 100644
index 928685a92c..0000000000
--- a/keyboards/handwired/pill60/pill60.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 Imam Rafii
- *
- * 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 "pill60.h" \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 22:28:12 +0000