Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2021-08-16 10:18:27 +00:00
commit 4818debcd0
3 changed files with 32 additions and 5 deletions

View File

@ -6,7 +6,21 @@
"height": 4,
"layouts": {
"LAYOUT": {
"layout": [{"label":"esc", "x":5.25, "y":0}, {"label":"enter", "x":6.25, "y":0}, {"label":"slow", "x":0, "y":1}, {"label":"fire", "x":1, "y":1}, {"label":"rapid", "x":2, "y":1}, {"label":"up", "x":6.25, "y":1.75}, {"label":"left", "x":5.25, "y":2.75}, {"label":"down", "x":6.25, "y":2.75}, {"label":"right", "x":7.25, "y":2.75}, {"label":"bomb", "x":3.25, "y":3}]
"layout": [
{"label":"esc", "x":5.25, "y":0},
{"label":"enter", "x":6.25, "y":0},
{"label":"slow", "x":0, "y":1},
{"label":"fire", "x":1, "y":1},
{"label":"rapid", "x":2, "y":1},
{"label":"up", "x":6.25, "y":1.75},
{"label":"left", "x":5.25, "y":2.75},
{"label":"down", "x":6.25, "y":2.75},
{"label":"right", "x":7.25, "y":2.75},
{"label":"bomb", "x":3.25, "y":3}
]
}
}
}

View File

@ -17,9 +17,17 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( /* Base */
KC_LSFT, KC_Z, KC_C, KC_X, KC_LEFT, KC_DOWN, KC_RIGHT, KC_UP, KC_ENT, LT(1, KC_ESC)
LT(1,KC_ESC), KC_ENT,
KC_LSFT, KC_Z, KC_C,
KC_UP,
KC_LEFT, KC_DOWN, KC_RGHT,
KC_X
),
LAYOUT( /* RGB controls */
KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_VAD, RGB_MOD, RGB_VAI, KC_NO, KC_NO
KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO,
RGB_VAI,
RGB_TOG, RGB_VAD, RGB_MOD,
KC_NO
)
};

View File

@ -17,7 +17,12 @@
#include "quantum.h"
#define LAYOUT(k00, k01, k02, k03, k04, k05, k06, k07, k08, k09) \
{ \
#define LAYOUT( \
k09, k08, \
k00, k01, k02, \
k07, \
k04, k05, k06, \
k03 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
}