From 090b4a81b98d0da1942483b77ef90ac4c5af3c5f Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Wed, 4 Jul 2018 18:04:59 -0700
Subject: [PATCH] The Ruler QMK Configurator Support (#3308)
* Update KEYMAP macro to LAYOUT
* Add QMK Configurator support
---
keyboards/the_ruler/info.json | 12 ++++++++++++
keyboards/the_ruler/keymaps/default/keymap.c | 10 +++++-----
keyboards/the_ruler/the_ruler.h | 2 +-
3 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 keyboards/the_ruler/info.json
diff --git a/keyboards/the_ruler/info.json b/keyboards/the_ruler/info.json
new file mode 100644
index 000000000..98190af48
--- /dev/null
+++ b/keyboards/the_ruler/info.json
@@ -0,0 +1,12 @@
+{
+ "keyboard_name": "The Ruler",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 7,
+ "height": 1,
+ "layouts": {
+ "LAYOUT": {
+ "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, "w":2}]
+ }
+ }
+}
diff --git a/keyboards/the_ruler/keymaps/default/keymap.c b/keyboards/the_ruler/keymaps/default/keymap.c
index 78a785534..e7af797b9 100644
--- a/keyboards/the_ruler/keymaps/default/keymap.c
+++ b/keyboards/the_ruler/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "the_ruler.h"
+#include QMK_KEYBOARD_H
#include "action_layer.h"
#include "eeconfig.h"
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | FN_2 | 2 |TSKMGR |CALTDEL| ESC | FN_1 |
* `-----------------------------------------------'
*/
-[_DEFAULT] = KEYMAP( \
+[_DEFAULT] = LAYOUT( \
MO(_FN_2), KC_2, TSKMGR, CALTDEL, KC_ESC, MO(_FN_1)
),
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |RGB_TOG|RGB_HUD|RGB_HUI|RGB_SAD|RGB_SAI| FN_1 |
* `-----------------------------------------------'
*/
-[_FN_1] = KEYMAP( \
+[_FN_1] = LAYOUT( \
RGB_TOG, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______
),
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | RESET |
* `-----------------------------------------------'
*/
-[_FN_2] = KEYMAP( \
+[_FN_2] = LAYOUT( \
_______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, RESET
)
@@ -67,4 +67,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// NONE
}
return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/the_ruler/the_ruler.h b/keyboards/the_ruler/the_ruler.h
index 6f38034c3..45a327b0d 100644
--- a/keyboards/the_ruler/the_ruler.h
+++ b/keyboards/the_ruler/the_ruler.h
@@ -3,7 +3,7 @@
#include "quantum.h"
-#define KEYMAP( \
+#define LAYOUT( \
K00, K01, K02, K03, K04, K05 ) { \
{ K00, K01, K02, K03, K04, K05 } \
}
--
2.39.5