Skip to content

machine/usb: set the vid and pid to valid values supplied by Adafruit and Arduino #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 18, 2020
Merged

machine/usb: set the vid and pid to valid values supplied by Adafruit and Arduino #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7ea2dd
machine/usb: set the vid and pid to valid values supplied by Adafruit…
deadprogram Jan 28, 2020
a7e89fc
machine/atsamd21 and atsamd51: corrections needed to return valid UCB…
deadprogram Mar 16, 2020
25d5ca3
machine/nrf52840: add correct USB VID and PID for all nrf52840 based …
deadprogram Mar 16, 2020
e47192e
machine/nrf52840: use correct USB device descriptor and string descri…
deadprogram Mar 16, 2020
24e68b1
machine/adafruit: make all USB vendor and product names string descri…
deadprogram Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/machine/board_arduino_nano33.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,14 @@ const (
I2S_SD_PIN Pin = PA08
I2S_WS_PIN = NoPin // TODO: figure out what this is on Arduino Nano 33.
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Arduino NANO 33 IoT"
usb_STRING_MANUFACTURER = "Arduino"
)

var (
usb_VID uint16 = 0x2341
usb_PID uint16 = 0x8057
)
11 changes: 11 additions & 0 deletions src/machine/board_circuitplay_bluefruit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,14 @@ const (
SPI0_MOSI_PIN = P0_21 // MOSI
SPI0_MISO_PIN = P0_23 // MISO
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit Circuit Playground Bluefruit"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8045
)
11 changes: 11 additions & 0 deletions src/machine/board_circuitplay_express.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,14 @@ const (
I2S_SD_PIN = PA08
I2S_WS_PIN = NoPin // no WS, instead uses SCK to sync
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit Circuit Playground Express"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8018
)
11 changes: 11 additions & 0 deletions src/machine/board_clue_alpha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,14 @@ const (
SPI0_MOSI_PIN = D15 // MOSI
SPI0_MISO_PIN = D14 // MISO
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit CLUE"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8072
)
11 changes: 11 additions & 0 deletions src/machine/board_feather-m0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,14 @@ const (
I2S_SD_PIN = PA08
I2S_WS_PIN = NoPin // TODO: figure out what this is on Feather M0.
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit Feather M0 Express"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x801B
)
11 changes: 11 additions & 0 deletions src/machine/board_feather-m4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,14 @@ var (
SERCOM: 1,
}
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit Feather M4"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8022
)
11 changes: 11 additions & 0 deletions src/machine/board_itsybitsy-m0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,14 @@ const (
var (
I2S0 = I2S{Bus: sam.I2S}
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit ItsyBitsy M0 Express"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x800F
)
11 changes: 11 additions & 0 deletions src/machine/board_itsybitsy-m4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,14 @@ var (
SERCOM: 1,
}
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit ItsyBitsy M4"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x802B
)
11 changes: 11 additions & 0 deletions src/machine/board_metro-m4-airlift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,14 @@ var (
SERCOM: 1,
}
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit Metro M4 Airlift Lite"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8037
)
11 changes: 11 additions & 0 deletions src/machine/board_nrf52840-mdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,14 @@ const (
SPI0_MOSI_PIN = NoPin
SPI0_MISO_PIN = NoPin
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Makerdiary nRF52840 MDK USB Dongle"
usb_STRING_MANUFACTURER = "Makerdiary"
)

var (
usb_VID uint16 = 0x1915
usb_PID uint16 = 0xCAFE
)
11 changes: 11 additions & 0 deletions src/machine/board_particle_argon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,14 @@ const (
NFC1_PIN Pin = 9
NFC2_PIN Pin = 10
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Particle Argon"
usb_STRING_MANUFACTURER = "Particle"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8029
)
11 changes: 11 additions & 0 deletions src/machine/board_particle_boron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,14 @@ const (
NFC1_PIN Pin = 9
NFC2_PIN Pin = 10
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Particle Boron"
usb_STRING_MANUFACTURER = "Particle"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8029
)
11 changes: 11 additions & 0 deletions src/machine/board_particle_xenon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,14 @@ const (
NFC1_PIN Pin = 9
NFC2_PIN Pin = 10
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Particle Xenon"
usb_STRING_MANUFACTURER = "Particle"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8029
)
11 changes: 11 additions & 0 deletions src/machine/board_pca10056.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,14 @@ const (
SPI0_MOSI_PIN Pin = 45 // P1.13
SPI0_MISO_PIN Pin = 46 // P1.14
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Nordic nRF52840DK (PCA10056)"
usb_STRING_MANUFACTURER = "Nordic Semiconductor"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8029
)
Comment on lines +54 to +63
Copy link
Member

@aykevl aykevl Mar 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Is there a reason you're re-using the VID from Adafruit?
  2. It looks like the nrf52*-based boards do not use these usb_STRING_PRODUCT etc constants yet.

Copy link
Member Author

@deadprogram deadprogram Mar 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. see https://github.com/adafruit/Adafruit_nRF52_Arduino/blob/master/boards.txt#L419

  2. That is true, I will add another commit that uses the constant.

Copy link
Member Author

@deadprogram deadprogram Mar 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the nrf52840 boards all do use the constants. See https://github.com/tinygo-org/tinygo/blob/feature/usb-cdc-ids/src/machine/usb_nrf52840.go#L432 and https://github.com/tinygo-org/tinygo/blob/feature/usb-cdc-ids/src/machine/usb_nrf52840.go#L440

Copy link
Member

@aykevl aykevl Mar 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh okay, then it's fine.

