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

This commit is contained in:
QMK Bot 2022-10-22 20:23:08 +00:00
commit 2e2e7511fd
4 changed files with 4 additions and 4 deletions

View File

@ -9,7 +9,7 @@
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_ortho_4x3": {
"layout": [ "layout": [
{"label": "k000", "x": 0, "y": 0}, {"label": "k000", "x": 0, "y": 0},
{"label": "k001", "x": 1, "y": 0}, {"label": "k001", "x": 1, "y": 0},

View File

@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( LAYOUT_ortho_4x3(
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,

View File

@ -17,7 +17,7 @@
#include "polyandry.h" #include "polyandry.h"
#define LAYOUT( \ #define LAYOUT_ortho_4x3( \
K000, K001, K002, \ K000, K001, K002, \
K003, K004, K005, \ K003, K004, K005, \
K006, K007, K008, \ K006, K007, K008, \

View File

@ -22,7 +22,7 @@
#include "polyandry.h" #include "polyandry.h"
#define LAYOUT( \ #define LAYOUT_ortho_4x3( \
K000, K001, K002, \ K000, K001, K002, \
K003, K004, K005, \ K003, K004, K005, \
K006, K007, K008, \ K006, K007, K008, \