More QMK Configurator Warning/Error Fixes (#2720)

* Add readme with brief description
Change KEYMAP to LAYOUT

* Add readme.md with brief description
Use LAYOUT macro

* add a readme.md file

* Add readme.md with brief description
Use LAYOUT macro

* Add readme.md with brief description
Use LAYOUT macro

* Fix "Warning: contra: Missing layout pp macro for ['planck_mit', 'planck_grid']",

* Use LAYOUT macro

diff --git a/keyboards/contra/contra.h b/keyboards/contra/contra.h
index 873429b53a003bc29da0de86f210841059a143f5..a27d1ca2516492f6d4b84676a67d7173bdd2bb81 100755 (executable)
--- a/keyboards/contra/contra.h
+++ b/keyboards/contra/contra.h
@@ -27,7 +27,7 @@
   { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \
 }
 
-#define KC_LAYOUT_grid( \
+#define LAYOUT_kc_grid( \
   K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
   K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
   K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
@@ -39,8 +39,8 @@
     KC_##K200,  KC_##K201,  KC_##K202,  KC_##K203,  KC_##K204,  KC_##K205,  KC_##K206,  KC_##K207,  KC_##K208,  KC_##K209,  KC_##K210,  KC_##K211, \
     KC_##K300,  KC_##K301,  KC_##K302,  KC_##K303,  KC_##K304,  KC_##K305,  KC_##K306,  KC_##K307,  KC_##K308,  KC_##K309,  KC_##K310,  KC_##K311 \
     )
-#define KEYMAP LAYOUT_grid
+#define LAYOUT LAYOUT_grid
 #define LAYOUT_ortho_4x12 LAYOUT_grid
-#define KC_LAYOUT_ortho_4x12 KC_LAYOUT_grid
+#define LAYOUT_kc_ortho_4x12 LAYOUT_kc_grid
 
 #endif

diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index 1979098235270fb21de9f55c3bdc253008738037..dc865bf64a1c7e1051e35b86a918209ba0bbc1cd 100644 (file)
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -19,7 +19,7 @@
 
 #ifndef FLIP_HALF
 
-#define KEYMAP( \
+#define LAYOUT( \
        L00, L01, L02, L03, L04,                     R00, R01, R02, R03, R04, \
        L10, L11, L12, L13, L14,                     R10, R11, R12, R13, R14, \
        L20, L21, L22, L23, L24,                     R20, R21, R22, R23, R24, \
@@ -43,7 +43,7 @@
        }
 #else
 
-#define KEYMAP( \
+#define LAYOUT( \
        L00, L01, L02, L03, L04,                      R00, R01, R02, R03, R04, \
        L10, L11, L12, L13, L14,                      R10, R11, R12, R13, R14, \
        L20, L21, L22, L23, L24,                      R20, R21, R22, R23, R24, \

diff --git a/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c
index 0a74323ab9d504006f4ee4754611b7fb77c42f20..8847065f41e06fdd29e28186735e8e3aff5d9ec7 100644 (file)
--- a/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                    '------+------' '------+------'
  */
 
