Skip to content

Commit 9e5e72c

Browse files
TatsuyaOgawanxTatsuyaOgawanx
authored
Merge pull request #51 from nam-ng/6.2.1-rx-1.3.0-rc2
Update for v6.2.1_rel-rx-1.3.0 RC2
2 parents 72e018c + 281e536 commit 9e5e72c

File tree

9 files changed

+826
-0
lines changed

9 files changed

+826
-0
lines changed

‎configuration/azure-rtos.xml

+58
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,22 @@
2525
<board>MCB-RX26T Type A</board>
2626
<board>MCB-RX26T Type B</board>
2727
<board>RSKRX65N-2MB</board>
28+
<board>RSKRX65N-2MB(DUAL)</board>
2829
<board>RSKRX65N-2MB(TSIP)</board>
30+
<board>RSKRX65N-2MB(TSIP)(DUAL)</board>
2931
<board>RX65NCloudKit</board>
3032
<board>CloudKitRX65N</board>
33+
<board>CloudKitRX65N(DUAL)</board>
3134
<board>CK-RX65N</board>
35+
<board>CK-RX65N(DUAL)</board>
3236
<board>RSKRX660</board>
3337
<board>RSKRX66T</board>
3438
<board>RSKRX66T(TSIP)</board>
3539
<board>RSKRX671</board>
40+
<board>RSKRX671(DUAL)</board>
3641
<board>RX72NEnvisionKit</board>
3742
<board>EnvisionKitRX72N</board>
43+
<board>EnvisionKitRX72N(DUAL)</board>
3844
<family>RX</family>
3945
<series>RX100</series>
4046
<series>RX200</series>
@@ -331,6 +337,9 @@
331337
<board>RSKRX671</board>
332338
<board>RX72NEnvisionKit</board>
333339
<board>EnvisionKitRX72N</board>
340+
<memoryreq>
341+
<group>RX651</group>
342+
</memoryreq>
334343
<memoryreq>
335344
<group>RX23E-B</group>
336345
<group>RX23EB</group>
@@ -362,6 +371,11 @@
362371
<file>configuration/samples/minimal/ck-rx65n/src/rtos_skeleton/sample_entry.c</file>
363372
<path>src/rtos_skeleton</path>
364373
</impdir>
374+
<impdir>
375+
<group>RX651</group>
376+
<file>configuration/samples/minimal/ck-rx65n/src/rtos_skeleton/sample_entry.c</file>
377+
<path>src/rtos_skeleton</path>
378+
</impdir>
365379
<impdir>
366380
<group>RX23E-B</group>
367381
<group>RX23EB</group>
@@ -397,6 +411,11 @@
397411
<file>configuration/samples/minimal/ck-rx65n/src/demo_printf.h</file>
398412
<path>src</path>
399413
</impdir>
414+
<impdir>
415+
<group>RX651</group>
416+
<file>configuration/samples/minimal/ck-rx65n/src/demo_printf.h</file>
417+
<path>src</path>
418+
</impdir>
400419
<impdir>
401420
<group>RX23E-B</group>
402421
<group>RX23EB</group>
@@ -443,6 +462,11 @@
443462
<folder>configuration/samples/minimal/rsk-rx65n-2mb/src</folder>
444463
<path>src</path>
445464
</impdir>
465+
<impdir>
466+
<group>RX651</group>
467+
<folder>configuration/samples/minimal/rx651/src</folder>
468+
<path>src</path>
469+
</impdir>
446470
<impdir>
447471
<board>RX65NCloudKit</board>
448472
<board>CloudKitRX65N</board>
@@ -504,6 +528,7 @@
504528
<impdir>
505529
<group>RX23E-B</group>
506530
<group>RX23EB</group>
531+
<group>RX651</group>
507532
<folder>rx-driver-package/source/r_byteq/r_byteq_vx.xx/r_byteq</folder>
508533
<path>src/smc_gen/r_byteq</path>
509534
</impdir>
@@ -526,6 +551,7 @@
526551
<impdir>
527552
<group>RX23E-B</group>
528553
<group>RX23EB</group>
554+
<group>RX651</group>
529555
<folder>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/doc</folder>
530556
<path>src/smc_gen/r_sci_rx/doc</path>
531557
</impdir>
@@ -565,6 +591,11 @@
565591
<folder>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/src/targets/rx65n</folder>
566592
<path>src/smc_gen/r_sci_rx/src/targets/rx65n</path>
567593
</impdir>
594+
<impdir>
595+
<group>RX651</group>
596+
<folder>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/src/targets/rx65n</folder>
597+
<path>src/smc_gen/r_sci_rx/src/targets/rx65n</path>
598+
</impdir>
568599
<impdir>
569600
<board>RX72NEnvisionKit</board>
570601
<board>EnvisionKitRX72N</board>
@@ -596,6 +627,7 @@
596627
<impdir>
597628
<group>RX23E-B</group>
598629
<group>RX23EB</group>
630+
<group>RX651</group>
599631
<file>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/src/r_sci_rx.c</file>
600632
<file>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/src/r_sci_rx_dmaca.c</file>
601633
<file>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/src/r_sci_rx_dmaca.h</file>
@@ -625,6 +657,7 @@
625657
<impdir>
626658
<group>RX23E-B</group>
627659
<group>RX23EB</group>
660+
<group>RX651</group>
628661
<file>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/r_sci_rx_if.h</file>
629662
<file>rx-driver-package/source/r_sci_rx/r_sci_rx_vx.xx/r_sci_rx/readme.txt</file>
630663
<path>src/smc_gen/r_sci_rx</path>
@@ -806,6 +839,15 @@
806839
<path>src/smc_gen/r_sci_rx</path>
807840
<path>src/smc_gen/r_sci_rx/src</path>
808841
</incdir>
842+
<incdir>
843+
<group>RX23E-B</group>
844+
<group>RX23EB</group>
845+
<group>RX651</group>
846+
<path>src/smc_gen/r_byteq</path>
847+
<path>src/smc_gen/r_byteq/src</path>
848+
<path>src/smc_gen/r_sci_rx</path>
849+
<path>src/smc_gen/r_sci_rx/src</path>
850+
</incdir>
809851
<!-- scfg template -->
810852
<scfgtemplate>
811853
<toolchain>RXC</toolchain>
@@ -858,6 +900,10 @@
858900
<board>RSKRX65N-2MB(TSIP)</board>
859901
<path>configuration/samples/minimal/rsk-rx65n-2mb/RSK-RX65N-2MB-minimal_scfg.ftl</path>
860902
</scfgtemplate>
903+
<scfgtemplate>
904+
<group>RX651</group>
905+
<path>configuration/samples/minimal/rx651/RX651-minimal_scfg.ftl</path>
906+
</scfgtemplate>
861907
<scfgtemplate>
862908
<board>RX65NCloudKit</board>
863909
<board>CloudKitRX65N</board>
@@ -5635,6 +5681,18 @@
56355681
</sections>
56365682
<removesections>
56375683
<toolchain>RXC</toolchain>
5684+
<board>RSKRX65N-2MB</board>
5685+
<board>RSKRX65N-2MB(DUAL)</board>
5686+
<board>RSKRX65N-2MB(TSIP)</board>
5687+
<board>RSKRX65N-2MB(TSIP)(DUAL)</board>
5688+
<board>RX65NCloudKit</board>
5689+
<board>CloudKitRX65N</board>
5690+
<board>CloudKitRX65N(DUAL)</board>
5691+
<board>CK-RX65N</board>
5692+
<board>CK-RX65N(DUAL)</board>
5693+
<board>RX72NEnvisionKit</board>
5694+
<board>EnvisionKitRX72N</board>
5695+
<board>EnvisionKitRX72N(DUAL)</board>
56385696
<section>
56395697
<name>D*</name>
56405698
</section>

