summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-03-20 17:22:42 -0700
committerJack Humbert <jack.humb@gmail.com>2018-03-20 20:22:42 -0400
commit1fbddc6613f7d5e7fa426215b71bfff34b0f0741 (patch)
treecbb03c771019795f526a235d5ee4a8ea41d6446b /keyboards
parent2d8fda614e0078b4a7f8c696807ff8f6a958b10b (diff)
Configurator Support(info.json) for 1up Keyboards Sweet16 (#2570)
* Configurator Support - Add info.json to support existing layouts - Add comment in sweet16.h to remind people to change info.json if the layout changes. * Fix dlaroe's keymap
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/sweet16/info.json20
-rw-r--r--keyboards/sweet16/keymaps/dlaroe/keymap.c22
-rw-r--r--keyboards/sweet16/sweet16.h8
3 files changed, 36 insertions, 14 deletions
diff --git a/keyboards/sweet16/info.json b/keyboards/sweet16/info.json
new file mode 100644
index 0000000000..b43197c8cf
--- /dev/null
+++ b/keyboards/sweet16/info.json
@@ -0,0 +1,20 @@
+{
+ "keyboard_name": "Sweet 16",
+ "manufacturer": "1UP Keyboards",
+ "identifier": "",
+ "url": "",
+ "maintainer": "qmk",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "width": 4,
+ "height": 4,
+ "layouts": {
+ "LAYOUT_ortho_4x4": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+ },
+
+ "LAYOUT_numpad_4x4": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}]
+ }
+ }
+}
diff --git a/keyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/sweet16/keymaps/dlaroe/keymap.c
index ba947465e7..b42c34edb7 100644
--- a/keyboards/sweet16/keymaps/dlaroe/keymap.c
+++ b/keyboards/sweet16/keymaps/dlaroe/keymap.c
@@ -10,24 +10,24 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[num] = LAYOUT_numpad_4x4(
- KC_P7, KC_P8, KC_P9, LT(extra, KC_PPLS),
- KC_P4, KC_P5, KC_P6,
- KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_P7, KC_P8, KC_P9, LT(extra, KC_PPLS),
+ KC_P4, KC_P5, KC_P6,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
LT(mouse, KC_P0), KC_DOT
- )
+ ),
[extra] = LAYOUT_numpad_4x4(
- KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS,
- KC_BSPC, KC_EXC, KC_DEL,
- KC_LPRN, KC_RPRN, KC_PEQL, KC_PENT,
+ KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS,
+ KC_BSPC, KC_EXECUTE, KC_DEL,
+ KC_LPRN, KC_RPRN, KC_PEQL, KC_PENT,
KC_TAB, KC_NLCK
- )
+ ),
[mouse] = LAYOUT_numpad_4x4(
- KC_MS_WH_D, KC_MS_U, KC_MS_WH_U, LT(extra, KC_PPLS),
- KC_MS_L, KC_MS_D, KC_MS_R,
- KC_BTN1, KC_BTN2, KC_BTN3, KC_PENT,
+ KC_WH_D, KC_MS_U, KC_WH_U, LT(extra, KC_PPLS),
+ KC_MS_L, KC_MS_D, KC_MS_R,
+ KC_BTN1, KC_BTN2, KC_BTN3, KC_PENT,
KC_TRNS, KC_DOT
)
diff --git a/keyboards/sweet16/sweet16.h b/keyboards/sweet16/sweet16.h
index 23d411a89b..879f51fae6 100644
--- a/keyboards/sweet16/sweet16.h
+++ b/keyboards/sweet16/sweet16.h
@@ -3,6 +3,8 @@
#include "quantum.h"
+// Any changes to the layout names and/or definitions must also be made to info.json
+
#define LAYOUT_ortho_4x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
@@ -22,9 +24,9 @@
K31, K32 \
) { \
{ K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
+ { K10, K11, K12, KC_NO }, \
{ K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
+ { KC_NO, K31, K32, KC_NO } \
}
-#endif \ No newline at end of file
+#endif