From 03791ed92a550eca96112721ad8fbcd89d9458a3 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 25 Jun 2021 20:24:42 -0700
Subject: [PATCH] Draytronics Daisy Configurator Refactor (#13325)
* correct layout data
* use LAYOUT as layout macro name
The defined LAYOUT_daisy is functional, but Configurator expects LAYOUT through the info.json file. As the board only supports one layout according to the open-source PCB files, use LAYOUT as the defined macro per QMK guidelines.
* add layout macro alias
---
keyboards/draytronics/daisy/daisy.h | 2 +-
keyboards/draytronics/daisy/info.json | 5 ++++-
keyboards/draytronics/daisy/keymaps/default/keymap.c | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/keyboards/draytronics/daisy/daisy.h b/keyboards/draytronics/daisy/daisy.h
index f6f9b69d87..2c47989433 100644
--- a/keyboards/draytronics/daisy/daisy.h
+++ b/keyboards/draytronics/daisy/daisy.h
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
-#define LAYOUT_daisy( \
+#define LAYOUT( \
K00, K03, \
K10, K11, K12, K13, \
K20, K21, K22, K23 \
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index 4fee494660..ac3b83f81f 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/keyboards/draytronics/daisy/info.json
@@ -4,6 +4,9 @@
"maintainer": "ghostseven",
"width": 4,
"height": 3,
+ "layout_aliases": {
+ "LAYOUT_daisy": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
@@ -18,7 +21,7 @@
{"label":"", "x":0, "y":2},
{"label":"", "x":1, "y":2},
{"label":"", "x":2, "y":2},
- {"label":"", "x":3, "y":1, "h":2}
+ {"label":"", "x":3, "y":2}
]
}
}
diff --git a/keyboards/draytronics/daisy/keymaps/default/keymap.c b/keyboards/draytronics/daisy/keymaps/default/keymap.c
index f713eef49d..74cd02ecd2 100644
--- a/keyboards/draytronics/daisy/keymaps/default/keymap.c
+++ b/keyboards/draytronics/daisy/keymaps/default/keymap.c
@@ -21,12 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _CODE 1 // Code layer
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_daisy(
+ [_BASE] = LAYOUT(
KC_MUTE, KC_HOME,
MO(_CODE), KC_MPRV, KC_MNXT, KC_MPLY,
C(KC_LEFT), C(KC_UP), C(KC_DOWN), C(KC_RIGHT)
),
- [_CODE] = LAYOUT_daisy(
+ [_CODE] = LAYOUT(
KC_MUTE, KC_END,
_______, RGB_MOD, RGB_VAI, RGB_TOG,
G(S(KC_5)), G(A(KC_ESC)), G(KC_F), RESET