adafruit-mirror/arduino-pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Platform.IO ARDUINO_ARCH_xxx define (#2361)

Browse source 
The core will be identified (now for historical reasons) as ARDUINO_ARCH_RP2040.
This commit is contained in:
Earle F. Philhower, III 2024-08-26 09:06:56 -07:00 committed by GitHub
parent f4bffc6ec6
commit 9cb9226744
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/json/challenger_2350_bconnect.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_CHALLENGER_2350_BCONNECT_RP2350 -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=500",
"extra_flags": "-D ARDUINO_CHALLENGER_2350_BCONNECT_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
"f_cpu": "133000000L",
"hwids": [
[

2
tools/json/challenger_2350_wifi6_ble5.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_CHALLENGER_2350_WIFI_BLE_RP2350 -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=500 -DWIFIESPAT2",
"extra_flags": "-D ARDUINO_CHALLENGER_2350_WIFI_BLE_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 -DWIFIESPAT2",
"f_cpu": "133000000L",
"hwids": [
[

2
tools/json/generic_rp2350.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_GENERIC_RP2350 -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=250",
"extra_flags": "-D ARDUINO_GENERIC_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
"f_cpu": "133000000L",
"hwids": [
[

2
tools/json/rpipico2.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO_2 -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=250",
"extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO_2 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
"f_cpu": "133000000L",
"hwids": [
[

2
tools/json/solderparty_rp2350_stamp.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_SOLDERPARTY_RP2350_STAMP -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=500",
"extra_flags": "-D ARDUINO_SOLDERPARTY_RP2350_STAMP -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
"f_cpu": "133000000L",
"hwids": [
[

2
tools/json/solderparty_rp2350_stamp_xl.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_SOLDERPARTY_RP2350_STAMP_XL -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=500",
"extra_flags": "-D ARDUINO_SOLDERPARTY_RP2350_STAMP_XL -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
"f_cpu": "133000000L",
"hwids": [
[

2
tools/json/sparkfun_promicrorp2350.json
View file

@ -9,7 +9,7 @@
},
"core": "earlephilhower",
"cpu": "cortex-m33",
"extra_flags": "-D ARDUINO_SPARKFUN_PROMICRO_RP2350 -DARDUINO_ARCH_RP2350 -DUSBD_MAX_POWER_MA=250",
"extra_flags": "-D ARDUINO_SPARKFUN_PROMICRO_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
"f_cpu": "133000000L",
"hwids": [
[

3
tools/makeboards.py
View file

@ -357,7 +357,7 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
},
"core": "earlephilhower",
"cpu": "CPU",
"extra_flags": "-D ARDUINO_BOARDDEFINE -DARDUINO_ARCH_ARCHDEF -DUSBD_MAX_POWER_MA=USBPWR EXTRA_INFO",
"extra_flags": "-D ARDUINO_BOARDDEFINE -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=USBPWR EXTRA_INFO",
"f_cpu": "133000000L",
"hwids": [
[
@ -407,7 +407,6 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
.replace('BOOT2', boot2)\
.replace('MCUCHIP', chip)\
.replace('CPU', cpu)\
.replace('ARCHDEF', chip.upper())\
.replace('JLINK', jlink)\
.replace('VID', vid.upper().replace("X", "x"))\
.replace('PID', pid.upper().replace("X", "x"))\

2
tools/platformio-build.py
View file

@ -136,7 +136,7 @@ elif chip == "rp2350":
env.Append(
CPPDEFINES=[
("ARDUINO", 10810),
"ARDUINO_ARCH_RP2350",
"ARDUINO_ARCH_RP2040",
("F_CPU", "$BOARD_F_CPU"),
("BOARD_NAME", '\\"%s\\"' % env.subst("$BOARD")),
("CFG_TUSB_DEBUG", "0"),