summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-07-04 21:44:50 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-04 21:44:50 -0700
commit3d6919c3dc1933c20c3cf2afc473e97cebed447e (patch)
treecde88ba6e6d45476eec89b5947efd9df9e6550b7
parentdb8b547b7da6c6bd0c63ca0bad250048eb8cb934 (diff)
Tomato refactor and Configurator support (#3314)
* Matrix refactor: rename KEYMAP to LAYOUT_ortho_3x10 * Keymap refactor: matrix rename * Add LAYOUTS = ortho_3x10 to rules.mk * Configurator support
-rw-r--r--keyboards/tomato/info.json13
-rw-r--r--keyboards/tomato/keymaps/default/keymap.c14
-rw-r--r--keyboards/tomato/rules.mk2
-rw-r--r--keyboards/tomato/tomato.h2
4 files changed, 23 insertions, 8 deletions
diff --git a/keyboards/tomato/info.json b/keyboards/tomato/info.json
new file mode 100644
index 0000000000..f01f5e7e0b
--- /dev/null
+++ b/keyboards/tomato/info.json
@@ -0,0 +1,13 @@
+{
+ "keyboard_name": "Tomato",
+ "url": "",
+ "maintainer": "qmk",
+ "bootloader": "",
+ "width": 10,
+ "height": 3,
+ "layouts": {
+ "LAYOUT_ortho_3x10": {
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+ }
+ }
+}
diff --git a/keyboards/tomato/keymaps/default/keymap.c b/keyboards/tomato/keymaps/default/keymap.c
index 26335b7184..94bfca202b 100644
--- a/keyboards/tomato/keymaps/default/keymap.c
+++ b/keyboards/tomato/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "tomato.h"
+#include QMK_KEYBOARD_H
#define SPC_F1 LT(1,KC_SPC)
#define BS_F2 LT(2,KC_BSPC)
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | Z | X | C | V | BSPC | SPC | B | N | M | ENT |
* '-------------------------------------------------------------------------------'
*/
- KEYMAP
+ LAYOUT_ortho_3x10
( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P
, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC
, Z_CTL, X_ALT, C_F3, V_F4, BS_F2, SPC_F1, B_F5, N_ALT, M_CTL, ENT_SFT
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | DEL | | | | | |
* '-------------------------------------------------------------------------------'
*/
- KEYMAP
+ LAYOUT_ortho_3x10
( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0
, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DEL, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | |
* '-------------------------------------------------------------------------------'
*/
- KEYMAP
+ LAYOUT_ortho_3x10
( KC_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN
, KC_F11, KC_F12,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_GRAVE
, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Left | Down | Up | Right |
* '-------------------------------------------------------------------------------'
*/
- KEYMAP
+ LAYOUT_ortho_3x10
( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MINS,KC_EQL, KC_LBRC,KC_RBRC,KC_BSLS
, KC_TAB, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_COMM,KC_DOT, KC_SLSH,KC_SCLN,KC_QUOT
, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_UP, KC_RGHT
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Home | PgDn | PgUp | End |
* '-------------------------------------------------------------------------------'
*/
- KEYMAP
+ LAYOUT_ortho_3x10
( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE
, KC_TAB, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LT, KC_GT, KC_QUES,KC_COLN,KC_DQUO
, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDN,KC_END
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | Flash | | | | | |
* '-------------------------------------------------------------------------------'
*/
- KEYMAP
+ LAYOUT_ortho_3x10
( KC_CALC,KC_WSCH,KC_MAIL,KC_MYCM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,KC_NO, KC_NO, RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD
, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
diff --git a/keyboards/tomato/rules.mk b/keyboards/tomato/rules.mk
index 61ea958d7e..cbb2b05196 100644
--- a/keyboards/tomato/rules.mk
+++ b/keyboards/tomato/rules.mk
@@ -54,3 +54,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:/
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes
+
+LAYOUTS = ortho_3x10
diff --git a/keyboards/tomato/tomato.h b/keyboards/tomato/tomato.h
index ebb2303ac8..f8674be40e 100644
--- a/keyboards/tomato/tomato.h
+++ b/keyboards/tomato/tomato.h
@@ -3,7 +3,7 @@
#include "quantum.h"
-#define KEYMAP( \
+#define LAYOUT_ortho_3x10( \
K00, K01, K02, K03, K04, K05, K10, K11, K12, K13 , \
K14, K15, K20, K21, K22, K23, K24, K25, K30, K31 , \
K32, K33, K34, K35, K40, K41, K42, K43, K44, K45 \