Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
QMK Bot 2021-06-26 03:25:18 +00:00
commit 5adb288bb3
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/draytronics/daisy/daisy.h
View file

@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h" #include "quantum.h"
#define LAYOUT_daisy( \ #define LAYOUT( \
K00, K03, \ K00, K03, \
K10, K11, K12, K13, \ K10, K11, K12, K13, \
K20, K21, K22, K23 \ K20, K21, K22, K23 \

5
keyboards/draytronics/daisy/info.json
View file

@ -4,6 +4,9 @@
"maintainer": "ghostseven", "maintainer": "ghostseven",
"width": 4, "width": 4,
"height": 3, "height": 3,
"layout_aliases": {
"LAYOUT_daisy": "LAYOUT"
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
@ -18,7 +21,7 @@
{"label":"", "x":0, "y":2}, {"label":"", "x":0, "y":2},
{"label":"", "x":1, "y":2}, {"label":"", "x":1, "y":2},
{"label":"", "x":2, "y":2}, {"label":"", "x":2, "y":2},
{"label":"", "x":3, "y":1, "h":2} {"label":"", "x":3, "y":2}
] ]
} }
} }

4
keyboards/draytronics/daisy/keymaps/default/keymap.c
View file

@ -21,12 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _CODE 1 // Code layer #define _CODE 1 // Code layer
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_daisy( [_BASE] = LAYOUT(
KC_MUTE, KC_HOME, KC_MUTE, KC_HOME,
MO(_CODE), KC_MPRV, KC_MNXT, KC_MPLY, MO(_CODE), KC_MPRV, KC_MNXT, KC_MPLY,
C(KC_LEFT), C(KC_UP), C(KC_DOWN), C(KC_RIGHT) C(KC_LEFT), C(KC_UP), C(KC_DOWN), C(KC_RIGHT)
), ),
[_CODE] = LAYOUT_daisy( [_CODE] = LAYOUT(
KC_MUTE, KC_END, KC_MUTE, KC_END,
_______, RGB_MOD, RGB_VAI, RGB_TOG, _______, RGB_MOD, RGB_VAI, RGB_TOG,
G(S(KC_5)), G(A(KC_ESC)), G(KC_F), RESET G(S(KC_5)), G(A(KC_ESC)), G(KC_F), RESET