‎configuration/samples/minimal/rx651/RX651-minimal_scfg.ftl

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<smc>
3+
<general version="2.0.0.0">
4+
<configuration active="true" id="${configurationTypeReleaseID}">
5+
<property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
6+
<toolchain id="${toolChainID}">
7+
<option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
8+
<option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.azurertos">
9+
<item id="com.renesas.smc.toolchain.option.rtos.azurertos" value="${packageVersion}"/>
10+
</option>
11+
</toolchain>
12+
</configuration>
13+
<platform id="${targetDevice}"/>
14+
</general>
15+
<tool id="SWComponent" version="1.0.0.0">
16+
<configuration inuse="true" name="r_bsp">
17+
<component display="r_bsp" id="r_bsp7.41" version="7.41">
18+
</component>
19+
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
20+
</configuration>
21+
<configuration inuse="true" name="r_cmt_rx">
22+
<component display="r_cmt_rx" id="r_cmt_rx5.60" version="5.60">
23+
<gridItem id="CMT_CFG_CH0_EN_NESTED_INT" selectedIndex="1"/>
24+
</component>
25+
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
26+
</configuration>
27+
<configuration inuse="true" name="r_sci_rx">
28+
<component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.90" version="4.90">
29+
<gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
30+
<gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
31+
</component>
32+
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
33+
</configuration>
34+
<configuration inuse="true" name="r_byteq">
35+
<component detailDescription="Byte-based circular buffer library." display="r_byteq" id="r_byteq2.10" version="2.10">
36+
</component>
37+
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
38+
</configuration>
39+
<configuration inuse="true" name="r_gpio_rx">
40+
<component display="r_gpio_rx" id="r_gpio_rx5.00" version="5.00">
41+
</component>
42+
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
43+
</configuration>
44+
<configuration enable="true" exclude="false" inuse="true" name="threadx">
45+
<component display="Azure RTOS ThreadX" id="threadx${packageVersion}" version="${packageVersion}">
46+
</component>
47+
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
48+
</configuration>
49+
<configuration enable="true" exclude="false" inuse="true" name="azurertos_object">
50+
<allocatable id="" name="" type="">
51+
<allocatable id="THREAD" name="THREAD" type="TABALLOCATABLE">
52+
<allocatable id="THREAD1" name="THREAD1" type="ROWALLOCATABLE">
53+
<option defaultValue="new_thread[X]" id="threadpointer" value="sample"/>
54+
<option defaultValue="New Thread" id="threadname" value="sample_thread"/>
55+
<option defaultValue="new_thread[X]_entry" id="entryfunction" value="sample_entry"/>
56+
<option defaultValue="0" id="entryinput" value="0"/>
57+
<option defaultValue="1024" id="stacksize" value="1024"/>
58+
<option defaultValue="1" id="priority" value="16"/>
59+
<option defaultValue="1" id="preemptionthreshold" value="16"/>
60+
<option defaultValue="0" id="timeslice" value="0"/>
61+
<option defaultValue="TX_AUTO_START" id="autostart" value="TX_AUTO_START"/>
62+
</allocatable>
63+
</allocatable>
64+
</allocatable>
65+
<component display="AzureRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.azurertos.object" version="1.0.113"/>
66+
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
67+
</configuration>
68+
</tool>
69+
</smc>

