sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse Source 
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
This commit is contained in:
James Young
2021-08-11 09:48:25 -07:00
parent f4c447f2df 02ac0f89c4
commit 345f6dc4e6
31 changed files with 961 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keyboards/handwired/3dp660/config.h
View File

@@ -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