summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-30 15:12:13 +0000
committerQMK Bot <hello@qmk.fm>2021-07-30 15:12:13 +0000
commitdfb370402ee2e84ea4d123f89a55456c0fb8d79f (patch)
treed4a739df05032a0d6dac84c22597723448b07ba3 /keyboards
parentf87c72ef8f7854eb6a35c6ef75306289156bbbb4 (diff)
parent6823e03b0143ed839e594cd5e8d06872ba907a42 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ocean/sus/info.json2
-rw-r--r--keyboards/ocean/sus/keymaps/default/keymap.c8
-rw-r--r--keyboards/ocean/sus/keymaps/via/keymap.c8
-rw-r--r--keyboards/ocean/sus/sus.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json
index 9bfad4239f..8cf2299d9e 100644
--- a/keyboards/ocean/sus/info.json
+++ b/keyboards/ocean/sus/info.json
@@ -5,7 +5,7 @@
"width": 3,
"height": 4,
"layouts": {
- "LAYOUT_ortho_3x4": {
+ "LAYOUT_ortho_4x3": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
diff --git a/keyboards/ocean/sus/keymaps/default/keymap.c b/keyboards/ocean/sus/keymaps/default/keymap.c
index 166e84018e..9b18b6af26 100644
--- a/keyboards/ocean/sus/keymaps/default/keymap.c
+++ b/keyboards/ocean/sus/keymaps/default/keymap.c
@@ -15,28 +15,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_ortho_3x4(
+ [0] = LAYOUT_ortho_4x3(
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3,
KC_PENT, KC_P0, MO(1)
),
- [1] = LAYOUT_ortho_3x4(
+ [1] = LAYOUT_ortho_4x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
- [2] = LAYOUT_ortho_3x4(
+ [2] = LAYOUT_ortho_4x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
- [3] = LAYOUT_ortho_3x4(
+ [3] = LAYOUT_ortho_4x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ocean/sus/keymaps/via/keymap.c b/keyboards/ocean/sus/keymaps/via/keymap.c
index 166e84018e..9b18b6af26 100644
--- a/keyboards/ocean/sus/keymaps/via/keymap.c
+++ b/keyboards/ocean/sus/keymaps/via/keymap.c
@@ -15,28 +15,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_ortho_3x4(
+ [0] = LAYOUT_ortho_4x3(
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3,
KC_PENT, KC_P0, MO(1)
),
- [1] = LAYOUT_ortho_3x4(
+ [1] = LAYOUT_ortho_4x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
- [2] = LAYOUT_ortho_3x4(
+ [2] = LAYOUT_ortho_4x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
- [3] = LAYOUT_ortho_3x4(
+ [3] = LAYOUT_ortho_4x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ocean/sus/sus.h b/keyboards/ocean/sus/sus.h
index 394b003388..cba5f3cbc8 100644
--- a/keyboards/ocean/sus/sus.h
+++ b/keyboards/ocean/sus/sus.h
@@ -17,7 +17,7 @@
#include "quantum.h"
-#define LAYOUT_ortho_3x4(\
+#define LAYOUT_ortho_4x3(\
K00, K01, K02, \
K10, K11, K12, \
K20, K21, K22, \