Skip to content

Commit

Permalink
Draytronics Daisy Configurator Refactor (qmk#13325)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
noroadsleft authored and jakeprime committed Jul 10, 2021
1 parent e7c8b57 commit 9313f99
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion keyboards/draytronics/daisy/daisy.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 4 additions & 1 deletion keyboards/draytronics/daisy/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"maintainer": "ghostseven",
"width": 4,
"height": 3,
"layout_aliases": {
"LAYOUT_daisy": "LAYOUT"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand All @@ -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}
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/draytronics/daisy/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9313f99

Please sign in to comment.