summaryrefslogtreecommitdiff
path: root/keyboards/converter/numeric_keypad_iie
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/converter/numeric_keypad_iie')
-rw-r--r--keyboards/converter/numeric_keypad_iie/config.h87
-rw-r--r--keyboards/converter/numeric_keypad_iie/info.json49
-rw-r--r--keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c16
-rw-r--r--keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h30
4 files changed, 45 insertions, 137 deletions
diff --git a/keyboards/converter/numeric_keypad_iie/config.h b/keyboards/converter/numeric_keypad_iie/config.h
deleted file mode 100644
index 81671354fd..0000000000
--- a/keyboards/converter/numeric_keypad_iie/config.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright 2019 Adam Newbold <adam@neatnik.net>
-
-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 Mappings
-============
-
-Dsub-15 Connection
-------------------
-
- Dsub-15 (female)
- ,-------------------------.
- \ 08 07 06 05 04 03 02 01 /
- \ 15 14 13 12 11 10 09 /
- `---------------------'
-
-Header Pins
------------
- _____________________________________
-| |
-| 11 10 9 8 7 6 5 4 3 2 1 |
-|_____________________________________|
-
-
-Header / Matrix
----------------
-
-Pin Name Description
---------------------------------------------------------------
-1,2,5,3,4,6 Y0-Y5 Y-direction key-matrix connections
-7 NC
-9,11,10,8 X4-X7 X-direction key-matrix connections
-
-
-Microcontroller Configuration
------------------------------
-
-(Pins are for an Arduino Micro)
-
-+-----------------------------------+
-| Dsub-15 | Header | Matrix | Micro |
-|---------+--------+--------+-------|
-| 12 | 11 | X5 | B0 |
-| 11 | 10 | X6 | D3 |
-| 10 | 9 | X4 | B2 |
-| 9 | 8 | X7 | D2 |
-| NC | 7 | NC | -- |
-| 7 | 6 | Y5 | E6 |
-| 6 | 5 | Y2 | D4 |
-| 5 | 4 | Y4 | D7 |
-| 3 | 3 | Y3 | C6 |
-| 2 | 2 | Y1 | D0 |
-| 1 | 1 | Y0 | D1 |
-+-----------------------------------+
-
-Note: Dsub-15 pins 4, 8, 13, 14, and 15 are unused
-
-Reference
----------
-
-https://deskthority.net/wiki/Apple_Numeric_Keypad_IIe
-https://geekhack.org/index.php?topic=78048.0
-http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_connector
-
-*/
-
-#define MATRIX_ROW_PINS { B0, B2, D2, D3 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json
index 41b75f69b9..abec316be7 100644
--- a/keyboards/converter/numeric_keypad_iie/info.json
+++ b/keyboards/converter/numeric_keypad_iie/info.json
@@ -1,18 +1,59 @@
{
- "keyboard_name": "Numeric Keypad IIe",
+ "keyboard_name": "Numeric Keypad IIe",
"manufacturer": "Apple Inc.",
- "url": "",
- "maintainer": "qmk",
+ "url": "",
+ "maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "D7", "E6"],
+ "rows": ["B0", "B2", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}]
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [3, 2], "x": 3, "y": 0},
+ {"matrix": [3, 3], "x": 4, "y": 0},
+
+ {"matrix": [2, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 0], "x": 6.5, "y": 0},
+
+ {"matrix": [1, 1], "x": 0, "y": 1},
+
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [1, 0], "x": 6.5, "y": 1},
+
+ {"matrix": [3, 1], "x": 0, "y": 2},
+
+ {"matrix": [1, 3], "x": 2, "y": 2},
+ {"matrix": [1, 4], "x": 3, "y": 2},
+ {"matrix": [1, 5], "x": 4, "y": 2},
+
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [3, 0], "x": 6.5, "y": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 3},
+
+ {"matrix": [1, 2], "x": 1.5, "y": 3, "w": 1.5},
+ {"matrix": [2, 5], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+
+ {"matrix": [2, 4], "x": 5.5, "y": 3},
+ {"matrix": [2, 0], "x": 6.5, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
deleted file mode 100644
index 341af05b31..0000000000
--- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Adam Newbold <adam@neatnik.net>
- *
- * 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 "numeric_keypad_iie.h"
diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
deleted file mode 100644
index 8892b5553b..0000000000
--- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright Adam Newbold <adam@neatnik.net>
- *
- * 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( \
- K_ESC, K_7, K_8, K_9, K_LEFT_PARENS, K_RIGHT_PARENS, \
- K_LEFT, K_4, K_5, K_6, K_MINUS, K_DIVIDE, \
- K_RIGHT, K_1, K_2, K_3, K_PLUS, K_MULTIPLY, \
- K_SPACE, K_0, K_COMMA, K_DOT, K_RETURN, K_PRINT \
-){ \
- { K_RIGHT_PARENS, K_ESC, K_4, K_5, K_6, K_7 },\
- { K_DIVIDE, K_LEFT, K_0, K_1, K_2, K_3 },\
- { K_PRINT, K_SPACE, K_LEFT_PARENS, K_MINUS, K_RETURN, K_COMMA },\
- { K_MULTIPLY, K_RIGHT, K_8, K_9, K_DOT, K_PLUS },\
-}