summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-04 23:00:06 +0000
committerQMK Bot <hello@qmk.fm>2021-03-04 23:00:06 +0000
commit474cffbc0fed7600aa6c24c65960de44da4b43e5 (patch)
tree974b64b6aac97b2a059b5a7f2bdda7684a5864c7 /keyboards
parent4fcc709f4eb8112525ae0d63641a51e2b452cfe4 (diff)
parente25f05224f1c06aeed13b2e99e8e755af65ac689 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/cannonkeys/ortho48/ortho48.h4
-rw-r--r--keyboards/cannonkeys/ortho60/ortho60.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/cannonkeys/ortho48/ortho48.h b/keyboards/cannonkeys/ortho48/ortho48.h
index 1e51c37af7..b0197c3cf7 100644
--- a/keyboards/cannonkeys/ortho48/ortho48.h
+++ b/keyboards/cannonkeys/ortho48/ortho48.h
@@ -6,13 +6,13 @@
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35 , k37, k38, k39, k3a, k3b \
+ k30, k31, k32, k33, k34, k36 , k37, k38, k39, k3a, k3b \
) \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \
+ { k30, k31, k32, k33, k34, KC_NO, k36, k37, k38, k39, k3a, k3b } \
}
#define LAYOUT_ortho_4x12( \
diff --git a/keyboards/cannonkeys/ortho60/ortho60.h b/keyboards/cannonkeys/ortho60/ortho60.h
index 0f3ae127aa..2dcc00ddb9 100644
--- a/keyboards/cannonkeys/ortho60/ortho60.h
+++ b/keyboards/cannonkeys/ortho60/ortho60.h
@@ -7,14 +7,14 @@
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45 , k47, k48, k49, k4a, k4b \
+ k40, k41, k42, k43, k44, k46 , k47, k48, k49, k4a, k4b \
) \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
+ { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48, k49, k4a, k4b }, \
}
#define LAYOUT_ortho_5x12( \