Change VID and PID in boards.txt

Better to set these where intended so they can be easily overridden if need be.

2 files changed, 28 insertions, 34 deletions

diff --git a/boards.txt b/boards.txt
index 22f3740..a91e1a7 100644
--- a/boards.txt
+++ b/boards.txt
@@ -36,8 +36,8 @@ yun.bootloader.lock_bits=0x2F
 
 yun.build.mcu=atmega32u4
 yun.build.f_cpu=16000000L
-yun.build.vid=0x2341
-yun.build.pid=0x8041
+yun.build.vid=0x045E
+yun.build.pid=0x028E
 yun.build.usb_product="Arduino Yun"
 yun.build.board=AVR_YUN
 yun.build.core=arduino
@@ -75,8 +75,8 @@ leonardo.bootloader.lock_bits=0x2F
 
 leonardo.build.mcu=atmega32u4
 leonardo.build.f_cpu=16000000L
-leonardo.build.vid=0x2341
-leonardo.build.pid=0x8036
+leonardo.build.vid=0x045E
+leonardo.build.pid=0x028E
 leonardo.build.usb_product="Arduino Leonardo"
 leonardo.build.board=AVR_LEONARDO
 leonardo.build.core=arduino
@@ -110,8 +110,8 @@ leonardoeth.bootloader.lock_bits=0x2F
 
 leonardoeth.build.mcu=atmega32u4
 leonardoeth.build.f_cpu=16000000L
-leonardoeth.build.vid=0x2a03
-leonardoeth.build.pid=0x8040
+leonardoeth.build.vid=0x045E
+leonardoeth.build.pid=0x028E
 leonardoeth.build.usb_product="Arduino Leonardo ETH"
 leonardoeth.build.board=AVR_LEONARDO_ETH
 leonardoeth.build.core=arduino
@@ -135,8 +135,8 @@ micro.vid.4=0x2341
 micro.pid.4=0x0237
 # If the board is a 2341:0237 use 2341:8237 for build and set
 # other parameters as well
-micro.vid.4.build.vid=0x2341
-micro.vid.4.build.pid=0x8237
+micro.vid.4.build.vid=0x045E
+micro.vid.4.build.pid=0x028E
 micro.vid.4.build.usb_product="Genuino Micro"
 micro.vid.4.bootloader.file=caterina/Caterina-Genuino-Micro.hex
 
@@ -144,8 +144,8 @@ micro.vid.5=0x2341
 micro.pid.5=0x8237
 # If the board is a 2341:8237 use 2341:8237 for build and set
 # other paramters as well
-micro.vid.5.build.vid=0x2341
-micro.vid.5.build.pid=0x8237
+micro.vid.5.build.vid=0x045E
+micro.vid.5.build.pid=0x028E
 micro.vid.5.build.usb_product="Genuino Micro"
 micro.vid.5.bootloader.file=caterina/Caterina-Genuino-Micro.hex
 
@@ -168,8 +168,8 @@ micro.bootloader.lock_bits=0x2F
 
 micro.build.mcu=atmega32u4
 micro.build.f_cpu=16000000L
-micro.build.vid=0x2341
-micro.build.pid=0x8037
+micro.build.vid=0x045E
+micro.build.pid=0x028E
 micro.build.usb_product="Arduino Micro"
 micro.build.board=AVR_MICRO
 micro.build.core=arduino
@@ -207,8 +207,8 @@ esplora.bootloader.lock_bits=0x2F
 
 esplora.build.mcu=atmega32u4
 esplora.build.f_cpu=16000000L
-esplora.build.vid=0x2341
-esplora.build.pid=0x803c
+esplora.build.vid=0x045E
+esplora.build.pid=0x028E
 esplora.build.usb_product="Arduino Esplora"
 esplora.build.board=AVR_ESPLORA
 esplora.build.core=arduino
@@ -242,8 +242,8 @@ LilyPadUSB.bootloader.lock_bits=0x2F
 
 LilyPadUSB.build.mcu=atmega32u4
 LilyPadUSB.build.f_cpu=8000000L
