Skip to content

Commit 07fbed0

Browse files
earlephilhowerearlephilhower
authored
Fix Arduino Nano Connect USB VID:PID tuples (#970)
Fixes #968
1 parent ea5f824 commit 07fbed0

File tree

3 files changed

+37
-31
lines changed

3 files changed

+37
-31
lines changed

‎boards.txt‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,22 +5481,14 @@ adafruit_kb2040picodebug.menu.ipstack.ipv4ipv6.build.lwipdefs=-DLWIP_IPV6=1 -DLW
54815481
# -----------------------------------
54825482
arduino_nano_connect.name=Arduino Nano RP2040 Connect
54835483
arduino_nano_connect.vid.0=0x2341
5484-
arduino_nano_connect.pid.0=0x0058
5484+
arduino_nano_connect.pid.0=0x005e
54855485
arduino_nano_connect.vid.1=0x2341
5486-
arduino_nano_connect.pid.1=0x0158
5486+
arduino_nano_connect.pid.1=0x805e
54875487
arduino_nano_connect.vid.2=0x2341
5488-
arduino_nano_connect.pid.2=0x4058
5488+
arduino_nano_connect.pid.2=0x015e
54895489
arduino_nano_connect.vid.3=0x2341
5490-
arduino_nano_connect.pid.3=0x4158
5491-
arduino_nano_connect.vid.4=0x2341
5492-
arduino_nano_connect.pid.4=0x8058
5493-
arduino_nano_connect.vid.5=0x2341
5494-
arduino_nano_connect.pid.5=0x8158
5495-
arduino_nano_connect.vid.6=0x2341
5496-
arduino_nano_connect.pid.6=0xc058
5497-
arduino_nano_connect.vid.7=0x2341
5498-
arduino_nano_connect.pid.7=0xc158
5499-
arduino_nano_connect.build.usbpid=-DSERIALUSB_PID=0x0058
5490+
arduino_nano_connect.pid.3=0x025e
5491+
arduino_nano_connect.build.usbpid=-DSERIALUSB_PID=0x005e
55005492
arduino_nano_connect.build.usbpwr=-DUSBD_MAX_POWER_MA=250
55015493
arduino_nano_connect.build.board=NANO_RP2040_CONNECT
55025494
arduino_nano_connect.build.mcu=cortex-m0plus
@@ -5518,7 +5510,7 @@ arduino_nano_connect.build.ram_length=256k
55185510
arduino_nano_connect.build.debugscript=picoprobe.tcl
55195511
arduino_nano_connect.build.boot2=boot2_w25q080_2_padded_checksum
55205512
arduino_nano_connect.build.vid=0x2341
5521-
arduino_nano_connect.build.pid=0x0058
5513+
arduino_nano_connect.build.pid=0x005e
55225514
arduino_nano_connect.build.usb_manufacturer="Arduino"
55235515
arduino_nano_connect.build.usb_product="Nano RP2040 Connect"
55245516
arduino_nano_connect.menu.flash.16777216_0=16MB (no FS)
@@ -5744,7 +5736,7 @@ arduino_nano_connectpicoprobe.vid.6=0x2341
57445736
arduino_nano_connectpicoprobe.pid.6=0xc004
57455737
arduino_nano_connectpicoprobe.vid.7=0x2341
57465738
arduino_nano_connectpicoprobe.pid.7=0xc104
5747-
arduino_nano_connectpicoprobe.build.usbpid=-DSERIALUSB_PID=0x0058
5739+
arduino_nano_connectpicoprobe.build.usbpid=-DSERIALUSB_PID=0x005e
57485740
arduino_nano_connectpicoprobe.build.usbpwr=-DUSBD_MAX_POWER_MA=250
57495741
arduino_nano_connectpicoprobe.build.board=NANO_RP2040_CONNECT
57505742
arduino_nano_connectpicoprobe.build.mcu=cortex-m0plus
@@ -5765,7 +5757,7 @@ arduino_nano_connectpicoprobe.build.ram_length=256k
57655757
arduino_nano_connectpicoprobe.build.debugscript=picoprobe.tcl
57665758
arduino_nano_connectpicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
57675759
arduino_nano_connectpicoprobe.build.vid=0x2341
5768-
arduino_nano_connectpicoprobe.build.pid=0x0058
5760+
arduino_nano_connectpicoprobe.build.pid=0x005e
57695761
arduino_nano_connectpicoprobe.build.usb_manufacturer="Arduino"
57705762
arduino_nano_connectpicoprobe.build.usb_product="Nano RP2040 Connect (Picoprobe)"
57715763
arduino_nano_connectpicoprobe.menu.flash.16777216_0=16MB (no FS)
@@ -5991,7 +5983,7 @@ arduino_nano_connectpicodebug.vid.6=0x1209
59915983
arduino_nano_connectpicodebug.pid.6=0xe488
59925984
arduino_nano_connectpicodebug.vid.7=0x1209
59935985
arduino_nano_connectpicodebug.pid.7=0xe588
5994-
arduino_nano_connectpicodebug.build.usbpid=-DSERIALUSB_PID=0x0058
5986+
arduino_nano_connectpicodebug.build.usbpid=-DSERIALUSB_PID=0x005e
59955987
arduino_nano_connectpicodebug.build.usbpwr=-DUSBD_MAX_POWER_MA=250
59965988
arduino_nano_connectpicodebug.build.board=NANO_RP2040_CONNECT
59975989
arduino_nano_connectpicodebug.build.mcu=cortex-m0plus
@@ -6012,7 +6004,7 @@ arduino_nano_connectpicodebug.build.ram_length=240k
60126004
arduino_nano_connectpicodebug.build.debugscript=picodebug.tcl
60136005
arduino_nano_connectpicodebug.build.boot2=boot2_w25q080_2_padded_checksum
60146006
arduino_nano_connectpicodebug.build.vid=0x2341
6015-
arduino_nano_connectpicodebug.build.pid=0x0058
6007+
arduino_nano_connectpicodebug.build.pid=0x005e
60166008
arduino_nano_connectpicodebug.build.usb_manufacturer="Arduino"
60176009
arduino_nano_connectpicodebug.build.usb_product="Nano RP2040 Connect (pico-debug)"
60186010
arduino_nano_connectpicodebug.menu.flash.16777216_0=16MB (no FS)

‎tools/json/arduino_nano_connect.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"earlephilhower": {
55
"boot2_source": "boot2_w25q080_2_padded_checksum.S",
66
"usb_vid": "0x2341",
7-
"usb_pid": "0x0058"
7+
"usb_pid": "0x005E"
88
}
99
},
1010
"core": "earlephilhower",
@@ -18,7 +18,7 @@
1818
],
1919
[
2020
"0x2341",
21-
"0x0058"
21+
"0x005E"
2222
]
2323
],
2424
"mcu": "rp2040",

