Skip to content

Commit 30a402a

Browse files
authored
Merge pull request arduino#48 from bcmi-labs/h33-can-rx
Enable CAN frame reception on Portenta H33 Former-commit-id: 069effb
2 parents 0d3766e + 104b5ff commit 30a402a

File tree

16 files changed

+148
-118
lines changed

16 files changed

+148
-118
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#
2-
#Mon Jan 09 17:40:56 CET 2023
2+
#Wed Feb 01 09:58:42 CET 2023

extras/e2studioProjects/Santiago/.settings/language.settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-150296778265199658" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1129815049564056144" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -16,7 +16,7 @@
1616
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-150296778265199658" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
19+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1129815049564056144" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2020
<language-scope id="org.eclipse.cdt.core.gcc"/>
2121
<language-scope id="org.eclipse.cdt.core.g++"/>
2222
</provider>

extras/e2studioProjects/portenta_h33_lib/.cproject

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

extras/e2studioProjects/portenta_h33_lib/.settings/com.renesas.cdt.ddsc.packs.componentfiles.prefs

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
com.renesas.cdt.ddsc.settingseditor.active_page=ClockGeneration
1+
com.renesas.cdt.ddsc.settingseditor.active_page=SWPConfigurator
22
eclipse.preferences.version=1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
eclipse.preferences.version=1
22
is.toolchain.version=true
33
store.version=2
4-
toolchain.version=7.2.1.20170904
4+
toolchain.version=10.3.1.20210824
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#
2-
#Fri Jan 20 12:30:14 CET 2023
2+
#Thu Feb 02 10:58:52 CET 2023
33
activeConfiguration=com.renesas.cdt.managedbuild.gnuarm.config.lib.debug.590703096

extras/e2studioProjects/portenta_h33_lib/.settings/language.settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-869090263576132330" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1085494638457416635" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -16,7 +16,7 @@
1616
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-869090263576132330" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
19+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1085494638457416635" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2020
<language-scope id="org.eclipse.cdt.core.gcc"/>
2121
<language-scope id="org.eclipse.cdt.core.g++"/>
2222
</provider>

extras/e2studioProjects/portenta_h33_lib/configuration.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -975,24 +975,24 @@
975975
<property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
976976
</config>
977977
<config id="config.driver.canfd">
978-
<property id="config.driver.canfd.param_checking_enable" value="config.driver.canfd.param_checking_enable.bsp"/>
978+
<property id="config.driver.canfd.param_checking_enable" value="config.driver.canfd.param_checking_enable.enabled"/>
979979
<property id="config.driver.canfd.global_err.ipl" value="board.icu.common.irq.priority12"/>
980980
<property id="config.driver.canfd.global_err.sources" value=""/>
981-
<property id="config.driver.canfd.global_err.cb_channel" value="config.driver.canfd.global_err.cb_channel.0"/>
981+
<property id="config.driver.canfd.global_err.cb_channel" value="config.driver.canfd.global_err.cb_channel.1"/>
982982
<property id="config.driver.canfd.tx_priority" value="config.driver.canfd.tx_priority.buffer"/>
983983
<property id="config.driver.canfd.dlc_check" value="config.driver.canfd.dlc_check.disabled"/>
984984
<property id="config.driver.canfd.fd.standard" value="config.driver.canfd.fd.standard.iso"/>
985985
<property id="config.driver.canfd.fd.protocol_exception" value="config.driver.canfd.fd.protocol_exception.iso"/>
986986
<property id="config.driver.canfd.fd.overflow" value="config.driver.canfd.fd.overflow.reject"/>
987-
<property id="config.driver.canfd.rxmb.number" value="0"/>
987+
<property id="config.driver.canfd.rxmb.number" value="2"/>
988988
<property id="config.driver.canfd.rxmb.size" value="config.driver.canfd.rxmb.size.8"/>
989989
<property id="config.driver.canfd.rxfifo.ipl" value="board.icu.common.irq.priority12"/>
990990
<property id="config.driver.canfd.rxfifo.0.enable" value="config.driver.canfd.rxfifo.0.enable.enabled"/>
991991
<property id="config.driver.canfd.rxfifo.0.int_mode" value="enum.driver.canfd.fifo.int_mode.every_frame"/>
992992
<property id="config.driver.canfd.rxfifo.0.int_threshold" value="enum.driver.canfd.fifo.int_threshold.1_2"/>
993993
<property id="config.driver.canfd.rxfifo.0.payload" value="enum.driver.canfd.fifo.payload.8"/>
994994
<property id="config.driver.canfd.rxfifo.0.depth" value="enum.driver.canfd.fifo.depth.16"/>
995-
<property id="config.driver.canfd.rxfifo.1.enable" value="config.driver.canfd.rxfifo.1.enable.disabled"/>
995+
<property id="config.driver.canfd.rxfifo.1.enable" value="config.driver.canfd.rxfifo.1.enable.enabled"/>
996996
<property id="config.driver.canfd.rxfifo.1.int_mode" value="enum.driver.canfd.fifo.int_mode.every_frame"/>
997997
<property id="config.driver.canfd.rxfifo.1.int_threshold" value="enum.driver.canfd.fifo.int_threshold.1_2"/>
998998
<property id="config.driver.canfd.rxfifo.1.payload" value="enum.driver.canfd.fifo.payload.8"/>
@@ -1027,8 +1027,8 @@
10271027
<property id="config.driver.canfd.rxfifo.7.int_threshold" value="enum.driver.canfd.fifo.int_threshold.1_2"/>
10281028
<property id="config.driver.canfd.rxfifo.7.payload" value="enum.driver.canfd.fifo.payload.8"/>
10291029
<property id="config.driver.canfd.rxfifo.7.depth" value="enum.driver.canfd.fifo.depth.16"/>
1030-
<property id="config.driver.canfd.afl.ch0_num" value="32"/>
1031-
<property id="config.driver.canfd.afl.ch1_num" value="0"/>
1030+
<property id="config.driver.canfd.afl.ch0_num" value="1"/>
1031+
<property id="config.driver.canfd.afl.ch1_num" value="1"/>
10321032
</config>
10331033
<config id="config.driver.gpt">
10341034
<property id="config.driver.gpt.param_checking_enable" value="config.driver.gpt.param_checking_enable.bsp"/>

