diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-01-20 10:00:28 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-01-20 10:00:28 +1100 |
| commit | 9e18f41fcf46a268e01754a2743e67fb50deaa1d (patch) | |
| tree | 1b11d31dd37bb4c1e48c3d4295a2ff20c318f5ce /keyboards/mechmini | |
| parent | 78fe155b7241900988f26479b8e417623b137320 (diff) | |
| parent | 1e1b469fa2f9aa7480b4c1f1d1f8eb5b0c0c8ce5 (diff) | |
| download | qmk_firmware-9e18f41fcf46a268e01754a2743e67fb50deaa1d.tar.gz qmk_firmware-9e18f41fcf46a268e01754a2743e67fb50deaa1d.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/mechmini')
| -rw-r--r-- | keyboards/mechmini/v1/config.h | 1 | ||||
| -rwxr-xr-x | keyboards/mechmini/v2/config.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/keyboards/mechmini/v1/config.h b/keyboards/mechmini/v1/config.h index 0df0066f1..a64127f59 100644 --- a/keyboards/mechmini/v1/config.h +++ b/keyboards/mechmini/v1/config.h | |||
| @@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define DEVICE_VER 0x0001 | 24 | #define DEVICE_VER 0x0001 |
| 25 | #define MANUFACTURER MECHKEYS | 25 | #define MANUFACTURER MECHKEYS |
| 26 | #define PRODUCT Mechmini | 26 | #define PRODUCT Mechmini |
| 27 | #define DESCRIPTION 40% modular keyboard | ||
| 28 | 27 | ||
| 29 | /* matrix size */ | 28 | /* matrix size */ |
| 30 | #define MATRIX_ROWS 4 | 29 | #define MATRIX_ROWS 4 |
diff --git a/keyboards/mechmini/v2/config.h b/keyboards/mechmini/v2/config.h index f20540b94..c19e030bf 100755 --- a/keyboards/mechmini/v2/config.h +++ b/keyboards/mechmini/v2/config.h | |||
| @@ -24,8 +24,6 @@ | |||
| 24 | #define MANUFACTURER MECHKEYS | 24 | #define MANUFACTURER MECHKEYS |
| 25 | #undef PRODUCT | 25 | #undef PRODUCT |
| 26 | #define PRODUCT Mechmini 2 | 26 | #define PRODUCT Mechmini 2 |
| 27 | #undef DESCRIPTION | ||
| 28 | #define DESCRIPTION 40% modular keyboard | ||
| 29 | 27 | ||
| 30 | /* key matrix size */ | 28 | /* key matrix size */ |
| 31 | #undef MATRIX_COLS | 29 | #undef MATRIX_COLS |