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/rpiguy9907 | |
| parent | f4c447f2dfd9146664e3e985cac743abf17ac060 (diff) | |
| parent | 02ac0f89c4665f5fc6e57559a8c49d363117fbc0 (diff) | |
| download | qmk_firmware-345f6dc4e6910ab11907dfa5382edb12d57a1d7b.tar.gz qmk_firmware-345f6dc4e6910ab11907dfa5382edb12d57a1d7b.zip | |
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/rpiguy9907')
| -rw-r--r-- | keyboards/rpiguy9907/southpaw66/config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h index 242b4a7c4..b5cef39a6 100644 --- a/keyboards/rpiguy9907/southpaw66/config.h +++ b/keyboards/rpiguy9907/southpaw66/config.h | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | #include "config_common.h" | 19 | #include "config_common.h" |
| 20 | /* USB Device descriptor parameter */ | 20 | /* USB Device descriptor parameter */ |
| 21 | #define VENDOR_ID 0xFEED | 21 | #define VENDOR_ID 0x9907 // "9907" - rpiguy9907 |
| 22 | #define PRODUCT_ID 0x6077 | 22 | #define PRODUCT_ID 0x5366 // "S" "66" |
| 23 | #define DEVICE_VER 0x0001 | 23 | #define DEVICE_VER 0x0001 |
| 24 | #define MANUFACTURER rpiguy9907 | 24 | #define MANUFACTURER rpiguy9907 |
| 25 | #define PRODUCT Southpaw66 | 25 | #define PRODUCT Southpaw66 |