Skip to content

Commit dcd90cb

Browse files
TatsuyaOgawanxTatsuyaOgawanx
authored
Merge pull request #41 from nam-ng/6.2.1-rx-1.0.1-rc
Update for v6.2.1_rel-rx-1.0.1 RC
2 parents ce755c1 + 39dd61e commit dcd90cb

Some content is hidden

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

53 files changed

+601
-3390
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
url = https://github.com/azure-rtos/usbx/
1919
[submodule "embedded-wireless-framework"]
2020
path = embedded-wireless-framework
21-
url = https://github.com/Azure/embedded-wireless-framework
21+
url = https://github.com/renesas/embedded-wireless-framework

‎README.md

+3
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ This Azure RTOS repository that includes some modules (ThreadX/NetX/FileX/etc) a
336336
</table>
337337

338338
## History
339+
* 6.2.1_rel-rx-1.0.1
340+
* Update EWF library to the latest version
341+
* Update SDK samples with EWF to use the latest codes (fixed debug off and iothub connection issue)
339342
* 6.2.1_rel-rx-1.0.0
340343
* Update Azure RTOS libraries to 6.2.1_rel
341344
* Support CC-RX for IoT Embedded SDK samples using EWF

‎configuration/azure-rtos.xml

+23-14
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<package>
5050
<type>rtosmodule</type>
5151
<name>AzureRTOS</name>
52-
<version>6.2.1_rel-rx-1.0.0</version>
52+
<version>6.2.1_rel-rx-1.0.1</version>
5353
<application>AzureRTOS</application>
5454
<apps>
5555
<app id="application" value="bare" name="ThreadX sample project" description="Project includes ThreadX, BSP, and CMT. This sample is the standard 8-thread ThreadX example, that illustrates the use of the main ThreadX services, including threads, message queues, timers, semaphores, byte memory pools, block memory pools, event flag groups, and mutexes">
@@ -1498,7 +1498,7 @@
14981498
</impdir>
14991499
<impdir>
15001500
<file>netxduo/addons/azure_iot/samples/sample_azure_iot_embedded_sdk.c</file>
1501-
<file>netxduo/addons/azure_iot/samples/sample_azure_iot_embedded_sdk_connect.c</file>
1501+
<file>configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/src/sample_azure_iot_embedded_sdk_connect.c</file>
15021502
<path>src</path>
15031503
</impdir>
15041504
<impdir>
@@ -2083,6 +2083,13 @@
20832083
<file>configuration/samples/iot_sdk_pnp/common/sample_device_identity.c</file>
20842084
<path>src</path>
20852085
</impdir>
2086+
<impdir>
2087+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/demo_printf.c</file>
2088+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/hardware_setup.c</file>
2089+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/main.c</file>
2090+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/sample_config.h</file>
2091+
<path>src</path>
2092+
</impdir>
20862093
<impdir>
20872094
<folder>netxduo/addons/azure_iot/samples/cert</folder>
20882095
<path>src</path>
@@ -2094,8 +2101,8 @@
20942101
</impdir>
20952102
<impdir>
20962103
<board>CK-RX65N</board>
2097-
<folder>configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_pincfg</folder>
2098-
<path>src/smc_gen/r_pincfg</path>
2104+
<folder>configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen</folder>
2105+
<path>src/smc_gen</path>
20992106
</impdir>
21002107
<impdir>
21012108
<toolchain>GNURX</toolchain>
@@ -2112,7 +2119,7 @@
21122119
<impdir>
21132120
<toolchain>GNURX</toolchain>
21142121
<board>CK-RX65N</board>
2115-
<file>configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/linker_script.ld</file>
2122+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/linker_script.ld</file>
21162123
<path>src</path>
21172124
</impdir>
21182125
<!-- copy readme common -->
@@ -2190,7 +2197,7 @@
21902197
<!-- scfg template -->
21912198
<scfgtemplate>
21922199
<board>CK-RX65N</board>
2193-
<path>configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/CK-RX65N-iot-sdk-pnp-ewf_scfg.ftl</path>
2200+
<path>configuration/samples/iot_sdk_ewf/ck-rx65n/CK-RX65N-iot-sdk-ewf_scfg.ftl</path>
21942201
</scfgtemplate>
21952202
<!-- compiler setting -->
21962203
<!-- set RXC linker section -->
@@ -2669,16 +2676,18 @@
26692676
<path>src</path>
26702677
</impdir>
26712678
<impdir>
2672-
<folder>configuration/samples/temperature_pnp/common</folder>
2679+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/demo_printf.c</file>
2680+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/hardware_setup.c</file>
2681+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/main.c</file>
2682+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/src/sample_config.h</file>
26732683
<path>src</path>
26742684
</impdir>
26752685
<impdir>
2676-
<folder>netxduo/addons/azure_iot/samples/cert</folder>
2686+
<folder>configuration/samples/temperature_pnp/common</folder>
26772687
<path>src</path>
26782688
</impdir>
26792689
<impdir>
2680-
<board>CK-RX65N</board>
2681-
<folder>configuration/samples/temperature_pnp_ewf/ck-rx65n/src</folder>
2690+
<folder>netxduo/addons/azure_iot/samples/cert</folder>
26822691
<path>src</path>
26832692
</impdir>
26842693
<impdir>
@@ -2688,8 +2697,8 @@
26882697
</impdir>
26892698
<impdir>
26902699
<board>CK-RX65N</board>
2691-
<folder>configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_pincfg</folder>
2692-
<path>src/smc_gen/r_pincfg</path>
2700+
<folder>configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen</folder>
2701+
<path>src/smc_gen</path>
26932702
</impdir>
26942703
<impdir>
26952704
<toolchain>GNURX</toolchain>
@@ -2706,7 +2715,7 @@
27062715
<impdir>
27072716
<toolchain>GNURX</toolchain>
27082717
<board>CK-RX65N</board>
2709-
<file>configuration/samples/temperature_pnp_ewf/ck-rx65n/linker_script.ld</file>
2718+
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/linker_script.ld</file>
27102719
<path>src</path>
27112720
</impdir>
27122721
<!-- copy readme common -->
@@ -2784,7 +2793,7 @@
27842793
<!-- scfg template -->
27852794
<scfgtemplate>
27862795
<board>CK-RX65N</board>
2787-
<path>configuration/samples/temperature_pnp_ewf/ck-rx65n/CK-RX65N-temperature-pnp-ewf_scfg.ftl</path>
2796+
<path>configuration/samples/iot_sdk_ewf/ck-rx65n/CK-RX65N-iot-sdk-ewf_scfg.ftl</path>
27882797
</scfgtemplate>
27892798
<!-- compiler setting -->
27902799
<!-- set RXC linker section -->

