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

author: QMK Bot <hello@qmk.fm> 2022-10-22 20:23:08 +0000
committer: QMK Bot <hello@qmk.fm> 2022-10-22 20:23:08 +0000
commit: 2e2e7511fdcafd42659d77eeeff4da88301f73ee (patch)
tree: 63c7929ae3646ad2c7cd8c7756da64454b385f9c
parent: 71480001ea7b28f5449f8af1bea082e23c07fd32 (diff)
parent: cdb04900cd1c84bb2ef983a8eca0667fba4ce5c0 (diff)
4 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index 3572b38c23..f5f33e3d97 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -9,7 +9,7 @@
        "device_version": "0.0.1"
    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x3": {
            "layout": [
                {"label": "k000", "x": 0, "y": 0},
                {"label": "k001", "x": 1, "y": 0},
diff --git a/keyboards/40percentclub/polyandry/keymaps/default/keymap.c b/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
index 3e1f278b35..572899903d 100644
--- a/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        LAYOUT(
+        LAYOUT_ortho_4x3(
                KC_1, KC_2, KC_3, 
                KC_4, KC_5, KC_6, 
                KC_7, KC_8, KC_9, 
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h
index 65e2b4b9c2..0a6f8b36b8 100644
--- a/keyboards/40percentclub/polyandry/promicro/promicro.h
+++ b/keyboards/40percentclub/polyandry/promicro/promicro.h
@@ -17,7 +17,7 @@
 #include "polyandry.h"
-#define LAYOUT( \
+#define LAYOUT_ortho_4x3( \
        K000, K001, K002, \
        K003, K004, K005, \
        K006, K007, K008, \
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
index 118eb353a4..ce7790434b 100644
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
@@ -22,7 +22,7 @@
 #include "polyandry.h"
-#define LAYOUT( \
+#define LAYOUT_ortho_4x3( \
        K000, K001, K002, \
        K003, K004, K005, \
        K006, K007, K008, \
author	QMK Bot <hello@qmk.fm>	2022-10-22 20:23:08 +0000
committer	QMK Bot <hello@qmk.fm>	2022-10-22 20:23:08 +0000
commit	2e2e7511fdcafd42659d77eeeff4da88301f73ee (patch)
tree	63c7929ae3646ad2c7cd8c7756da64454b385f9c
parent	71480001ea7b28f5449f8af1bea082e23c07fd32 (diff)
parent	cdb04900cd1c84bb2ef983a8eca0667fba4ce5c0 (diff)

diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json index 3572b38c23..f5f33e3d97 100644 --- a/keyboards/40percentclub/polyandry/info.json +++ b/keyboards/40percentclub/polyandry/info.json
@@ -9,7 +9,7 @@
9	"device_version": "0.0.1"	9	"device_version": "0.0.1"
10	},	10	},
11	"layouts": {	11	"layouts": {
12	"LAYOUT": {	12	"LAYOUT_ortho_4x3": {
13	"layout": [	13	"layout": [
14	{"label": "k000", "x": 0, "y": 0},	14	{"label": "k000", "x": 0, "y": 0},
15	{"label": "k001", "x": 1, "y": 0},	15	{"label": "k001", "x": 1, "y": 0},


diff --git a/keyboards/40percentclub/polyandry/keymaps/default/keymap.c b/keyboards/40percentclub/polyandry/keymaps/default/keymap.c index 3e1f278b35..572899903d 100644 --- a/keyboards/40percentclub/polyandry/keymaps/default/keymap.c +++ b/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
17		17
18	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	18	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19		19
20	LAYOUT(	20	LAYOUT_ortho_4x3(
21	KC_1, KC_2, KC_3,	21	KC_1, KC_2, KC_3,
22	KC_4, KC_5, KC_6,	22	KC_4, KC_5, KC_6,
23	KC_7, KC_8, KC_9,	23	KC_7, KC_8, KC_9,


diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h index 65e2b4b9c2..0a6f8b36b8 100644 --- a/keyboards/40percentclub/polyandry/promicro/promicro.h +++ b/keyboards/40percentclub/polyandry/promicro/promicro.h
@@ -17,7 +17,7 @@
17		17
18	#include "polyandry.h"	18	#include "polyandry.h"
19		19
20	#define LAYOUT( \	20	#define LAYOUT_ortho_4x3( \
21	K000, K001, K002, \	21	K000, K001, K002, \
22	K003, K004, K005, \	22	K003, K004, K005, \
23	K006, K007, K008, \	23	K006, K007, K008, \


diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h index 118eb353a4..ce7790434b 100644 --- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h +++ b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
@@ -22,7 +22,7 @@
22		22
23	#include "polyandry.h"	23	#include "polyandry.h"
24		24
25	#define LAYOUT( \	25	#define LAYOUT_ortho_4x3( \
26	K000, K001, K002, \	26	K000, K001, K002, \
27	K003, K004, K005, \	27	K003, K004, K005, \
28	K006, K007, K008, \	28	K006, K007, K008, \