summaryrefslogtreecommitdiff
path: root/keyboards/pabile/p18
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
committerNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
commit5024370dd0b441e86ace3089193e84c5b050d892 (patch)
treeb661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/pabile/p18
parent16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff)
parent8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff)
Merge branch 'develop'
Diffstat (limited to 'keyboards/pabile/p18')
-rw-r--r--keyboards/pabile/p18/config.h27
-rw-r--r--keyboards/pabile/p18/info.json50
-rw-r--r--keyboards/pabile/p18/p18.c1
-rw-r--r--keyboards/pabile/p18/p18.h16
4 files changed, 29 insertions, 65 deletions
diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h
deleted file mode 100644
index 2b450e8fff..0000000000
--- a/keyboards/pabile/p18/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-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
-
-
-/* pin-out for PROMICRO */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D2, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json
index 3859d7852f..3e8a2b6864 100644
--- a/keyboards/pabile/p18/info.json
+++ b/keyboards/pabile/p18/info.json
@@ -1,13 +1,18 @@
{
- "keyboard_name": "P18 Macro Pad",
+ "keyboard_name": "P18 Macro Pad",
"manufacturer": "Pabile",
- "url": "https://pabileonline.blogspot.com/",
- "maintainer": "Pabile",
+ "url": "https://pabileonline.blogspot.com/",
+ "maintainer": "Pabile",
"usb": {
"vid": "0x6666",
"pid": "0x6668",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "D7", "E6", "B4", "B5"],
+ "rows": ["D1", "D0", "D4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "F4"},
@@ -19,24 +24,27 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":0, "y":2},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":0, "y":3},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3}
+ {"matrix": [0, 4], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 1], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 4], "x": 1.25, "y": 1},
+ {"matrix": [1, 3], "x": 2.25, "y": 1},
+ {"matrix": [1, 2], "x": 3.25, "y": 1},
+ {"matrix": [1, 1], "x": 4.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1.25, "y": 2},
+ {"matrix": [2, 3], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 1], "x": 4.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 1], "x": 4.25, "y": 3}
]
}
}
diff --git a/keyboards/pabile/p18/p18.c b/keyboards/pabile/p18/p18.c
deleted file mode 100644
index 94e74a8315..0000000000
--- a/keyboards/pabile/p18/p18.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "p18.h"
diff --git a/keyboards/pabile/p18/p18.h b/keyboards/pabile/p18/p18.h
deleted file mode 100644
index 3be26191ce..0000000000
--- a/keyboards/pabile/p18/p18.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k01, k02, k03, k04, \
- k11, k12, k13, k14, \
- k20, k21, k22, k23, k24, \
- k30, k31, k32, k33, k34 \
-) \
-{ \
- {KC_NO, k04, k03, k02, k01}, \
- {KC_NO, k14, k13, k12, k11}, \
- {k20, k24, k23, k22, k21}, \
- {k30, k34, k33, k32, k31} \
-}