diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-20 01:42:07 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-20 01:42:07 +0000 |
| commit | b9ddccf0355b0f006e9e01a889399e75a5f24eaf (patch) | |
| tree | f1c50eefe74601a8ee98849bb01c0aafbd589b5a /layouts | |
| parent | 36784a99a92a99372d329eae2b681717ce211d91 (diff) | |
| parent | 2cdc3699e1888c14f47b9b542634145e65580b06 (diff) | |
| download | qmk_firmware-b9ddccf0355b0f006e9e01a889399e75a5f24eaf.tar.gz qmk_firmware-b9ddccf0355b0f006e9e01a889399e75a5f24eaf.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/community/ergodox/meagerfindings/config.h | 2 | ||||
| -rw-r--r-- | layouts/community/ortho_5x15/wanleg/config.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/layouts/community/ergodox/meagerfindings/config.h b/layouts/community/ergodox/meagerfindings/config.h index 3d4f11b43..d69aaf79d 100644 --- a/layouts/community/ergodox/meagerfindings/config.h +++ b/layouts/community/ergodox/meagerfindings/config.h | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #define MANUFACTURER meagerfindings | 8 | #define MANUFACTURER meagerfindings |
| 9 | #undef PRODUCT | 9 | #undef PRODUCT |
| 10 | #define PRODUCT ErgoDox | 10 | #define PRODUCT ErgoDox |
| 11 | #undef DESCRIPTION | ||
| 12 | #define DESCRIPTION meagerfindings firmware for Ergodox | ||
| 13 | 11 | ||
| 14 | #define USB_MAX_POWER_CONSUMPTION 500 | 12 | #define USB_MAX_POWER_CONSUMPTION 500 |
| 15 | 13 | ||
diff --git a/layouts/community/ortho_5x15/wanleg/config.h b/layouts/community/ortho_5x15/wanleg/config.h index d2b3d6719..3e809cb84 100644 --- a/layouts/community/ortho_5x15/wanleg/config.h +++ b/layouts/community/ortho_5x15/wanleg/config.h | |||
| @@ -10,7 +10,4 @@ | |||
| 10 | //last 5 elements not tested | 10 | //last 5 elements not tested |
| 11 | #define MATRIX_COL_PINS { C6, D7, B5, B6, B7, D6, C7, F0, F1, F4, B1, B2, B3, D2, D3 } | 11 | #define MATRIX_COL_PINS { C6, D7, B5, B6, B7, D6, C7, F0, F1, F4, B1, B2, B3, D2, D3 } |
| 12 | 12 | ||
| 13 | //get rid of description - too long to show properly in Windows | ||
| 14 | #undef DESCRIPTION | ||
| 15 | #define DESCRIPTION | ||
| 16 | #endif | 13 | #endif |