11 changes: 11 additions & 0 deletions src/machine/board_pybadge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,14 @@ var (
SERCOM: 4,
}
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit pyBadge M4"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8033
)
11 changes: 11 additions & 0 deletions src/machine/board_pyportal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,14 @@ var (
}
NINA_SPI = SPI0
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit PyPortal M4"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x8035
)
11 changes: 11 additions & 0 deletions src/machine/board_reelboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,14 @@ func PowerSupplyActive(active bool) {
POWER_SUPPLY_PIN.Low()
}
}

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "PHYTEC reelboard"
usb_STRING_MANUFACTURER = "PHYTEC"
)

var (
usb_VID uint16 = 0x2FE3
usb_PID uint16 = 0x100
)
11 changes: 11 additions & 0 deletions src/machine/board_trinket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,14 @@ const (
I2S_SD_PIN = PA08
I2S_WS_PIN = NoPin // TODO: figure out what this is on Trinket M0.
)

// USB CDC identifiers
const (
usb_STRING_PRODUCT = "Adafruit Trinket M0"
usb_STRING_MANUFACTURER = "Adafruit"
)

var (
usb_VID uint16 = 0x239A
usb_PID uint16 = 0x801E
)
21 changes: 12 additions & 9 deletions src/machine/machine_atsamd21.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ func sendDescriptor(setup usbSetup) {
sendUSBPacket(0, dd.Bytes()[:8])
} else {
// complete descriptor requested so send entire packet
dd := NewDeviceDescriptor(0x00, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1)
dd := NewDeviceDescriptor(0x02, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1)
sendUSBPacket(0, dd.Bytes())
}
return
Expand All @@ -1810,11 +1810,12 @@ func sendDescriptor(setup usbSetup) {
switch setup.wValueL {
case 0:
b := make([]byte, 4)
b[0] = byte(usb_STRING_LANGUAGE[0] >> 8)
b[1] = byte(usb_STRING_LANGUAGE[0] & 0xff)
b[2] = byte(usb_STRING_LANGUAGE[1] >> 8)
b[3] = byte(usb_STRING_LANGUAGE[1] & 0xff)
b[0] = 0x04
b[1] = 0x03
b[2] = 0x09
b[3] = 0x04
sendUSBPacket(0, b)
return

case usb_IPRODUCT:
prod := []byte(usb_STRING_PRODUCT)
Expand All @@ -1823,11 +1824,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03

for i, val := range prod {
b[i*2] = 0
b[i*2+1] = val
b[i*2+2] = val
b[i*2+3] = 0
}

sendUSBPacket(0, b)
return

case usb_IMANUFACTURER:
prod := []byte(usb_STRING_MANUFACTURER)
Expand All @@ -1836,11 +1838,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03

for i, val := range prod {
b[i*2] = 0
b[i*2+1] = val
b[i*2+2] = val
b[i*2+3] = 0
}

sendUSBPacket(0, b)
return

case usb_ISERIAL:
// TODO: allow returning a product serial number
Expand Down
21 changes: 12 additions & 9 deletions src/machine/machine_atsamd51.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,7 +1972,7 @@ func sendDescriptor(setup usbSetup) {
sendUSBPacket(0, dd.Bytes()[:8])
} else {
// complete descriptor requested so send entire packet
dd := NewDeviceDescriptor(0x00, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1)
dd := NewDeviceDescriptor(0x02, 0x00, 0x00, 64, usb_VID, usb_PID, 0x100, usb_IMANUFACTURER, usb_IPRODUCT, usb_ISERIAL, 1)
sendUSBPacket(0, dd.Bytes())
}
return
Expand All @@ -1981,11 +1981,12 @@ func sendDescriptor(setup usbSetup) {
switch setup.wValueL {
case 0:
b := make([]byte, 4)
b[0] = byte(usb_STRING_LANGUAGE[0] >> 8)
b[1] = byte(usb_STRING_LANGUAGE[0] & 0xff)
b[2] = byte(usb_STRING_LANGUAGE[1] >> 8)
b[3] = byte(usb_STRING_LANGUAGE[1] & 0xff)
b[0] = 0x04
b[1] = 0x03
b[2] = 0x09
b[3] = 0x04
sendUSBPacket(0, b)
return

case usb_IPRODUCT:
prod := []byte(usb_STRING_PRODUCT)
Expand All @@ -1994,11 +1995,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03

for i, val := range prod {
b[i*2] = 0
b[i*2+1] = val
b[i*2+2] = val
b[i*2+3] = 0
}

sendUSBPacket(0, b)
return

case usb_IMANUFACTURER:
prod := []byte(usb_STRING_MANUFACTURER)
Expand All @@ -2007,11 +2009,12 @@ func sendDescriptor(setup usbSetup) {
b[1] = 0x03

for i, val := range prod {
b[i*2] = 0
b[i*2+1] = val
b[i*2+2] = val
b[i*2+3] = 0
}

sendUSBPacket(0, b)
return

case usb_ISERIAL:
// TODO: allow returning a product serial number
Expand Down
7 changes: 1 addition & 6 deletions src/machine/usb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,7 @@ func strToUTF16LEDescriptor(in string) []byte {

var (
// TODO: allow setting these
usb_STRING_LANGUAGE = [2]uint16{(3 << 8) | (2 + 2), 0x0409} // English
usb_STRING_PRODUCT = "Arduino Zero"
usb_STRING_MANUFACTURER = "Arduino"

usb_VID uint16 = 0x2341
usb_PID uint16 = 0x004d
usb_STRING_LANGUAGE = [2]uint16{(3 << 8) | (2 + 2), 0x0409} // English
)

const (
Expand Down
Loading