Skip to content

Commit 82293e7

Browse files
facchinmfacchinm
committed
Merge branch 'for_release' into ble_fix
2 parents 0d56e34 + 5017ace commit 82293e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+737
-1180
lines changed

‎boards.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ minima.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
7777
minima.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
7878
minima.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
7979
minima.compiler.fsp.includes={build.variant.path}/includes.txt
80-
minima.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
80+
minima.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
8181
minima.compiler.fsp="{build.variant.path}/libs/libfsp.a"
8282

8383
minima.upload.tool=dfu-util
@@ -125,7 +125,7 @@ unor4wifi.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
125125
unor4wifi.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
126126
unor4wifi.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
127127
unor4wifi.compiler.fsp.includes={build.variant.path}/includes.txt
128-
unor4wifi.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
128+
unor4wifi.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
129129
unor4wifi.compiler.fsp="{build.variant.path}/libs/libfsp.a"
130130

131131
unor4wifi.upload.tool=bossac
@@ -171,7 +171,7 @@ muxto.compiler.fsp.cxxflags=-mthumb -D_RA_CORE=CM23 -D_RENESAS_RA_
171171
muxto.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
172172
muxto.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
173173
muxto.compiler.fsp.includes={build.variant.path}/includes.txt
174-
muxto.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
174+
muxto.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
175175
muxto.compiler.fsp="{build.variant.path}/libs/libfsp.a"
176176

177177
muxto.upload.tool=dfu-util

