diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-07-27 10:11:52 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-07-27 10:11:52 +1000 |
| commit | 394272a2663692081ce6f5b74f6f761090111ad0 (patch) | |
| tree | 7971135837ced00c1628d26c3cf3d3156a1403ca /keyboards/cannonkeys | |
| parent | e0375c0b710c075780e7ffe1afe4c39fccd96929 (diff) | |
| parent | b1c5a53a68ca8a304e7739467f2793c223853f68 (diff) | |
| download | qmk_firmware-394272a2663692081ce6f5b74f6f761090111ad0.tar.gz qmk_firmware-394272a2663692081ce6f5b74f6f761090111ad0.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/cannonkeys')
| -rw-r--r-- | keyboards/cannonkeys/ortho48/ortho48.h | 4 | ||||
| -rw-r--r-- | keyboards/cannonkeys/ortho60/ortho60.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/cannonkeys/ortho48/ortho48.h b/keyboards/cannonkeys/ortho48/ortho48.h index b0197c3cf7..1e51c37af7 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, k36 , k37, k38, k39, k3a, k3b \ + k30, k31, k32, k33, k34, k35 , 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, KC_NO, k36, k37, k38, k39, k3a, k3b } \ + { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \ } #define LAYOUT_ortho_4x12( \ diff --git a/keyboards/cannonkeys/ortho60/ortho60.h b/keyboards/cannonkeys/ortho60/ortho60.h index 2dcc00ddb9..0f3ae127aa 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, k46 , k47, k48, k49, k4a, k4b \ + k40, k41, k42, k43, k44, k45 , 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, KC_NO, k46, k47, k48, k49, k4a, k4b }, \ + { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b }, \ } #define LAYOUT_ortho_5x12( \ |