summaryrefslogtreecommitdiffstats
path: root/keyboards/dc01/numpad
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-07-21 12:12:07 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-21 12:12:07 -0700
commit1147fc24adfe22eac6e67f9d7f0f1184f358f141 (patch)
tree7d1b46e824e7fe5a8652f04f3739b76481aa2375 /keyboards/dc01/numpad
parentd4056a11d3b1e29800d6bccab4d601db211a7f53 (diff)
Keyboard: DC01 refactor and Configurator support (#3445)
* Arrow: matrix and keymap refactor * Left: matrix and keymap refactor * Numpad: matrix macro correction * Numpad: add support for community layouts numpad_5x4 and ortho_5x4 * Right: matrix and keymap refactor * DC01 global readme cleanup (minor grammar) * DC01 global Configurator support * Right: bugfixes for HHKB-style keymaps
Diffstat (limited to 'keyboards/dc01/numpad')
-rw-r--r--keyboards/dc01/numpad/info.json15
-rw-r--r--keyboards/dc01/numpad/numpad.h4
-rw-r--r--keyboards/dc01/numpad/readme.md2
-rw-r--r--keyboards/dc01/numpad/rules.mk5
4 files changed, 22 insertions, 4 deletions
diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json
index e69de29bb2..cf35309095 100644
--- a/keyboards/dc01/numpad/info.json
+++ b/keyboards/dc01/numpad/info.json
@@ -0,0 +1,15 @@
+{
+ "keyboard_name": "DC01 Numpad",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 4,
+ "height": 5,
+ "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}]
+ },
+ "LAYOUT_ortho_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":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"00", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}]
+ }
+ }
+}
diff --git a/keyboards/dc01/numpad/numpad.h b/keyboards/dc01/numpad/numpad.h
index 15e031b07c..702926184a 100644
--- a/keyboards/dc01/numpad/numpad.h
+++ b/keyboards/dc01/numpad/numpad.h
@@ -25,8 +25,8 @@
// The second converts the arguments into a two-dimensional array
#define LAYOUT_numpad_5x4( \
K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, \
+ K10, K11, K12, \
+ K20, K21, K22, K13, \
K30, K31, K32, \
K40, K42, K43 \
) \
diff --git a/keyboards/dc01/numpad/readme.md b/keyboards/dc01/numpad/readme.md
index 977100dde9..c50fe6b992 100644
--- a/keyboards/dc01/numpad/readme.md
+++ b/keyboards/dc01/numpad/readme.md
@@ -2,7 +2,7 @@
![DC01 Numpad](https://i.imgur.com/PTn0sp8.jpg)
-A hotpluggable four part keyboard which comes together with magnets and pogo pins! This is the numpad
+A hotpluggable four part keyboard which comes together with magnets and pogo pins! This is the numpad.
Keyboard Maintainer: [Yiancar](https://github.com/yiancar)
Hardware Supported: Runs on an atmega32u4
diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk
index 4b6cb0e473..39112ae922 100644
--- a/keyboards/dc01/numpad/rules.mk
+++ b/keyboards/dc01/numpad/rules.mk
@@ -71,4 +71,7 @@ AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes # Use custom matrix \ No newline at end of file
+CUSTOM_MATRIX = yes # Use custom matrix
+
+# Community layouts supported
+LAYOUTS = numpad_5x4 ortho_5x4