diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-29 00:18:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 17:18:53 -0700 |
| commit | 55f699c09edb12b4fc0d1f17621753e185517837 (patch) | |
| tree | 6c48a04b295820618efb8672827e49703cceabe2 | |
| parent | 00555a2f02dc20d6aded73247c876f44bd9a1d02 (diff) | |
| download | qmk_firmware-55f699c09edb12b4fc0d1f17621753e185517837.tar.gz qmk_firmware-55f699c09edb12b4fc0d1f17621753e185517837.zip | |
Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)
* Fix for #14622
Fix for a bad merge conflict resolution.
| -rw-r--r-- | keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h index a337d653e..45d48fac4 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \ | 46 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \ |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | #define LAYOUT_alice_split_bs( \ | 49 | #define LAYOUT_alice_split_bs_full_rshift( \ |
| 50 | K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ | 50 | K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ |
| 51 | K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ | 51 | K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ |
| 52 | K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ | 52 | K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ |
| @@ -60,7 +60,7 @@ | |||
| 60 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \ | 60 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \ |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | #define LAYOUT_alice( \ | 63 | #define LAYOUT_alice_full_rshift( \ |
| 64 | K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ | 64 | K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ |
| 65 | K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ | 65 | K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ |
| 66 | K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ | 66 | K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ |