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

author: QMK Bot <hello@qmk.fm> 2021-11-03 01:01:03 +0000
committer: QMK Bot <hello@qmk.fm> 2021-11-03 01:01:03 +0000
commit: 8eac8c45d545096d9cb8c38963a43d0d8e634b9b (patch)
tree: 720323bd9ec47fb836a653f103a2abddd3de2c5d
parent: b05f0bb23145f40b42876276b0824895dda960bf (diff)
parent: 6d807af783db91bc0a20bc12736c9c7fb1ba22ed (diff)
download: qmk_firmware-8eac8c45d545096d9cb8c38963a43d0d8e634b9b.tar.gz
qmk_firmware-8eac8c45d545096d9cb8c38963a43d0d8e634b9b.zip
4 files changed, 28 insertions, 25 deletions
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index 4d9c99bc6..1ff728bfb 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -2,6 +2,9 @@
    "keyboard_name": "Rocketboard-16",
    "url": "",
    "maintainer": "fl3tching101",
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/rocketboard_16/keymaps/default/keymap.c b/keyboards/rocketboard_16/keymaps/default/keymap.c
index 4ce537737..6d75d40fb 100644
--- a/keyboards/rocketboard_16/keymaps/default/keymap.c
+++ b/keyboards/rocketboard_16/keymaps/default/keymap.c
@@ -33,19 +33,19 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_default(
+    [_BASE] = LAYOUT(
-        RGB_MODE_FORWARD,                KC_NUMLOCK,
+        RGB_MOD,                   KC_NLCK,
-        KC_KP_7, KC_KP_8, KC_KP_9,       KC_DELETE,
+        KC_P7,   KC_P8,   KC_P9,   KC_DEL,
-        KC_KP_4, KC_KP_5, KC_KP_6,       KC_END,
+        KC_P4,   KC_P5,   KC_P6,   KC_END,
-        KC_KP_1, KC_KP_2, KC_KP_3,       KC_F13,
+        KC_P1,   KC_P2,   KC_P3,   KC_F13,
-        KC_KP_0, MO(1),   KC_KP_DOT,     KC_KP_ENTER
+        KC_P0,   MO(1),   KC_PDOT, KC_PENT
    ),
-    [_SPEC] = LAYOUT_default(
+    [_SPEC] = LAYOUT(
-        RGB_MODE_REVERSE,               KC_AUDIO_MUTE,
+        RGB_RMOD,                   KC_MUTE,
-        KC_NO,   KC_NO,   KC_NO,         KC_EXAM,
+        KC_NO,    KC_NO,   KC_NO,   KC_EXAM,
-        KC_NO,   KC_NO,   KC_NO,         KC_NO,
+        KC_NO,    KC_NO,   KC_NO,   KC_NO,
-        RESET,   RGB_TOG, RGB_SPI,       RGB_SPD,
+        RESET,    RGB_TOG, RGB_SPI, RGB_SPD,
-        KC_NO,   _______, KC_NO,         KC_NO
+        KC_NO,    _______, KC_NO,   KC_NO
    )
 };
diff --git a/keyboards/rocketboard_16/keymaps/via/keymap.c b/keyboards/rocketboard_16/keymaps/via/keymap.c
index 4ce537737..6d75d40fb 100644
--- a/keyboards/rocketboard_16/keymaps/via/keymap.c
+++ b/keyboards/rocketboard_16/keymaps/via/keymap.c
@@ -33,19 +33,19 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_default(
+    [_BASE] = LAYOUT(
-        RGB_MODE_FORWARD,                KC_NUMLOCK,
+        RGB_MOD,                   KC_NLCK,
-        KC_KP_7, KC_KP_8, KC_KP_9,       KC_DELETE,
+        KC_P7,   KC_P8,   KC_P9,   KC_DEL,
-        KC_KP_4, KC_KP_5, KC_KP_6,       KC_END,
+        KC_P4,   KC_P5,   KC_P6,   KC_END,
-        KC_KP_1, KC_KP_2, KC_KP_3,       KC_F13,
+        KC_P1,   KC_P2,   KC_P3,   KC_F13,
-        KC_KP_0, MO(1),   KC_KP_DOT,     KC_KP_ENTER
+        KC_P0,   MO(1),   KC_PDOT, KC_PENT
    ),
-    [_SPEC] = LAYOUT_default(
+    [_SPEC] = LAYOUT(
-        RGB_MODE_REVERSE,               KC_AUDIO_MUTE,
+        RGB_RMOD,                   KC_MUTE,
-        KC_NO,   KC_NO,   KC_NO,         KC_EXAM,
+        KC_NO,    KC_NO,   KC_NO,   KC_EXAM,
-        KC_NO,   KC_NO,   KC_NO,         KC_NO,
+        KC_NO,    KC_NO,   KC_NO,   KC_NO,
-        RESET,   RGB_TOG, RGB_SPI,       RGB_SPD,
+        RESET,    RGB_TOG, RGB_SPI, RGB_SPD,
-        KC_NO,   _______, KC_NO,         KC_NO
+        KC_NO,    _______, KC_NO,   KC_NO
    )
 };
diff --git a/keyboards/rocketboard_16/rocketboard_16.h b/keyboards/rocketboard_16/rocketboard_16.h
index 87965906a..927e21f7e 100644
--- a/keyboards/rocketboard_16/rocketboard_16.h
+++ b/keyboards/rocketboard_16/rocketboard_16.h
@@ -4,7 +4,7 @@
 #define KNO KC_NO
-#define LAYOUT_default( \
+#define LAYOUT( \
  K00,           K01, \
  K02, K03, K04, K05, \
  K06, K07, K08, K09, \
author	QMK Bot <hello@qmk.fm>	2021-11-03 01:01:03 +0000
committer	QMK Bot <hello@qmk.fm>	2021-11-03 01:01:03 +0000
commit	8eac8c45d545096d9cb8c38963a43d0d8e634b9b (patch)
tree	720323bd9ec47fb836a653f103a2abddd3de2c5d
parent	b05f0bb23145f40b42876276b0824895dda960bf (diff)
parent	6d807af783db91bc0a20bc12736c9c7fb1ba22ed (diff)
download	qmk_firmware-8eac8c45d545096d9cb8c38963a43d0d8e634b9b.tar.gz qmk_firmware-8eac8c45d545096d9cb8c38963a43d0d8e634b9b.zip

diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json index 4d9c99bc6..1ff728bfb 100644 --- a/keyboards/rocketboard_16/info.json +++ b/keyboards/rocketboard_16/info.json
@@ -2,6 +2,9 @@
2	"keyboard_name": "Rocketboard-16",	2	"keyboard_name": "Rocketboard-16",
3	"url": "",	3	"url": "",
4	"maintainer": "fl3tching101",	4	"maintainer": "fl3tching101",
		5	"layout_aliases": {
		6	"LAYOUT_default": "LAYOUT"
		7	},
5	"layouts": {	8	"layouts": {
6	"LAYOUT": {	9	"LAYOUT": {
7	"layout": [	10	"layout": [


diff --git a/keyboards/rocketboard_16/keymaps/default/keymap.c b/keyboards/rocketboard_16/keymaps/default/keymap.c index 4ce537737..6d75d40fb 100644 --- a/keyboards/rocketboard_16/keymaps/default/keymap.c +++ b/keyboards/rocketboard_16/keymaps/default/keymap.c
@@ -33,19 +33,19 @@ enum custom_keycodes {
33		33
34		34
35	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	35	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36	[_BASE] = LAYOUT_default(	36	[_BASE] = LAYOUT(
37	RGB_MODE_FORWARD, KC_NUMLOCK,	37	RGB_MOD, KC_NLCK,
38	KC_KP_7, KC_KP_8, KC_KP_9, KC_DELETE,	38	KC_P7, KC_P8, KC_P9, KC_DEL,
39	KC_KP_4, KC_KP_5, KC_KP_6, KC_END,	39	KC_P4, KC_P5, KC_P6, KC_END,
40	KC_KP_1, KC_KP_2, KC_KP_3, KC_F13,	40	KC_P1, KC_P2, KC_P3, KC_F13,
41	KC_KP_0, MO(1), KC_KP_DOT, KC_KP_ENTER	41	KC_P0, MO(1), KC_PDOT, KC_PENT
42	),	42	),
43	[_SPEC] = LAYOUT_default(	43	[_SPEC] = LAYOUT(
44	RGB_MODE_REVERSE, KC_AUDIO_MUTE,	44	RGB_RMOD, KC_MUTE,
45	KC_NO, KC_NO, KC_NO, KC_EXAM,	45	KC_NO, KC_NO, KC_NO, KC_EXAM,
46	KC_NO, KC_NO, KC_NO, KC_NO,	46	KC_NO, KC_NO, KC_NO, KC_NO,
47	RESET, RGB_TOG, RGB_SPI, RGB_SPD,	47	RESET, RGB_TOG, RGB_SPI, RGB_SPD,
48	KC_NO, _______, KC_NO, KC_NO	48	KC_NO, _______, KC_NO, KC_NO
49	)	49	)
50	};	50	};
51		51


diff --git a/keyboards/rocketboard_16/keymaps/via/keymap.c b/keyboards/rocketboard_16/keymaps/via/keymap.c index 4ce537737..6d75d40fb 100644 --- a/keyboards/rocketboard_16/keymaps/via/keymap.c +++ b/keyboards/rocketboard_16/keymaps/via/keymap.c
@@ -33,19 +33,19 @@ enum custom_keycodes {
33		33
34		34
35	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	35	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36	[_BASE] = LAYOUT_default(	36	[_BASE] = LAYOUT(
37	RGB_MODE_FORWARD, KC_NUMLOCK,	37	RGB_MOD, KC_NLCK,
38	KC_KP_7, KC_KP_8, KC_KP_9, KC_DELETE,	38	KC_P7, KC_P8, KC_P9, KC_DEL,
39	KC_KP_4, KC_KP_5, KC_KP_6, KC_END,	39	KC_P4, KC_P5, KC_P6, KC_END,
40	KC_KP_1, KC_KP_2, KC_KP_3, KC_F13,	40	KC_P1, KC_P2, KC_P3, KC_F13,
41	KC_KP_0, MO(1), KC_KP_DOT, KC_KP_ENTER	41	KC_P0, MO(1), KC_PDOT, KC_PENT
42	),	42	),
43	[_SPEC] = LAYOUT_default(	43	[_SPEC] = LAYOUT(
44	RGB_MODE_REVERSE, KC_AUDIO_MUTE,	44	RGB_RMOD, KC_MUTE,
45	KC_NO, KC_NO, KC_NO, KC_EXAM,	45	KC_NO, KC_NO, KC_NO, KC_EXAM,
46	KC_NO, KC_NO, KC_NO, KC_NO,	46	KC_NO, KC_NO, KC_NO, KC_NO,
47	RESET, RGB_TOG, RGB_SPI, RGB_SPD,	47	RESET, RGB_TOG, RGB_SPI, RGB_SPD,
48	KC_NO, _______, KC_NO, KC_NO	48	KC_NO, _______, KC_NO, KC_NO
49	)	49	)
50	};	50	};
51		51


diff --git a/keyboards/rocketboard_16/rocketboard_16.h b/keyboards/rocketboard_16/rocketboard_16.h index 87965906a..927e21f7e 100644 --- a/keyboards/rocketboard_16/rocketboard_16.h +++ b/keyboards/rocketboard_16/rocketboard_16.h
@@ -4,7 +4,7 @@
4		4
5	#define KNO KC_NO	5	#define KNO KC_NO
6		6
7	#define LAYOUT_default( \	7	#define LAYOUT( \
8	K00, K01, \	8	K00, K01, \
9	K02, K03, K04, K05, \	9	K02, K03, K04, K05, \
10	K06, K07, K08, K09, \	10	K06, K07, K08, K09, \