‎tools/makeboards.py‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,24 @@ def BuildHeader(name, vendor_name, product_name, vidtouse, pidtouse, vid, pid, p
110110
print("# %s" % (prettyname))
111111
print("# -----------------------------------")
112112
print("%s.name=%s" % (name, prettyname))
113-
usb = 0;
114-
for kb in [ "0", "0x8000" ]:
115-
for ms in [ "0", "0x4000" ]:
116-
for jy in [ "0", "0x0100" ]:
117-
thispid = int(pidtouse, 16) | int(kb, 16) | int(ms, 16) | int(jy, 16)
118-
print("%s.vid.%d=%s" % (name, usb, vidtouse))
119-
print("%s.pid.%d=0x%04x" % (name, usb, thispid))
120-
usb = usb + 1
121-
print("%s.build.usbpid=-DSERIALUSB_PID=%s" % (name, pid))
113+
usb = 0
114+
if type(pidtouse) == list:
115+
for tp in pid:
116+
print("%s.vid.%d=%s" % (name, usb, vidtouse))
117+
print("%s.pid.%d=0x%04x" % (name, usb, int(tp, 16)))
118+
usb = usb + 1
119+
else:
120+
for kb in [ "0", "0x8000" ]:
121+
for ms in [ "0", "0x4000" ]:
122+
for jy in [ "0", "0x0100" ]:
123+
thispid = int(pidtouse, 16) | int(kb, 16) | int(ms, 16) | int(jy, 16)
124+
print("%s.vid.%d=%s" % (name, usb, vidtouse))
125+
print("%s.pid.%d=0x%04x" % (name, usb, thispid))
126+
usb = usb + 1
127+
if type(pid) == list:
128+
print("%s.build.usbpid=-DSERIALUSB_PID=%s" % (name, pid[0]))
129+
else:
130+
print("%s.build.usbpid=-DSERIALUSB_PID=%s" % (name, pid))
122131
print("%s.build.usbpwr=-DUSBD_MAX_POWER_MA=%s" % (name, pwr))
123132
print("%s.build.board=%s" % (name, boarddefine))
124133
print("%s.build.mcu=cortex-m0plus" % (name))
@@ -141,7 +150,10 @@ def BuildHeader(name, vendor_name, product_name, vidtouse, pidtouse, vid, pid, p
141150
print("%s.build.debugscript=%s" % (name, dbg))
142151
print("%s.build.boot2=%s" % (name, boot2))
143152
print("%s.build.vid=%s" % (name, vid))
144-
print("%s.build.pid=%s" % (name, pid))
153+
if type(pid) == list:
154+
print("%s.build.pid=%s" % (name, pid[0]))
155+
else:
156+
print("%s.build.pid=%s" % (name, pid))
145157
print('%s.build.usb_manufacturer="%s"' % (name, vendor_name))
146158
print('%s.build.usb_product="%s"' % (name, product_name))
147159
if extra != None:
@@ -221,6 +233,8 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
221233
pkgjson['packages'][0]['platforms'][0]['boards'].append(thisbrd)
222234

223235
def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flashsizemb, boot2, extra):
236+
if type(pid) == list:
237+
pid = pid[0]
224238
if extra != None:
225239
m_extra = ' '
226240
for m_item in extra:
@@ -321,7 +335,7 @@ def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, f
321335
MakeBoard("adafruit_kb2040", "Adafruit", "KB2040", "0x239a", "0x8105", 250, "ADAFRUIT_KB2040_RP2040", 8, "boot2_w25q080_2_padded_checksum")
322336

323337
# Arduino
324-
MakeBoard("arduino_nano_connect", "Arduino", "Nano RP2040 Connect", "0x2341", "0x0058", 250, "NANO_RP2040_CONNECT", 16, "boot2_w25q080_2_padded_checksum")
338+
MakeBoard("arduino_nano_connect", "Arduino", "Nano RP2040 Connect", "0x2341", ["0x005e", "0x805e", "0x015e", "0x025e"] , 250, "NANO_RP2040_CONNECT", 16, "boot2_w25q080_2_padded_checksum")
325339

326340
# BridgeTek
327341
MakeBoard("bridgetek_idm2040-7a", "BridgeTek", "IDM2040-7A", "0x2e8a", "0x1041", 250, "BRIDGETEK_IDM2040-7A", 8, "boot2_w25q080_2_padded_checksum", ["FT8XX_TYPE=BT817", "DISPLAY_RES=WVGA", "PLATFORM_RP2040"])

0 commit comments

Comments
 (0)