-LilyPadUSB.build.vid=0x1B4F
-LilyPadUSB.build.pid=0x9208
+LilyPadUSB.build.vid=0x045E
+LilyPadUSB.build.pid=0x028E
 LilyPadUSB.build.usb_product="LilyPad USB"
 LilyPadUSB.build.board=AVR_LILYPAD_USB
 LilyPadUSB.build.core=arduino
@@ -281,8 +281,8 @@ robotControl.bootloader.lock_bits=0x2F
 
 robotControl.build.mcu=atmega32u4
 robotControl.build.f_cpu=16000000L
-robotControl.build.vid=0x2341
-robotControl.build.pid=0x8038
+robotControl.build.vid=0x045E
+robotControl.build.pid=0x028E
 robotControl.build.usb_product="Robot Control"
 robotControl.build.board=AVR_ROBOT_CONTROL
 robotControl.build.core=arduino
@@ -320,8 +320,8 @@ robotMotor.bootloader.lock_bits=0x2F
 
 robotMotor.build.mcu=atmega32u4
 robotMotor.build.f_cpu=16000000L
-robotMotor.build.vid=0x2341
-robotMotor.build.pid=0x8039
+robotMotor.build.vid=0x045E
+robotMotor.build.pid=0x028E
 robotMotor.build.usb_product="Robot Motor"
 robotMotor.build.board=AVR_ROBOT_MOTOR
 robotMotor.build.core=arduino
@@ -341,8 +341,8 @@ circuitplay32u4cat.bootloader.lock_bits=0x2F
 circuitplay32u4cat.bootloader.tool=avrdude
 circuitplay32u4cat.build.mcu=atmega32u4
 circuitplay32u4cat.build.f_cpu=8000000L
-circuitplay32u4cat.build.vid=0x239A
-circuitplay32u4cat.build.pid=0x8011
+circuitplay32u4cat.build.vid=0x045E
+circuitplay32u4cat.build.pid=0x028E
 circuitplay32u4cat.build.core=arduino
 circuitplay32u4cat.build.variant=circuitplay32u4
 circuitplay32u4cat.build.board=AVR_CIRCUITPLAY
@@ -388,8 +388,8 @@ yunmini.bootloader.lock_bits=0x2F
 
 yunmini.build.mcu=atmega32u4
 yunmini.build.f_cpu=16000000L
-yunmini.build.vid=0x2a03
-yunmini.build.pid=0x8050
+yunmini.build.vid=0x045E
+yunmini.build.pid=0x028E
 yunmini.build.usb_product="Arduino Yún Mini"
 yunmini.build.board=AVR_YUNMINI
 yunmini.build.core=arduino
@@ -425,8 +425,8 @@ chiwawa.bootloader.lock_bits=0x2F
 
 chiwawa.build.mcu=atmega32u4
 chiwawa.build.f_cpu=16000000L
-chiwawa.build.vid=0x2a03
-chiwawa.build.pid=0x8056
+chiwawa.build.vid=0x045E
+chiwawa.build.pid=0x028E
 chiwawa.build.usb_product="Arduino Industrial 101"
 chiwawa.build.board=AVR_INDUSTRIAL101
 chiwawa.build.core=arduino
@@ -462,8 +462,8 @@ one.bootloader.lock_bits=0x2F
 
 one.build.mcu=atmega32u4
 one.build.f_cpu=16000000L
-one.build.vid=0x2a03
-one.build.pid=0x8001
+one.build.vid=0x045E
+one.build.pid=0x028E
 one.build.usb_product="Linino One"
 one.build.board=AVR_LININO_ONE
 one.build.core=arduino
diff --git a/cores/arduino/xinput/USB_XInput_Descriptors.h b/cores/arduino/xinput/USB_XInput_Descriptors.h
index 21697fb..976fe56 100644
--- a/cores/arduino/xinput/USB_XInput_Descriptors.h
+++ b/cores/arduino/xinput/USB_XInput_Descriptors.h
@@ -48,12 +48,6 @@ extern const u8 STRING_SECURITY[] PROGMEM;
 #define XINPUT_TX_ENDPOINT	1
 #define XINPUT_RX_ENDPOINT	2
 
-#undef USB_VID
-#define USB_VID 0x045E
-
-#undef USB_PID
-#define USB_PID 0x028E
-
 #endif /* if defined(USBCON) */
 
 #endif /* ifndef USB_XINPUT_DESCRIPTORS_H */