Skip to content

Commit 695cbc2

Browse files
committed
usb: add support for feather_rp2040 and pico
1 parent 443f486 commit 695cbc2

File tree

7 files changed

+33
-7
lines changed

7 files changed

+33
-7
lines changed

src/machine/board_feather_rp2040.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,14 @@ const (
6060
// Default Serial In Bus 1 for SPI communications
6161
SPI1_SDI_PIN = GPIO12 // Rx
6262
)
63+
64+
// USB CDC identifiers
65+
const (
66+
usb_STRING_PRODUCT = "Adafruit Feather RP2040"
67+
usb_STRING_MANUFACTURER = "Adafruit"
68+
)
69+
70+
var (
71+
usb_VID uint16 = 0x239A
72+
usb_PID uint16 = 0x80F1
73+
)

src/machine/board_pico.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,14 @@ const (
6464
// Default Serial In Bus 1 for SPI communications
6565
SPI1_SDI_PIN = GPIO12 // Rx
6666
)
67+
68+
// USB CDC identifiers
69+
const (
70+
usb_STRING_PRODUCT = "Raspberry Pi Pico"
71+
usb_STRING_MANUFACTURER = "Raspberry Pi"
72+
)
73+
74+
var (
75+
usb_VID uint16 = 0x2E8A
76+
usb_PID uint16 = 0x0003
77+
)

src/machine/usb.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build sam || nrf52840
2-
// +build sam nrf52840
1+
//go:build sam || nrf52840 || rp2040
2+
// +build sam nrf52840 rp2040
33

44
package machine
55

src/machine/usb_descriptor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build sam || nrf52840
2-
// +build sam nrf52840
1+
//go:build sam || nrf52840 || rp2040
2+
// +build sam nrf52840 rp2040
33

44
package machine
55

src/runtime/runtime_rp2040.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package runtime
55

66
import (
77
"device/arm"
8-
98
"machine"
9+
"machine/usb/cdc"
1010
)
1111

1212
// machineTicks is provided by package machine.
@@ -76,6 +76,8 @@ func machineInit()
7676
func init() {
7777
machineInit()
7878

79+
cdc.EnableUSBCDC()
80+
machine.USB.Configure(machine.UARTConfig{})
7981
machine.Serial.Configure(machine.UARTConfig{})
8082
}
8183

targets/feather-rp2040.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"inherits": [
33
"rp2040"
44
],
5-
"serial": "uart",
5+
"serial": "usb",
6+
"serial-port": ["acm:239a:80f1"],
67
"build-tags": ["feather_rp2040"],
78
"linkerscript": "targets/feather-rp2040.ld",
89
"extra-files": [

targets/pico.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"rp2040"
44
],
55
"build-tags": ["pico"],
6-
"serial": "uart",
6+
"serial": "usb",
7+
"serial-port": ["acm:2e8a:0003"],
78
"linkerscript": "targets/pico.ld",
89
"extra-files": [
910
"targets/pico-boot-stage2.S"

0 commit comments

Comments
 (0)