summaryrefslogtreecommitdiff
path: root/keyboards/coseyfannitutti/discipad
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-25 23:04:48 +0000
committerQMK Bot <hello@qmk.fm>2022-07-25 23:04:48 +0000
commit1e651dbdb0815013da00804257df67aab5e28167 (patch)
treea9e7fe329803a6ced4e8644615ebf5b84a47e6a7 /keyboards/coseyfannitutti/discipad
parent4baed8037d18d73f3937006c9f0379c3e15d6125 (diff)
parenta939293aca697cb263f4972dbb1521d273fbf499 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/coseyfannitutti/discipad')
-rw-r--r--keyboards/coseyfannitutti/discipad/config.h6
-rw-r--r--keyboards/coseyfannitutti/discipad/info.json6
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index 69e2e1561c..9fe37c68a4 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0x6B62
-#define PRODUCT_ID 0x1769
-#define DEVICE_VER 0x0001
-#define MANUFACTURER coseyfannitutti
-#define PRODUCT DISCIPAD
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 4
diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json
index 267fd9f039..d11120c0dd 100644
--- a/keyboards/coseyfannitutti/discipad/info.json
+++ b/keyboards/coseyfannitutti/discipad/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "DISCIPAD",
+ "manufacturer": "coseyfannitutti",
"url": "https://github.com/coseyfannitutti/discipad",
"maintainer": "coseyfannitutti",
+ "usb": {
+ "vid": "0x6B62",
+ "pid": "0x1769",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]