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/matrix | |
| 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/matrix')
| -rw-r--r-- | keyboards/matrix/m12og/config.h | 1 | ||||
| -rw-r--r-- | keyboards/matrix/noah/config.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/keyboards/matrix/m12og/config.h b/keyboards/matrix/m12og/config.h index a29e54f4d..7cd82e05b 100644 --- a/keyboards/matrix/m12og/config.h +++ b/keyboards/matrix/m12og/config.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define DEVICE_VER 0x0001 | 12 | #define DEVICE_VER 0x0001 |
| 13 | #define MANUFACTURER matrix | 13 | #define MANUFACTURER matrix |
| 14 | #define PRODUCT M12OG | 14 | #define PRODUCT M12OG |
| 15 | #define DESCRIPTION Matrix 8XV1.2 OG version | ||
| 16 | 15 | ||
| 17 | /* key matrix size */ | 16 | /* key matrix size */ |
| 18 | #define MATRIX_ROWS 7 | 17 | #define MATRIX_ROWS 7 |
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index eac752911..8fa6bbb5c 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define DEVICE_VER 0x0001 | 13 | #define DEVICE_VER 0x0001 |
| 14 | #define MANUFACTURER matrix | 14 | #define MANUFACTURER matrix |
| 15 | #define PRODUCT NOAH | 15 | #define PRODUCT NOAH |
| 16 | #define DESCRIPTION 65% keybaord of the Matrix abel family | ||
| 17 | 16 | ||
| 18 | /* key matrix size */ | 17 | /* key matrix size */ |
| 19 | #define MATRIX_ROWS 5 | 18 | #define MATRIX_ROWS 5 |