diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-14 07:08:25 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-14 07:08:25 +0000 |
| commit | 749d9f2227422f8d70f1e37c913f62ed857fbcaf (patch) | |
| tree | 85251df06eefb0a4982efc5891082751c7c31e4d | |
| parent | a668640a3fbbdec382960600f865c0b5b89e6f5c (diff) | |
| parent | c46619d8fbcbfca33987183441baaa242635e88d (diff) | |
| download | qmk_firmware-749d9f2227422f8d70f1e37c913f62ed857fbcaf.tar.gz qmk_firmware-749d9f2227422f8d70f1e37c913f62ed857fbcaf.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/kbdfans/kbd75/rev1/rev1.h | 17 | ||||
| -rw-r--r-- | keyboards/kbdfans/kbd75/rev2/rev2.h | 19 |
2 files changed, 17 insertions, 19 deletions
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.h b/keyboards/kbdfans/kbd75/rev1/rev1.h index 97474f16b..196d1d8e1 100644 --- a/keyboards/kbdfans/kbd75/rev1/rev1.h +++ b/keyboards/kbdfans/kbd75/rev1/rev1.h | |||
| @@ -83,15 +83,14 @@ | |||
| 83 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313, K315, \ | 83 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313, K315, \ |
| 84 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ | 84 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ |
| 85 | K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \ | 85 | K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \ |
| 86 | ) LAYOUT_iso_1u( \ | 86 | ) { \ |
| 87 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ | 87 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ |
| 88 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ | 88 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ |
| 89 | K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K313, K215, \ | 89 | { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ |
| 90 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K315, \ | 90 | { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \ |
| 91 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ | 91 | { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ |
| 92 | K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \ | 92 | { K500, K501, KC_NO, K503, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514, K515 } \ |
| 93 | ) | 93 | } |
| 94 | |||
| 95 | 94 | ||
| 96 | /* normal bottom row ──────────────────────── ↓ ─── ↓ | 95 | /* normal bottom row ──────────────────────── ↓ ─── ↓ |
| 97 | * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───┐ | 96 | * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───┐ |
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.h b/keyboards/kbdfans/kbd75/rev2/rev2.h index 73baf31d3..77392cbd2 100644 --- a/keyboards/kbdfans/kbd75/rev2/rev2.h +++ b/keyboards/kbdfans/kbd75/rev2/rev2.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘ | 18 | * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘ |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | // LAYOUT for all possible switch positions on a KBD75 rev 1 | 21 | // LAYOUT for all possible switch positions on a KBD75 rev 2 |
| 22 | #define LAYOUT( \ | 22 | #define LAYOUT( \ |
| 23 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ | 23 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ |
| 24 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ | 24 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ |
| @@ -83,15 +83,14 @@ | |||
| 83 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313, K315, \ | 83 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313, K315, \ |
| 84 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ | 84 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ |
| 85 | K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \ | 85 | K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \ |
| 86 | ) LAYOUT_iso_1u( \ | 86 | ) { \ |
| 87 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ | 87 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ |
| 88 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ | 88 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ |
| 89 | K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K313, K215, \ | 89 | { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ |
| 90 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K315, \ | 90 | { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \ |
| 91 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ | 91 | { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ |
| 92 | K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \ | 92 | { K500, K501, KC_NO, K503, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514, K515 } \ |
| 93 | ) | 93 | } |
| 94 | |||
| 95 | 94 | ||
| 96 | /* normal bottom row ──────────────────────── ↓ ─── ↓ | 95 | /* normal bottom row ──────────────────────── ↓ ─── ↓ |
| 97 | * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───┐ | 96 | * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───┐ |