‎configuration/config_files/ewf.config.h

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ extern "C" {
5454
#define EWF_LOG(...)
5555
#endif
5656

57+
/** Define enable EWF usage with Azure RTOS NETX */
58+
#define EWF_CONFIG_AZURE_RTOS_NETX 0
5759

5860
/************************************************************************//**
5961
* @} *** group_configuration

‎configuration/ewf.mdf

+6
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
<constraint display="default disable" actionOnFail="disable">("${USE_EWF_DEBUG}" == 1)</constraint>
3434
<description />
3535
</property>
36+
<!-- EWF_CONFIG_AZURE_RTOS_NETX -->
37+
<property id="EWF_CONFIG_AZURE_RTOS_NETX" display="EWF usage with Azure Netxduo" default="0" type="checkbox">
38+
<option id="EWF_CONFIG_AZURE_RTOS_NETX.0" display="Disable" value="0" />
39+
<option id="EWF_CONFIG_AZURE_RTOS_NETX.1" display="Enable" value="1" />
40+
<description />
41+
</property>
3642
<!-- EWF SCI configurations -->
3743
<property id="EWF_CELLULAR_CFG_UART_SCI_CH" display="Specify SCI channel used for communication with cellular module" default="6" type="combobox">
3844
<option id="EWF_CELLULAR_CFG_UART_SCI_CH.0" display="0" value="0"/>

‎configuration/ewf.xml

+6-22
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<package>
55
<type>rtosmodule</type>
66
<name>ewf</name>
7-
<version>6.2.1_rel-rx-1.0.0</version>
7+
<version>6.2.1_rel-rx-1.0.1</version>
88
<application>AzureRTOSLibrary</application>
99
<category>rtos.library</category>
1010
<desc>Azure Embedded Wireless Framework (Preliminary version)</desc>
1111
<details>This is preliminary version of EWF for the demonstration purpose. EWF simplifies connecting small devices to the internet using different connectivity adapters</details>
1212
<moduleinfo>> This is preliminary version
13-
Package version 6.2.1_rel-rx-1.0.0</moduleinfo>
13+
Package version 6.2.1_rel-rx-1.0.1</moduleinfo>
1414
<function>RTOS</function>
1515
<dependency>
1616
<module>netxduo</module>
@@ -77,6 +77,7 @@ Package version 6.2.1_rel-rx-1.0.0</moduleinfo>
7777
<file>embedded-wireless-framework/src/ewf_adapter_renesas_common_mqtt_basic.c</file>
7878
<file>embedded-wireless-framework/src/ewf_adapter_renesas_common_nvm.c</file>
7979
<file>embedded-wireless-framework/src/ewf_adapter_renesas_common_tls_basic.c</file>
80+
<file>embedded-wireless-framework/src/ewf_adapter_renesas_common_tokenizer.c</file>
8081
<file>embedded-wireless-framework/src/ewf_adapter_renesas_common_urc.c</file>
8182
<file>embedded-wireless-framework/src/ewf_adapter_renesas_ryz014.c</file>
8283
<file>embedded-wireless-framework/src/ewf_adapter_renesas_ryz014.h</file>
@@ -101,17 +102,12 @@ Package version 6.2.1_rel-rx-1.0.0</moduleinfo>
101102
<file>embedded-wireless-framework/src/ewf_platform.h</file>
102103
<file>embedded-wireless-framework/src/ewf_platform_threadx.c</file>
103104
<file>embedded-wireless-framework/src/ewf_platform_threadx.h</file>
105+
<file>embedded-wireless-framework/src/ewf_tokenizer_basic.c</file>
106+
<file>embedded-wireless-framework/src/ewf_tokenizer_basic.h</file>
107+
<file>embedded-wireless-framework/src/ewf_tokenizer.c</file>
104108
<file>embedded-wireless-framework/src/ewf_tokenizer.h</file>
105109
<path>libs/ewf/src</path>
106110
</impdir>
107-
<!-- copy patch file for Packet data protocol type IP -->
108-
<impdir>
109-
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/libs/ewf/src/ewf_adapter_api_modem_packet_domain.h</file>
110-
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/libs/ewf/src/ewf_lib.c</file>
111-
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/libs/ewf/src/ewf_interface_rx_uart.h</file>
112-
<file>configuration/samples/iot_sdk_ewf/ck-rx65n/libs/ewf/src/ewf_interface_rx_uart.c</file>
113-
<path>libs/ewf/src</path>
114-
</impdir>
115111
<impdir>
116112
<file>configuration/libs/ewf/ewf_cellular_private.h</file>
117113
<file>configuration/libs/ewf/ewf_cellular_config.h</file>
@@ -122,17 +118,5 @@ Package version 6.2.1_rel-rx-1.0.0</moduleinfo>
122118
<path>libs/ewf</path>
123119
<path>libs/ewf/src</path>
124120
</incdir>
125-
<excludebuild>
126-
<path>libs/ewf/src/ewf_adapter_renesas_common.c</path>
127-
<path>libs/ewf/src/ewf_adapter_renesas_common_control.c</path>
128-
<path>libs/ewf/src/ewf_adapter_renesas_common_info.c</path>
129-
<path>libs/ewf/src/ewf_adapter_renesas_common_internet.c</path>
130-
<path>libs/ewf/src/ewf_adapter_renesas_common_mqtt_basic.c</path>
131-
<path>libs/ewf/src/ewf_adapter_renesas_common_nvm.c</path>
132-
<path>libs/ewf/src/ewf_adapter_renesas_common_tls_basic.c</path>
133-
<path>libs/ewf/src/ewf_adapter_renesas_common_urc.c</path>
134-
<path>libs/ewf/src/ewf_adapter_renesas_ryz024a.c</path>
135-
<path>libs/ewf/src/ewf_adapter_renesas_ryz024a.h</path>
136-
</excludebuild>
137121
</package>
138122
</refinfo>

‎configuration/filex.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package>
55
<type>rtosmodule</type>
66
<name>filex</name>
7-
<version>6.2.1_rel-rx-1.0.0</version>
7+
<version>6.2.1_rel-rx-1.0.1</version>
88
<application>AzureRTOSLibrary</application>
99
<desc>Azure RTOS FileX</desc>
1010
<details>Azure RTOS FileX is a high-performance, FAT-compatible file system that’s fully integrated with Azure RTOS ThreadX</details>

‎configuration/guix.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package>
55
<type>rtosmodule</type>
66
<name>guix</name>
7-
<version>6.2.1_rel-rx-1.0.0</version>
7+
<version>6.2.1_rel-rx-1.0.1</version>
88
<application>AzureRTOSLibrary</application>
99
<category>rtos.library</category>
1010
<desc>Azure RTOS GUIX</desc>

‎configuration/netxduo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package>
55
<type>rtosmodule</type>
66
<name>netxduo</name>
7-
<version>6.2.1_rel-rx-1.0.0</version>
7+
<version>6.2.1_rel-rx-1.0.1</version>
88
<application>AzureRTOSLibrary</application>
99
<desc>Azure RTOS NetX Duo</desc>
1010
<details>Azure RTOS NetX Duo is an advanced, industrial-grade TCP/IP network stack designed specifically for deeply embedded real-time and IoT applications</details>

‎configuration/netxduo_addons.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package>
55
<type>rtosmodule</type>
66
<name>netxduo_addons</name>
7-
<version>6.2.1_rel-rx-1.0.0</version>
7+
<version>6.2.1_rel-rx-1.0.1</version>
88
<application>AzureRTOSLibrary</application>
99
<desc>Azure RTOS NetX Duo Addons</desc>
1010
<details>Azure RTOS NetX Duo Addons provide additional libraries for NetX Duo such as azure_iot (azure-sdk-for-c), cloud, dhcp, dns, http, mqtt, nat, smtp, snmp etc.</details>

‎configuration/samples/iot_sdk/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ the sample program can not communicate with RYZ014A module.
3030
For the details of issue and workaround, please refer to this link
3131
https://github.com/Azure/embedded-wireless-framework/issues/16
3232

33-
The issue will be fixed at next update of software package.
33+
The issue is fixed from software package v6.2.1_rel-rx-1.0.1

‎configuration/samples/iot_sdk_ewf/ck-rx65n/CK-RX65N-iot-sdk-ewf_scfg.ftl

+9-10
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,12 @@
3636
</configuration>
3737
<configuration enable="true" exclude="false" inuse="true" name="netxduo">
3838
<component display="Azure RTOS NetX Duo" id="netxduo${packageVersion}" version="${packageVersion}">
39-
<gridItem id="USE_NX_ENABLE_TCPIP_OFFLOAD" selectedIndex="1"/>
40-
<gridItem id="USE_NX_ENABLE_INTERFACE_CAPABILITY" selectedIndex="1"/>
41-
<gridItem id="USE_NX_DNS_CLIENT_USER_CREATE_PACKET_POOL" selectedIndex="1"/>
42-
<gridItem id="USE_NX_DNS_CLIENT_CLEAR_QUEUE" selectedIndex="1"/>
43-
<gridItem id="USE_NX_SNTP_CLIENT_MIN_SERVER_STRATUM" selectedIndex="1"/>
44-
<gridItem id="USE_NX_SNTP_CLIENT_MAX_ROOT_DISPERSION" selectedIndex="1"/>
45-
<gridItem id="USE_NX_SNTP_CURRENT_YEAR" selectedIndex="1"/>
39+
<gridItem id="USE_NX_ENABLE_TCPIP_OFFLOAD" selectedIndex="1"/>
40+
<gridItem id="USE_NX_ENABLE_INTERFACE_CAPABILITY" selectedIndex="1"/>
41+
<gridItem id="USE_NX_DNS_CLIENT_USER_CREATE_PACKET_POOL" selectedIndex="1"/>
42+
<gridItem id="USE_NX_DNS_CLIENT_CLEAR_QUEUE" selectedIndex="1"/>
43+
<gridItem id="USE_NX_SNTP_CLIENT_MAX_ROOT_DISPERSION" selectedIndex="1"/>
44+
<gridItem id="USE_NX_SNTP_CURRENT_YEAR" selectedIndex="1"/>
4645
</component>
4746
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
4847
</configuration>
@@ -51,12 +50,13 @@
5150
</component>
5251
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
5352
</configuration>
54-
<configuration enable="true" exclude="false" inuse="true" name="ewf">
53+
<configuration enable="true" exclude="false" inuse="true" name="ewf">
5554
<component display="Azure Embedded Wireless Framework" id="ewf${packageVersion}" version="${packageVersion}">
55+
<gridItem id="EWF_CONFIG_AZURE_RTOS_NETX" selectedIndex="1"/>
5656
</component>
5757
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
5858
</configuration>
59-
<configuration enable="true" exclude="false" inuse="true" name="azurertos_object">
59+
<configuration enable="true" exclude="false" inuse="true" name="azurertos_object">
6060
<allocatable id="" name="" type="">
6161
<allocatable id="THREAD" name="THREAD" type="TABALLOCATABLE">
6262
<allocatable id="THREAD1" name="THREAD1" type="ROWALLOCATABLE">
@@ -100,7 +100,6 @@
100100
<gridItem id="SCI_CFG_CH6_INCLUDED" selectedIndex="1"/>
101101
<gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
102102
<gridItem id="SCI_CFG_CH5_TX_BUFSIZ" selectedIndex="2048"/>
103-
<gridItem id="SCI_CFG_CH5_RX_BUFSIZ" selectedIndex="2048"/>
104103
<gridItem id="SCI_CFG_CH6_TX_BUFSIZ" selectedIndex="4096"/>
105104
<gridItem id="SCI_CFG_CH6_RX_BUFSIZ" selectedIndex="8192"/>
106105
</component>

0 commit comments

Comments
 (0)