aboutsummaryrefslogtreecommitdiff
path: root/keyboards/the_ruler
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-07-04 18:04:59 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-04 18:04:59 -0700
commit090b4a81b98d0da1942483b77ef90ac4c5af3c5f (patch)
tree1a2c553a1e6cc640cbc7ddd0d37e42a588aa75f7 /keyboards/the_ruler
parent7eeb8932a17443fb6e94a6aeeaed895790b561d2 (diff)
downloadqmk_firmware-090b4a81b98d0da1942483b77ef90ac4c5af3c5f.tar.gz
qmk_firmware-090b4a81b98d0da1942483b77ef90ac4c5af3c5f.zip
The Ruler QMK Configurator Support (#3308)
* Update KEYMAP macro to LAYOUT * Add QMK Configurator support
Diffstat (limited to 'keyboards/the_ruler')
-rw-r--r--keyboards/the_ruler/info.json12
-rw-r--r--keyboards/the_ruler/keymaps/default/keymap.c10
-rw-r--r--keyboards/the_ruler/the_ruler.h2
3 files changed, 18 insertions, 6 deletions
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 @@
1{
2 "keyboard_name": "The Ruler",
3 "url": "",
4 "maintainer": "qmk",
5 "width": 7,
6 "height": 1,
7 "layouts": {
8 "LAYOUT": {
9 "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}]
10 }
11 }
12}
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 @@
1#include "the_ruler.h" 1#include QMK_KEYBOARD_H
2#include "action_layer.h" 2#include "action_layer.h"
3#include "eeconfig.h" 3#include "eeconfig.h"
4 4
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 * | FN_2 | 2 |TSKMGR |CALTDEL| ESC | FN_1 | 33 * | FN_2 | 2 |TSKMGR |CALTDEL| ESC | FN_1 |
34 * `-----------------------------------------------' 34 * `-----------------------------------------------'
35 */ 35 */
36[_DEFAULT] = KEYMAP( \ 36[_DEFAULT] = LAYOUT( \
37 MO(_FN_2), KC_2, TSKMGR, CALTDEL, KC_ESC, MO(_FN_1) 37 MO(_FN_2), KC_2, TSKMGR, CALTDEL, KC_ESC, MO(_FN_1)
38), 38),
39 39
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
42 * |RGB_TOG|RGB_HUD|RGB_HUI|RGB_SAD|RGB_SAI| FN_1 | 42 * |RGB_TOG|RGB_HUD|RGB_HUI|RGB_SAD|RGB_SAI| FN_1 |
43 * `-----------------------------------------------' 43 * `-----------------------------------------------'
44 */ 44 */
45[_FN_1] = KEYMAP( \ 45[_FN_1] = LAYOUT( \
46 RGB_TOG, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______ 46 RGB_TOG, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______
47), 47),
48 48
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51 * | FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | RESET | 51 * | FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | RESET |
52 * `-----------------------------------------------' 52 * `-----------------------------------------------'
53 */ 53 */
54[_FN_2] = KEYMAP( \ 54[_FN_2] = LAYOUT( \
55 _______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, RESET 55 _______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, RESET
56) 56)
57 57
@@ -67,4 +67,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
67 // NONE 67 // NONE
68 } 68 }
69 return true; 69 return true;
70} \ No newline at end of file 70}
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 @@
3 3
4#include "quantum.h" 4#include "quantum.h"
5 5
6#define KEYMAP( \ 6#define LAYOUT( \
7 K00, K01, K02, K03, K04, K05 ) { \ 7 K00, K01, K02, K03, K04, K05 ) { \
8 { K00, K01, K02, K03, K04, K05 } \ 8 { K00, K01, K02, K03, K04, K05 } \
9} 9}