‎cores/arduino/main.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,12 @@ extern "C" {
134134

135135
//Declared weak in Arduino.h to allow user redefinitions.
136136
int atexit(void (*func)()) { return 0; }
137+
138+
namespace __gnu_cxx {
139+
void __verbose_terminate_handler() { }
140+
}
141+
extern "C" __attribute__((weak)) void __cxa_pure_virtual(void);
142+
extern "C" __attribute__((weak)) void __cxa_pure_virtual(void)
143+
{
144+
exit(1);
145+
}

‎extras/e2studioProjects/portenta_h33_lib/configuration.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@
900900
</config>
901901
<config id="config.driver.flash_hp">
902902
<property id="config.driver.flash_hp.param_checking_enable" value="config.flash_hp.param_checking_enable.bsp"/>
903-
<property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.disabled"/>
903+
<property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.enabled"/>
904904
<property id="config.driver.flash_hp.param_data_flash_programming_enable" value="config.driver.flash_hp.param_data_flash_programming_enable.enabled"/>
905905
</config>
906906
<config id="config.driver.lpm">

‎extras/package.sh

+46-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,26 @@
33
if [ ! -f platform.txt ]; then
44
echo Launch this script from the root core folder as ./extras/package.sh
55
exit 2
6-
fi
6+
fi
77

88
VERSION=`cat platform.txt | grep "version=" | cut -f2 -d"="`
99
echo $VERSION
1010

11-
FILENAME=ArduinoCore-renesas-$VERSION.tar.bz2
11+
#portenta
12+
13+
VARIANT=portenta
14+
EXCLUDE_TAGS=--exclude-tag-all=.unor4_only
15+
16+
FILENAME=ArduinoCore-renesas_$VARIANT-$VERSION.tar.bz2
17+
18+
git checkout boards.txt
19+
echo minima.hide=true >> boards.txt
20+
echo unor4wifi.hide=true >> boards.txt
21+
echo muxto.hide=true >> boards.txt
1222

1323
CORE_BASE=`basename $PWD`
1424
cd ..
15-
tar --exclude='*.vscode*' --exclude='*.git*' --exclude='*e2studio*' --exclude='*extras*' -cjhvf $FILENAME $CORE_BASE
25+
tar $EXCLUDE_TAGS --exclude='*.vscode*' --exclude='*.tar.*' --exclude='*.json*' --exclude='*.git*' --exclude='*e2studio*' --exclude='*extras*' -cjhvf $FILENAME $CORE_BASE
1626
cd -
1727

1828
mv ../$FILENAME .
@@ -24,8 +34,37 @@ cat extras/package_index.json.template |
2434
# sed "s/%%BUILD_NUMBER%%/${BUILD_NUMBER}/" |
2535
# sed "s/%%CURR_TIME%%/${CURR_TIME_SED}/" |
2636
sed "s/%%VERSION%%/${VERSION}/" |
27-
sed "s/%%FILENAME%%/${FILENAME}/" |
28-
sed "s/%%CHECKSUM%%/${CHKSUM}/" |
29-
sed "s/%%SIZE%%/${SIZE}/" > package_renesas_${VERSION}_index.json
37+
sed "s/%%FILENAME_PORTENTA%%/${FILENAME}/" |
38+
sed "s/%%CHECKSUM_PORTENTA%%/${CHKSUM}/" |
39+
sed "s/%%SIZE_PORTENTA%%/${SIZE}/" > package_renesas_${VERSION}_index.json.tmp
40+
41+
#uno r4
42+
43+
VARIANT=uno
44+
EXCLUDE_TAGS=--exclude-tag-all=.portenta_only
45+
46+
FILENAME=ArduinoCore-renesas_$VARIANT-$VERSION.tar.bz2
47+
48+
git checkout boards.txt
49+
echo portenta_c33.hide=true >> boards.txt
50+
echo muxto.hide=true >> boards.txt
51+
52+
CORE_BASE=`basename $PWD`
53+
cd ..
54+
tar $EXCLUDE_TAGS --exclude='*.vscode*' --exclude='*.tar.*' --exclude='*.json*' --exclude='*.git*' --exclude='*e2studio*' --exclude='*extras*' -cjhvf $FILENAME $CORE_BASE
55+
cd -
56+
57+
mv ../$FILENAME .
58+
59+
CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'`
60+
SIZE=`wc -c $FILENAME | awk '{ print $1 }'`
61+
62+
cat package_renesas_${VERSION}_index.json.tmp |
63+
# sed "s/%%BUILD_NUMBER%%/${BUILD_NUMBER}/" |
64+
# sed "s/%%CURR_TIME%%/${CURR_TIME_SED}/" |
65+
sed "s/%%VERSION%%/${VERSION}/" |
66+
sed "s/%%FILENAME_UNO%%/${FILENAME}/" |
67+
sed "s/%%CHECKSUM_UNO%%/${CHKSUM}/" |
68+
sed "s/%%SIZE_UNO%%/${SIZE}/" > package_renesas_${VERSION}_index.json
3069

31-
cat package_renesas_${VERSION}_index.json
70+
cat package_renesas_${VERSION}_index.json

‎extras/package_index.json.template

+48-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
},
1111
"platforms": [
1212
{
13-
"name": "Arduino Renesas Boards",
14-
"architecture": "renesas",
13+
"name": "Arduino UNO R4 Boards",
14+
"architecture": "renesas_uno",
1515
"version": "%%VERSION%%",
1616
"category": "Arduino",
17-
"url": "http://downloads.arduino.cc/cores/staging/%%FILENAME%%",
18-
"archiveFileName": "%%FILENAME%%",
19-
"checksum": "SHA-256:%%CHECKSUM%%",
20-
"size": "%%SIZE%%",
17+
"url": "http://downloads.arduino.cc/cores/staging/%%FILENAME_UNO%%",
18+
"archiveFileName": "%%FILENAME_UNO%%",
19+
"checksum": "SHA-256:%%CHECKSUM_UNO%%",
20+
"size": "%%SIZE_UNO%%",
2121
"help": {
2222
"online": "https://github.com/arduino/ArduinoCore-renesas/issues"
2323
},
@@ -27,12 +27,52 @@
2727
},
2828
{
2929
"name": "Arduino UNO R4 WiFi"
30+
}
31+
],
32+
"toolsDependencies": [
33+
{
34+
"packager": "arduino",
35+
"name": "openocd",
36+
"version": "0.11.0-arduino2"
3037
},
3138
{
32-
"name": "Arduino Portenta C33"
39+
"packager": "arduino",
40+
"name": "arm-none-eabi-gcc",
41+
"version": "7-2017q4"
3342
},
3443
{
35-
"name": "Arduino Science Kit R3 Audio Module"
44+
"packager": "arduino",
45+
"version": "0.11.0-arduino5",
46+
"name": "dfu-util"
47+
},
48+
{
49+
"packager": "arduino",
50+
"version": "1.9.1-arduino5",
51+
"name": "bossac"
52+
}
53+
],
54+
"discoveryDependencies": [
55+
{
56+
"packager": "builtin",
57+
"name": "dfu-discovery"
58+
}
59+
]
60+
},
61+
{
62+
"name": "Arduino Renesas Portenta Boards",
63+
"architecture": "renesas_portenta",
64+
"version": "%%VERSION%%",
65+
"category": "Arduino",
66+
"url": "http://downloads.arduino.cc/cores/staging/%%FILENAME_PORTENTA%%",
67+
"archiveFileName": "%%FILENAME_PORTENTA%%",
68+
"checksum": "SHA-256:%%CHECKSUM_PORTENTA%%",
69+
"size": "%%SIZE_PORTENTA%%",
70+
"help": {
71+
"online": "https://github.com/arduino/ArduinoCore-renesas/issues"
72+
},
73+
"boards": [
74+
{
75+
"name": "Arduino Portenta C33"
3676
}
3777
],
3878
"toolsDependencies": [

‎extras/santiago-leven-usb-bridge

‎libraries/Arduino_CAN/library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ sentence=CAN/CANFD communication library for UNO R4 and Portenta H33.
66
paragraph=This library provides CAN/CANFD access for Uno R4 and Portenta H33.
77
category=Other
88
url=
9-
architectures=renesas
9+
architectures=renesas,renesas_portenta,renesas_uno
1010
include=Arduino_CAN.h

‎libraries/Arduino_FreeRTOS/library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ sentence=This library provides FreeRTOS for the Portenta C33, Uno R4 Minima / Wi
66
paragraph=
77
category=Other
88
url=
9-
architectures=renesas
9+
architectures=renesas,renesas_portenta,renesas_uno
1010
include=Arduino_FreeRTOS.h

0 commit comments

Comments
 (0)