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/hhkb | |
| 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/hhkb')
| -rw-r--r-- | keyboards/hhkb/ansi/config.h | 1 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/keymaps/cinaeco/config.h | 2 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/keymaps/mjt/config.h | 1 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/config.h | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h index 53d958cc1..5e4fece17 100644 --- a/keyboards/hhkb/ansi/config.h +++ b/keyboards/hhkb/ansi/config.h | |||
| @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | #define DEVICE_VER 0x0104 | 25 | #define DEVICE_VER 0x0104 |
| 26 | #define MANUFACTURER q.m.k | 26 | #define MANUFACTURER q.m.k |
| 27 | #define PRODUCT HHKB mod | 27 | #define PRODUCT HHKB mod |
| 28 | #define DESCRIPTION q.m.k keyboard firmware for HHKB | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 8 | 30 | #define MATRIX_ROWS 8 |
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h index c7b4c784c..1c714deca 100644 --- a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h +++ b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h | |||
| @@ -5,10 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | #undef MANUFACTURER | 6 | #undef MANUFACTURER |
| 7 | #undef PRODUCT | 7 | #undef PRODUCT |
| 8 | #undef DESCRIPTION | ||
| 9 | #define MANUFACTURER QMK | 8 | #define MANUFACTURER QMK |
| 10 | #define PRODUCT HHKB QMK cinaeco | 9 | #define PRODUCT HHKB QMK cinaeco |
| 11 | #define DESCRIPTION HHKB on QMK Firmware with cinaeco keymap | ||
| 12 | 10 | ||
| 13 | // Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly. | 11 | // Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly. |
| 14 | #undef TAPPING_TERM | 12 | #undef TAPPING_TERM |
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/config.h b/keyboards/hhkb/ansi/keymaps/mjt/config.h index 3b8f2e676..b98ec5231 100644 --- a/keyboards/hhkb/ansi/keymaps/mjt/config.h +++ b/keyboards/hhkb/ansi/keymaps/mjt/config.h | |||
| @@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 26 | #define DEVICE_VER 0x0104 | 26 | #define DEVICE_VER 0x0104 |
| 27 | #define MANUFACTURER q.m.k | 27 | #define MANUFACTURER q.m.k |
| 28 | #define PRODUCT HHKB mod | 28 | #define PRODUCT HHKB mod |
| 29 | #define DESCRIPTION q.m.k keyboard firmware for HHKB | ||
| 30 | 29 | ||
| 31 | /* key matrix size */ | 30 | /* key matrix size */ |
| 32 | #ifdef HHKB_JP | 31 | #ifdef HHKB_JP |
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h index 9f6819b86..c06c554b2 100644 --- a/keyboards/hhkb/jp/config.h +++ b/keyboards/hhkb/jp/config.h | |||
| @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | #define DEVICE_VER 0x0104 | 25 | #define DEVICE_VER 0x0104 |
| 26 | #define MANUFACTURER q.m.k | 26 | #define MANUFACTURER q.m.k |
| 27 | #define PRODUCT HHKB mod | 27 | #define PRODUCT HHKB mod |
| 28 | #define DESCRIPTION q.m.k keyboard firmware for HHKB | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 16 | 30 | #define MATRIX_ROWS 16 |