diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-11 09:48:25 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-11 09:48:25 -0700 |
| commit | 345f6dc4e6910ab11907dfa5382edb12d57a1d7b (patch) | |
| tree | b57d00ab7fe59a47f4035ab7463dec5090ef6464 /keyboards/handwired | |
| parent | f4c447f2dfd9146664e3e985cac743abf17ac060 (diff) | |
| parent | 02ac0f89c4665f5fc6e57559a8c49d363117fbc0 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
- Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
- Conflict from PR 13947
Diffstat (limited to 'keyboards/handwired')
| -rw-r--r-- | keyboards/handwired/3dp660/config.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h index e719cf2c25..60ab13deaa 100644 --- a/keyboards/handwired/3dp660/config.h +++ b/keyboards/handwired/3dp660/config.h @@ -19,11 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6075 +#define VENDOR_ID 0x676F // "go" - gooberpsycho +#define PRODUCT_ID 0x3660 // "3" "660" #define DEVICE_VER 0x0001 -#define MANUFACTURER Handwired -#define PRODUCT 3dp660 +#define MANUFACTURER gooberpsycho +#define PRODUCT 3dp660 Handwired #define TAPPING_TERM 400 |