-[_BASE] = KEYMAP( \
+[_BASE] = LAYOUT( \
   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, \
   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, \
   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_QUOT, \
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                    '------+------' '------+------'
  */
 
-[_NAV] = KEYMAP( \
+[_NAV] = LAYOUT( \
   KC_TRNS,  KC_TRNS,     KC_MS_UP,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_UP,   KC_TRNS, KC_TRNS, \
   KC_TRNS,  KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \
   KC_TRNS,  KC_TRNS,     KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, \
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                    |\(NAV)|   ~  | | gui  |/(NUM)|
  *                                    '------+------' '------+------'
  */
-[_NUM] = KEYMAP( \
+[_NUM] = LAYOUT( \
   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,  KC_F6,  KC_F7,    KC_F8,   KC_F9,   KC_F10, \
   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,   KC_6,   KC_7,     KC_8,    KC_9,    KC_0, \
   KC_EXLM,  KC_AT,  KC_HASH,  KC_DLR, KC_PERC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, \

diff --git a/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c
index e0852f8e06b2a13136013cad3737071be4be46e0..bee15bfbe36326e77887ef690cb6a3aebf031ea6 100644 (file)
--- a/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                    '------+------' '------+------'
  */
 
-[_BASE] = KEYMAP( \
+[_BASE] = LAYOUT( \
   KC_QUOT, KC_COMM, KC_DOT,  KC_P, KC_Y,                                     KC_F, KC_G, KC_C,    KC_R,   KC_L, \
   KC_A,    KC_O,    KC_E,    KC_U, KC_I,                                     KC_D, KC_H, KC_T,    KC_N,   KC_S, \
   KC_SCLN, KC_Q,    KC_J,    KC_K, KC_X,                                     KC_B, KC_M, KC_W,    KC_V,   KC_Z, \
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                    '------+------' '------+------'
  */
 
-[_NAV] = KEYMAP( \
+[_NAV] = LAYOUT( \
   KC_TRNS,  KC_TRNS,     KC_MS_UP,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_UP,   KC_TRNS, KC_TRNS, \
   KC_TRNS,  KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \
   KC_TRNS,  KC_TRNS,     KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, \
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                    |\(NAV)|   ~  | | gui  |/(NUM)|
  *                                    '------+------' '------+------'
  */
-[_NUM] = KEYMAP( \
+[_NUM] = LAYOUT( \
   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,  KC_F6,  KC_F7,    KC_F8,   KC_F9,   KC_F10, \
   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,   KC_6,   KC_7,     KC_8,    KC_9,    KC_0, \
   KC_EXLM,  KC_AT,  KC_HASH,  KC_DLR, KC_PERC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, \

diff --git a/keyboards/handwired/maartenwut/keymaps/default/keymap.c b/keyboards/handwired/maartenwut/keymaps/default/keymap.c
index 1c9eff9d8190850bcf665459c922536f7201650a..9152d8ca220c0ac59a3c2af72b5a8e9753b35d96 100755 (executable)
--- a/keyboards/handwired/maartenwut/keymaps/default/keymap.c
+++ b/keyboards/handwired/maartenwut/keymaps/default/keymap.c
@@ -13,31 +13,31 @@
 #define SPACE LT(_AR, KC_SPC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_MA] = KEYMAP(
+[_MA] = LAYOUT(
     KC_GRV,            KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_6,           KC_7,           KC_8,           KC_9,           KC_0,           KC_MINS,        KC_EQL,         KC_BSPC,
     KC_ESC,            KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           KC_LBRC,        KC_RBRC,        KC_BSLS,
     KC_TAB,            KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,           KC_L,           KC_SCLN,        KC_QUOT,        KC_DEL,         KC_ENT,
     LSHIFT,            KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMM,        KC_DOT,         KC_SLSH,        KC_RSFT,        KC_UP,          KC_PSCR,
     KC_LCTL,   KC_LGUI,        KC_LALT,        MO(_NU),                                SPACE,                                  KC_SPC,                                 MO(_FL),        KC_RALT,        KC_LEFT,        KC_DOWN,        KC_RGHT),
-[_NU] = KEYMAP(
+[_NU] = LAYOUT(
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   KC_7,           KC_8,           KC_9,           _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     KC_CAPS,   KC_4,           KC_5,           KC_6,           _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   KC_1,           KC_2,           KC_3,           _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   KC_0,           _______,        _______,                                _______,                                _______,                                _______,        _______,        _______,        _______,        _______),
-[_FL] = KEYMAP(
+[_FL] = LAYOUT(
     _______,   KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_MPLY,
     RESET,             _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,        _______,        TG(_GA),        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,                                _______,                                _______,                                _______,        _______,        _______,        _______,        _______),
-[_GA] = KEYMAP(
+[_GA] = LAYOUT(
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     KC_LSFT,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,                                KC_SPC,                                 _______,                                _______,        _______,        _______,        _______,        _______),
-[_AR] = KEYMAP(
+[_AR] = LAYOUT(
     _______,   KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         _______,
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,
     _______,   _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,

diff --git a/keyboards/handwired/maartenwut/maartenwut.h b/keyboards/handwired/maartenwut/maartenwut.h
index 0e47d6386163c156fe01dc59ccae0e6630cf6618..cc237f3c00e444bd55ca69f80ffd4509c2f26306 100755 (executable)
--- a/keyboards/handwired/maartenwut/maartenwut.h
+++ b/keyboards/handwired/maartenwut/maartenwut.h
@@ -5,7 +5,7 @@
 
 #define XXX KC_NO
 
-#define KEYMAP( \
+#define LAYOUT( \
   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \

diff --git a/keyboards/handwired/maartenwut/readme.md b/keyboards/handwired/maartenwut/readme.md
new file mode 100644 (file)
index 0000000..31fc767
--- /dev/null
+++ b/keyboards/handwired/maartenwut/readme.md
@@ -0,0 +1,13 @@
+# maartenwut handwired
+
+Custom handwired keyboard for maartenwut.
+
+Keyboard Maintainer: [Maarten Dekekrs](https://github.com/maartenwut)  
+Hardware Supported: Custom handwired  
+Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/maartenwut:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
\ No newline at end of file

diff --git a/keyboards/handwired/numpad20/keymaps/default/keymap.c b/keyboards/handwired/numpad20/keymaps/default/keymap.c
index 37031206a903af7649415a6d4afd0ac385708a0b..65799bfee41e5dc7f657401204352988185a9cfa 100644 (file)
--- a/keyboards/handwired/numpad20/keymaps/default/keymap.c
+++ b/keyboards/handwired/numpad20/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 #define KC_ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = COMPACT_KEYMAP(
+  [0] = LAYOUT(
     LEFT,RGHT, UP ,DOWN, \
      P7 , P8 , P9 ,PLUS, \
      P4 , P5 , P6 ,MINS, \

diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h
index 191979be0d5b253e1010e3cdb26260a18d7ead8a..a2aa8d16bac735f88a2ae2b6f75d2ebf14e2bd20 100644 (file)
--- a/keyboards/handwired/numpad20/numpad20.h
+++ b/keyboards/handwired/numpad20/numpad20.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define COMPACT_KEYMAP( \
+#define LAYOUT( \
     K00, K01, K02, K03, \
     K10, K11, K12, K13, \
     K20, K21, K22, K23, \

diff --git a/keyboards/handwired/numpad20/readme.md b/keyboards/handwired/numpad20/readme.md
new file mode 100644 (file)
index 0000000..29c832d
--- /dev/null
+++ b/keyboards/handwired/numpad20/readme.md
@@ -0,0 +1,13 @@
+# numpad20 handwired
+
+Custom handwired 20 key numpad.
+
+Keyboard Maintainer: [Danny](https://github.com/nooges)  
+Hardware Supported: Custom handwired 20 key numpad  
+Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/numpad20:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
\ No newline at end of file

diff --git a/keyboards/handwired/onekey/readme.md b/keyboards/handwired/onekey/readme.md
new file mode 100644 (file)
index 0000000..c28e284
--- /dev/null
+++ b/keyboards/handwired/onekey/readme.md
@@ -0,0 +1,15 @@
+# onekey handwired
+
+Custom handwired one key keyboard.
+
+Keyboard Maintainer:  
+Hardware Supported: Custom handwired one key  
+Hardware Availability: 
+
+Switch must be connected to pins B0 and D0. 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/onekey:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
\ No newline at end of file

diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
index afed1892a2455a0ac4f0e330d7bb8230e6c57d53..0d5d0c430b3af2c45857bd889bb2732bb0b9b623 100644 (file)
--- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Hyper| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Bksp |Shift | Left | Down |Right |
  * `------------------------------------------------------------------------------------------'
  */
-[_QWERTY] = COMPACT_KEYMAP(
+[_QWERTY] = LAYOUT_compact(
   //,----+----+----+----+----+----+----+----+----+----+----+----+----.
      ESC , 1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,MINS,EQL ,
   //|----+----+----+----+----+----+----+----+----+----+----+----+----|

diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h
index d442212fe9b8f62db2b2402acd0bb2f98234e060..93551bd70b2d904e2bf317ef223b6ba0378e8657 100644 (file)
--- a/keyboards/handwired/ortho5x13/ortho5x13.h
+++ b/keyboards/handwired/ortho5x13/ortho5x13.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
+#define LAYOUT( \
   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
@@ -18,7 +18,7 @@
   { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \
 }
 
-#define COMPACT_KEYMAP( \
+#define LAYOUT_compact( \
   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \

diff --git a/keyboards/handwired/ortho5x13/readme.md b/keyboards/handwired/ortho5x13/readme.md
new file mode 100644 (file)
index 0000000..7241dda
--- /dev/null
+++ b/keyboards/handwired/ortho5x13/readme.md
@@ -0,0 +1,13 @@
+# ortho5x13 handwired
+
+Custom handwired ortho5x13 keyboard.
+
+Keyboard Maintainer: [Danny](https://github.com/nooges)  
+Hardware Supported: Custom handwired 5x13 ortho keyboard  
+Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/ortho5x13:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
\ No newline at end of file

diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index ccfd01bfae92b1b78ce2ac1744af5771df57191a..1c4af5f46a52d08a9aefb40abc2bde095187202b 100644 (file)
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl| LGUI | Lower| LAlt | Space/Lower | Enter/Raise |  Fn  | Mouse| Menu | Ctrl |
  * `----------------------------------------------------------------------------------'
  */
-[_COLEMAK] = TERMINUS_MINI(
+[_COLEMAK] = LAYOUT(
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,      KC_Y,    KC_SCLN, KC_DEL , \
   KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,      KC_I,    KC_O,    KC_QUOT, \
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_RSPC, \
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl| LGUI | Lower| LAlt | Space/Lower | Enter/Raise |  Fn  | Mouse| Menu | Ctrl |
  * `----------------------------------------------------------------------------------'
  */
-[_QWERTY] = TERMINUS_MINI(
+[_QWERTY] = LAYOUT(
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,    KC_P,    KC_DEL , \
   KC_BSPC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_RSPC, \
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | LGUI | Lower| LAlt | Space/Lower | Enter/Raise |  Fn  | Mouse| Menu |Ctrl  |
  * `-----------------------------------------------------------------------------------'
  */
-[_DVORAK] = TERMINUS_MINI(
+[_DVORAK] = LAYOUT(
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL, \
   KC_BSPC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
   KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC, \
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  Want to add tap-dance function to 0 key: Tap=0, doubleTap=Ent
  */
 
-[_LOWER] = TERMINUS_MINI(
+[_LOWER] = LAYOUT(
   KC_TAB,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,   KC_PSLS,  KC_7,  KC_8,  KC_9,   KC_PAST,  XXXXXXX, _______, \
   _______, KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_MINS,  KC_4,  KC_5,  KC_6,   KC_PPLS,  XXXXXXX, _______, \
   _______, _______,  _______,  _______,  _______,  KC_EQL,   KC_1,  KC_2,  KC_3,   KC_PENT,  XXXXXXX, _______, \
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
   */
 
-[_RAISE] = TERMINUS_MINI(
+[_RAISE] = LAYOUT(
    KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,   KC_PERC, KC_CIRC,  KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  _______, \
    _______, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    _______, \
    _______, POINT,   PIPE,    KC_LCBR, KC_LBRC,  KC_GRV,  KC_BSLS,  KC_RBRC, KC_RCBR, KC_DOT,  KC_SLSH, _______, \
@@ -178,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 
-[_FUNCTION] = TERMINUS_MINI( 
+[_FUNCTION] = LAYOUT( 
   _______, KC_MUTE, KC_VOLD, KC_VOLU,  XXXXXXX, XXXXXXX, XXXXXXX,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_INS , \
   KC_CAPS, KC_MSTP, KC_MPRV, KC_MPLY,  KC_MNXT, XXXXXXX, XXXXXXX,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_PSCR, \
   _______, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_SLCK, \
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------------------------------------------------------------------'
  */
 
-[_MOUSE] = TERMINUS_MINI(
+[_MOUSE] = LAYOUT(
    KC_ESC,  KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R,  XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4,  KC_BTN5, XXXXXXX, XXXXXXX, \
    KC_BSPC, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R,  XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2,  XXXXXXX, XXXXXXX, XXXXXXX, \
    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_RSPC, \
@@ -216,7 +216,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 
-[_ADJUST] = TERMINUS_MINI(
+[_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______, RESET,   _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \
   _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK, _______,  _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \

diff --git a/keyboards/handwired/terminus_mini/readme.md b/keyboards/handwired/terminus_mini/readme.md
new file mode 100644 (file)
index 0000000..94249d6
--- /dev/null
+++ b/keyboards/handwired/terminus_mini/readme.md
@@ -0,0 +1,13 @@
+# terminus_mini handwired
+
+Custom handwired keyboard.
+
+Keyboard Maintainer: [James Morgan](https://github.com/mogranjm)  
+Hardware Supported: Custom handwired keyboard    
+Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/terminus_mini:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
\ No newline at end of file

diff --git a/keyboards/handwired/terminus_mini/terminus_mini.h b/keyboards/handwired/terminus_mini/terminus_mini.h
index 44590a191eb685bcf7425c54e1294830ba295362..846c98e2c08776b4f30289a2761f47655923e271 100644 (file)
--- a/keyboards/handwired/terminus_mini/terminus_mini.h
+++ b/keyboards/handwired/terminus_mini/terminus_mini.h
@@ -22,7 +22,7 @@
 // The following is an example using the Terminus Mini layout
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
-#define TERMINUS_MINI( \
+#define LAYOUT( \
        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, \

diff --git a/layouts/community/ortho_4x12/bakingpy/keymap.c b/layouts/community/ortho_4x12/bakingpy/keymap.c
index d3822bfd80ef470a4c02db600785bf216983d77e..05ad92fd2d0fd69c3061d206ed42d9f2ea844250 100644 (file)
--- a/layouts/community/ortho_4x12/bakingpy/keymap.c
+++ b/layouts/community/ortho_4x12/bakingpy/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = KC_LAYOUT_ortho_4x12(
+  [_QWERTY] = LAYOUT_kc_ortho_4x12(
   //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
      TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----'    `----+----+----+----+----+----'
   ),
 
-  [_COLEMAK] = KC_LAYOUT_ortho_4x12(
+  [_COLEMAK] = LAYOUT_kc_ortho_4x12(
   //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
      TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----'    `----+----+----+----+----+----'
   ),
 
-  [_DVORAK] = KC_LAYOUT_ortho_4x12(
+  [_DVORAK] = LAYOUT_kc_ortho_4x12(
   //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
      TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----'    `----+----+----+----+----+----'
   ),
 
-  [_LOWER] = KC_LAYOUT_ortho_4x12(
+  [_LOWER] = LAYOUT_kc_ortho_4x12(
   //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
          , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----'    `----+----+----+----+----+----'
   ),
 
-  [_RAISE] = KC_LAYOUT_ortho_4x12(
+  [_RAISE] = LAYOUT_kc_ortho_4x12(
   //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
          ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----'    `----+----+----+----+----+----'
   ),
 
-  [_FKEYS] = KC_LAYOUT_ortho_4x12(
+  [_FKEYS] = LAYOUT_kc_ortho_4x12(
   //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
      F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
   //|----+----+----+----+----+----|    |----+----+----+----+----+----|