extras/e2studioProjects/portenta_h33_lib/ra_cfg.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,24 +289,24 @@ FSP Configuration
289289
Parameter Checking: Default (BSP)
290290

291291
Module "CAN FD (r_canfd)"
292-
Parameter Checking: Default (BSP)
292+
Parameter Checking: Enabled
293293
Global Error Interrupt: Priority: Priority 12
294294
Global Error Interrupt: Sources:
295-
Global Error Interrupt: Callback Channel: Channel 0
295+
Global Error Interrupt: Callback Channel: Channel 1
296296
Transmission Priority: Buffer Number
297297
DLC Check: Disabled
298298
Flexible Data (FD): FD Frame Format: ISO 11898-1
299299
Flexible Data (FD): Protocol Exceptions: Enabled (ISO 11898-1)
300300
Flexible Data (FD): Payload Overflow: Reject
301-
Reception: Message Buffers: Number of Buffers: 0
301+
Reception: Message Buffers: Number of Buffers: 2
302302
Reception: Message Buffers: Payload Size: 8 bytes
303303
Reception: FIFOs: Interrupt Priority: Priority 12
304304
Reception: FIFOs: FIFO 0: Enable: Enabled
305305
Reception: FIFOs: FIFO 0: Interrupt Mode: Every Frame
306306
Reception: FIFOs: FIFO 0: Interrupt Threshold: 1/2 full
307307
Reception: FIFOs: FIFO 0: Payload Size: 8 bytes
308308
Reception: FIFOs: FIFO 0: Depth: 16 stages
309-
Reception: FIFOs: FIFO 1: Enable: Disabled
309+
Reception: FIFOs: FIFO 1: Enable: Enabled
310310
Reception: FIFOs: FIFO 1: Interrupt Mode: Every Frame
311311
Reception: FIFOs: FIFO 1: Interrupt Threshold: 1/2 full
312312
Reception: FIFOs: FIFO 1: Payload Size: 8 bytes
@@ -341,8 +341,8 @@ FSP Configuration
341341
Reception: FIFOs: FIFO 7: Interrupt Threshold: 1/2 full
342342
Reception: FIFOs: FIFO 7: Payload Size: 8 bytes
343343
Reception: FIFOs: FIFO 7: Depth: 16 stages
344-
Reception: Acceptance Filtering: Channel 0 Rule Count: 32
345-
Reception: Acceptance Filtering: Channel 1 Rule Count: 0
344+
Reception: Acceptance Filtering: Channel 0 Rule Count: 1
345+
Reception: Acceptance Filtering: Channel 1 Rule Count: 1
346346

347347
Module "I2C Master (r_iic_master)"
348348
Parameter Checking: Default (BSP)

0 commit comments

Comments
 (0)