‎configuration/samples/minimal/rx651/src/board_led.h

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/***********************************************************************************************************************
2+
* DISCLAIMER
3+
* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
4+
* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
5+
* applicable laws, including copyright laws.
6+
* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
7+
* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
8+
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
9+
* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
10+
* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
11+
* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
12+
* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
13+
* this software. By using this software, you agree to the additional terms and conditions found by accessing the
14+
* following link:
15+
* http://www.renesas.com/disclaimer
16+
*
17+
* Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
18+
***********************************************************************************************************************/
19+
/***********************************************************************************************************************
20+
* File Name : board_led.h
21+
* Version : 1.0
22+
* Description : board led control
23+
**********************************************************************************************************************/
24+
25+
#ifndef SRC_BOARD_H_
26+
#define SRC_BOARD_H_
27+
28+
#include "r_gpio_rx_if.h"
29+
30+
#define LED_ON (GPIO_LEVEL_LOW)
31+
#define LED_OFF (GPIO_LEVEL_HIGH)
32+
33+
/* RX651 Board LEDX */
34+
#warning "Please modify board for LED pin according to your board design."
35+
#define LED_PIN (GPIO_PORT_7_PIN_3)
36+
37+
#endif /* SRC_BOARD_H_ */

‎configuration/samples/minimal/rx651/src/demo_printf.c

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
2+
#include <stdarg.h>
3+
#include <string.h>
4+
#include <stdio.h>
5+
6+
#include <tx_api.h>
7+
8+
#include "r_cg_macrodriver.h"
9+
#include <platform.h>
10+
#include "r_sci_rx_if.h"
11+
#warning "Please include SCI_PinSet header file after setting SCI settings according to your board design."
12+
//#include "r_sci_rx_pinset.h"
13+
14+
#include "demo_printf.h"
15+
16+
#define DEMO_PRINTF_BUF_LEN (256U)
17+
18+
void demo_printf_transmit_end(void * pArgs);
19+
20+
static char demo_printf_buf[DEMO_PRINTF_BUF_LEN + 1u];
21+
22+
23+
TX_MUTEX demo_printf_mutex;
24+
TX_SEMAPHORE demo_printf_semaphore;
25+
sci_hdl_t Console;
26+
27+
void demo_printf_init(void)
28+
{
29+
UINT res;
30+
sci_cfg_t config;
31+
sci_err_t err;
32+
33+
#warning "Please modify board for SCI settings according to your board design."
34+
config.async.baud_rate = 115200;
35+
config.async.clk_src = SCI_CLK_INT;
36+
config.async.data_size = SCI_DATA_8BIT;
37+
config.async.parity_en = SCI_PARITY_OFF;
38+
config.async.parity_type = SCI_EVEN_PARITY; //
39+
config.async.stop_bits = SCI_STOPBITS_1;
40+
config.async.int_priority = 15; //
41+
err = R_SCI_Open(SCI_CH8, SCI_MODE_ASYNC, &config, demo_printf_transmit_end, &Console);
42+
43+
#warning "Please call SCI_PinSet channel according to your board design."
44+
// R_SCI_PinSet_SCI8();
45+
46+
res = tx_mutex_create(&demo_printf_mutex, "Demo printf mutex", TX_INHERIT);
47+
if(res != TX_SUCCESS) {
48+
for(;;) {}
49+
}
50+
51+
res = tx_semaphore_create(&demo_printf_semaphore, "Demo printf semaphore", 0u);
52+
if(res != TX_SUCCESS) {
53+
for(;;) {}
54+
}
55+
56+
}
57+
58+
void demo_printf(char *format, ...)
59+
{
60+
va_list v_args;
61+
size_t len;
62+
63+
tx_mutex_get(&demo_printf_mutex, TX_WAIT_FOREVER);
64+
65+
va_start(v_args, format);
66+
67+
len = (size_t)vsnprintf(&demo_printf_buf[0], sizeof(demo_printf_buf), format, v_args);
68+
69+
R_SCI_Send(Console,(uint8_t *)demo_printf_buf,len);
70+
71+
va_end(v_args);
72+
73+
tx_semaphore_get(&demo_printf_semaphore, TX_WAIT_FOREVER);
74+
75+
tx_mutex_put(&demo_printf_mutex);
76+
}
77+
78+
void demo_printf_transmit_end(void * pArgs)
79+
{
80+
sci_cb_args_t *p_args = (sci_cb_args_t*) pArgs;
81+
82+
if (SCI_EVT_TEI == p_args->event) {
83+
tx_semaphore_put(&demo_printf_semaphore);
84+
}
85+
}
86+
87+
void my_sw_charput_function(char c)
88+
{
89+
tx_mutex_get(&demo_printf_mutex, TX_WAIT_FOREVER);
90+
91+
R_SCI_Send(Console,&c,1);
92+
93+
tx_semaphore_get(&demo_printf_semaphore, TX_WAIT_FOREVER);
94+
95+
tx_mutex_put(&demo_printf_mutex);
96+
97+
return;
98+
}

0 commit comments

Comments
 (0)