Skip to content

Commit 104b5ff

Browse files
committed
Commit relevant changes to e2studio project.
Former-commit-id: a068c8c
1 parent 8d173b7 commit 104b5ff

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

extras/e2studioProjects/portenta_h33_lib/configuration.xml

+6-6
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

+6-6
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)

variants/PORTENTA_H33/includes/ra_cfg/fsp_cfg/r_canfd_cfg.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
extern "C" {
66
#endif
77

8-
/* Buffer RAM used: 320 bytes */
8+
/* Buffer RAM used: 680 bytes */
99

10-
#define CANFD_CFG_PARAM_CHECKING_ENABLE ((BSP_CFG_PARAM_CHECKING_ENABLE))
10+
#define CANFD_CFG_PARAM_CHECKING_ENABLE ((1))
1111

12-
#define CANFD_CFG_AFL_CH0_RULE_NUM (32)
13-
#define CANFD_CFG_AFL_CH1_RULE_NUM (0)
12+
#define CANFD_CFG_AFL_CH0_RULE_NUM (1)
13+
#define CANFD_CFG_AFL_CH1_RULE_NUM (1)
1414

15-
#define CANFD_CFG_GLOBAL_ERROR_CH ((0U))
15+
#define CANFD_CFG_GLOBAL_ERROR_CH ((1U))
1616

1717
#define CANFD_CFG_FD_STANDARD ((0))
1818
#define CANFD_CFG_FD_PROTOCOL_EXCEPTION ((0))
@@ -21,7 +21,7 @@
2121
#define CANFD_CFG_TX_PRIORITY ((R_CANFD_CFDGCFG_TPRI_Msk))
2222
#define CANFD_CFG_DLC_CHECK ((0))
2323
#define CANFD_CFG_FD_OVERFLOW ((0))
24-
#define CANFD_CFG_RXMB_NUMBER (0)
24+
#define CANFD_CFG_RXMB_NUMBER (2)
2525
#define CANFD_CFG_RXMB_SIZE ((0))
2626
#define CANFD_CFG_GLOBAL_ERR_IPL ((12))
2727
#define CANFD_CFG_RX_FIFO_IPL ((12))
@@ -36,7 +36,7 @@
3636
#define CANFD_CFG_RXFIFO1_DEPTH ((3))
3737
#define CANFD_CFG_RXFIFO1_PAYLOAD ((0))
3838
#define CANFD_CFG_RXFIFO1_INT_MODE ((R_CANFD_CFDRFCC_RFIE_Msk | R_CANFD_CFDRFCC_RFIM_Msk))
39-
#define CANFD_CFG_RXFIFO1_ENABLE ((0))
39+
#define CANFD_CFG_RXFIFO1_ENABLE ((1))
4040

4141
#define CANFD_CFG_RXFIFO2_INT_THRESHOLD ((3U))
4242
#define CANFD_CFG_RXFIFO2_DEPTH ((3))
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ffcfdd8d4197bb105a38a36a52f312037985ac15
1+
8945caa5a3ce0d1225ec67da5e460d9d5c379cd3

0 commit comments

Comments
 (0)