summaryrefslogtreecommitdiff
path: root/keyboards/kbdfans/kbd75
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2021-01-14 02:07:47 -0500
committerGitHub <noreply@github.com>2021-01-13 23:07:47 -0800
commitc46619d8fbcbfca33987183441baaa242635e88d (patch)
tree513dae2da4c1655d7d7a17c9945806f15f712fcf /keyboards/kbdfans/kbd75
parentb323ab89e0092034e6a11e519ff566479df888b9 (diff)
[Keyboard] eliminate nested layout warnings in kbd75 (#11540)
Diffstat (limited to 'keyboards/kbdfans/kbd75')
-rw-r--r--keyboards/kbdfans/kbd75/rev1/rev1.h17
-rw-r--r--keyboards/kbdfans/kbd75/rev2/rev2.h19
2 files changed, 17 insertions, 19 deletions
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.h b/keyboards/kbdfans/kbd75/rev1/rev1.h
index 97474f16b1..196d1d8e14 100644
--- a/keyboards/kbdfans/kbd75/rev1/rev1.h
+++ b/keyboards/kbdfans/kbd75/rev1/rev1.h
@@ -83,15 +83,14 @@
K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313, K315, \
K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \
K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \
-) LAYOUT_iso_1u( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K313, K215, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \
- K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \
-)
-
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \
+ { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
+ { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
+ { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \
+ { K500, K501, KC_NO, K503, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514, K515 } \
+}
/* normal bottom row ──────────────────────── ↓ ─── ↓
* ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───┐
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.h b/keyboards/kbdfans/kbd75/rev2/rev2.h
index 73baf31d37..77392cbd24 100644
--- a/keyboards/kbdfans/kbd75/rev2/rev2.h
+++ b/keyboards/kbdfans/kbd75/rev2/rev2.h
@@ -18,7 +18,7 @@
* └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
*/
-// LAYOUT for all possible switch positions on a KBD75 rev 1
+// LAYOUT for all possible switch positions on a KBD75 rev 2
#define LAYOUT( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
@@ -83,15 +83,14 @@
K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313, K315, \
K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \
K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \
-) LAYOUT_iso_1u( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K313, K215, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \
- K500, K501, K503, K506, K510, K511, K512, K513, K514, K515 \
-)
-
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \
+ { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
+ { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
+ { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \
+ { K500, K501, KC_NO, K503, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514, K515 } \
+}
/* normal bottom row ──────────────────────── ↓ ─── ↓
* ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───┐