From 8e0fbf76b46cc5564f7d86a7236018e16a113a5a Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Mon, 17 Apr 2023 12:15:01 +0900 Subject: [PATCH 01/12] [add] relocate the credential info on data flash --- .../ether/sample_azure_iot_embedded_sdk_pnp.c | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/configuration/samples/iot_adu/ether/sample_azure_iot_embedded_sdk_pnp.c b/configuration/samples/iot_adu/ether/sample_azure_iot_embedded_sdk_pnp.c index fa27e91..24260f6 100644 --- a/configuration/samples/iot_adu/ether/sample_azure_iot_embedded_sdk_pnp.c +++ b/configuration/samples/iot_adu/ether/sample_azure_iot_embedded_sdk_pnp.c @@ -44,12 +44,26 @@ #define SAMPLE_COMMAND_SUCCESS_STATUS (200) #define SAMPLE_COMMAND_ERROR_STATUS (500) -#define SAMPLE_PNP_MODEL_ID "dtmi:com:example:Thermostat;3" +#define SAMPLE_PNP_MODEL_ID "dtmi:com:example:Thermostat;4" #define SAMPLE_PNP_DPS_PAYLOAD "{\"modelId\":\"" SAMPLE_PNP_MODEL_ID "\"}" +/* Credential Information on DataFlash */ +#ifndef ENABLE_DPS_SAMPLE extern volatile const uint8_t df_host_name; extern volatile const uint8_t df_device_id; + +#else /* !ENABLE_DPS_SAMPLE */ + +extern volatile const uint8_t df_endpoint; +extern volatile const uint8_t df_id_scope; +extern volatile const uint8_t df_registration_id; +#endif /* ENABLE_DPS_SAMPLE */ extern volatile const uint8_t df_device_symmetric_key; +extern volatile const uint8_t df_module_id; +#if (USE_DEVICE_CERTIFICATE == 1) +extern volatile const uint8_t df_device_cert; +extern volatile const uint8_t df_device_private_key; +#endif /* USE_DEVICE_CERTIFICATE */ /* Generally, IoTHub Client and DPS Client do not run at the same time, user can use union as below to share the memory between IoTHub Client and DPS Client. @@ -389,6 +403,9 @@ UCHAR *iothub_device_id = (UCHAR *)&df_device_id; UINT iothub_hostname_length = strlen( (const char *)&df_host_name ); UINT iothub_device_id_length = strlen( (const char *)&df_device_id ); #endif /* ENABLE_DPS_SAMPLE */ +UCHAR *iothub_module_id = (UCHAR *)&df_module_id; +UINT iothub_module_id_length = strlen( (const char *)&df_module_id ); + #ifdef ENABLE_DPS_SAMPLE @@ -408,7 +425,7 @@ UINT iothub_device_id_length = strlen( (const char *)&df_device_id ); if ((status = nx_azure_iot_hub_client_initialize(iothub_client_ptr, &nx_azure_iot, iothub_hostname, iothub_hostname_length, iothub_device_id, iothub_device_id_length, - (const UCHAR *)MODULE_ID, sizeof(MODULE_ID) - 1, + iothub_module_id, iothub_module_id_length, _nx_azure_iot_tls_supported_crypto, _nx_azure_iot_tls_supported_crypto_size, _nx_azure_iot_tls_ciphersuite_map, @@ -842,13 +859,22 @@ static UINT sample_dps_entry(NX_AZURE_IOT_PROVISIONING_CLIENT *prov_client_ptr, { UINT status; +UCHAR *iothub_endpoint = (UCHAR *)&df_endpoint; +UCHAR *iothub_id_scope = (UCHAR *)&df_id_scope; +UCHAR *iothub_registration_id = (UCHAR *)&df_registration_id; + +UINT iothub_endpoint_len = strlen( (const char *)&df_endpoint ); +UINT iothub_id_scope_id_len = strlen( (const char *)&df_id_scope ); +UINT iothub_registration_id_len = strlen( (const char *)&df_registration_id ); + + LOG_TERMINAL("Start Provisioning Client...\r\n"); /* Initialize IoT provisioning client. */ if ((status = nx_azure_iot_provisioning_client_initialize(prov_client_ptr, &nx_azure_iot, - (UCHAR *)ENDPOINT, sizeof(ENDPOINT) - 1, - (UCHAR *)ID_SCOPE, sizeof(ID_SCOPE) - 1, - (UCHAR *)REGISTRATION_ID, sizeof(REGISTRATION_ID) - 1, + iothub_endpoint, iothub_endpoint_len, + iothub_id_scope, iothub_id_scope_id_len, + iothub_registration_id, iothub_registration_id_len, _nx_azure_iot_tls_supported_crypto, _nx_azure_iot_tls_supported_crypto_size, _nx_azure_iot_tls_ciphersuite_map, @@ -892,8 +918,8 @@ UINT status; #else /* Set symmetric key. */ - else if ((status = nx_azure_iot_provisioning_client_symmetric_key_set(prov_client_ptr, (UCHAR *)DEVICE_SYMMETRIC_KEY, - sizeof(DEVICE_SYMMETRIC_KEY) - 1))) + else if ((status = nx_azure_iot_provisioning_client_symmetric_key_set(prov_client_ptr, (UCHAR *)&df_device_symmetric_key, + strlen( (const char *)&df_device_symmetric_key )))) { LOG_TERMINAL("Failed on nx_azure_iot_hub_client_symmetric_key_set!: error code = 0x%08x\r\n", status); } From 3664a8fefbaacea944c1a58a3607b91645d418b5 Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Mon, 17 Apr 2023 15:31:31 +0900 Subject: [PATCH 02/12] [delete] swint setting --- .../samples/iot_adu/ck-rx65n/ether/CK-RX65N-iot-sdk-adu_scfg.ftl | 1 - .../iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl | 1 - .../samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl | 1 - .../iot_adu/rx65n-cloudkit/RX65N_Cloudkit-iot-sdk-adu_scfg.ftl | 1 - .../iot_adu/rx72n-envision-kit/RX72N_EK-iot-sdk-adu_scfg.ftl | 1 - 5 files changed, 5 deletions(-) diff --git a/configuration/samples/iot_adu/ck-rx65n/ether/CK-RX65N-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/ck-rx65n/ether/CK-RX65N-iot-sdk-adu_scfg.ftl index b0dd0d0..08c48c5 100644 --- a/configuration/samples/iot_adu/ck-rx65n/ether/CK-RX65N-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/ck-rx65n/ether/CK-RX65N-iot-sdk-adu_scfg.ftl @@ -18,7 +18,6 @@ - diff --git a/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl index a5d4f9d..134c73f 100644 --- a/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl @@ -18,7 +18,6 @@ - diff --git a/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl index 67e2044..9e90764 100644 --- a/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl @@ -19,7 +19,6 @@ - diff --git a/configuration/samples/iot_adu/rx65n-cloudkit/RX65N_Cloudkit-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/rx65n-cloudkit/RX65N_Cloudkit-iot-sdk-adu_scfg.ftl index cb3a2af..5308437 100644 --- a/configuration/samples/iot_adu/rx65n-cloudkit/RX65N_Cloudkit-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/rx65n-cloudkit/RX65N_Cloudkit-iot-sdk-adu_scfg.ftl @@ -18,7 +18,6 @@ - diff --git a/configuration/samples/iot_adu/rx72n-envision-kit/RX72N_EK-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/rx72n-envision-kit/RX72N_EK-iot-sdk-adu_scfg.ftl index 203f52c..5d9c959 100644 --- a/configuration/samples/iot_adu/rx72n-envision-kit/RX72N_EK-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/rx72n-envision-kit/RX72N_EK-iot-sdk-adu_scfg.ftl @@ -19,7 +19,6 @@ - From 04c3122c5f833635a9cccd33558314f843742650 Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Mon, 17 Apr 2023 16:51:21 +0900 Subject: [PATCH 03/12] [fix] adu section information --- .../samples/iot_adu/ck-rx65n/ether/linker_section_sample.esi | 1 - .../samples/iot_adu/rsk-rx65n-2mb/linker_section_sample.esi | 1 - .../samples/iot_adu/rsk-rx671/linker_section_sample.esi | 1 - .../samples/iot_adu/rx65n-cloudkit/linker_section_sample.esi | 1 - .../samples/iot_adu/rx72n-envision-kit/linker_section_sample.esi | 1 - 5 files changed, 5 deletions(-) diff --git a/configuration/samples/iot_adu/ck-rx65n/ether/linker_section_sample.esi b/configuration/samples/iot_adu/ck-rx65n/ether/linker_section_sample.esi index 4199b74..ed6f46e 100644 --- a/configuration/samples/iot_adu/ck-rx65n/ether/linker_section_sample.esi +++ b/configuration/samples/iot_adu/ck-rx65n/ether/linker_section_sample.esi @@ -10,7 +10,6 @@ - diff --git a/configuration/samples/iot_adu/rsk-rx65n-2mb/linker_section_sample.esi b/configuration/samples/iot_adu/rsk-rx65n-2mb/linker_section_sample.esi index 4199b74..ed6f46e 100644 --- a/configuration/samples/iot_adu/rsk-rx65n-2mb/linker_section_sample.esi +++ b/configuration/samples/iot_adu/rsk-rx65n-2mb/linker_section_sample.esi @@ -10,7 +10,6 @@ - diff --git a/configuration/samples/iot_adu/rsk-rx671/linker_section_sample.esi b/configuration/samples/iot_adu/rsk-rx671/linker_section_sample.esi index 76ea8ed..56bc7cb 100644 --- a/configuration/samples/iot_adu/rsk-rx671/linker_section_sample.esi +++ b/configuration/samples/iot_adu/rsk-rx671/linker_section_sample.esi @@ -12,7 +12,6 @@ - diff --git a/configuration/samples/iot_adu/rx65n-cloudkit/linker_section_sample.esi b/configuration/samples/iot_adu/rx65n-cloudkit/linker_section_sample.esi index 51f1334..6d1008b 100644 --- a/configuration/samples/iot_adu/rx65n-cloudkit/linker_section_sample.esi +++ b/configuration/samples/iot_adu/rx65n-cloudkit/linker_section_sample.esi @@ -10,7 +10,6 @@ - diff --git a/configuration/samples/iot_adu/rx72n-envision-kit/linker_section_sample.esi b/configuration/samples/iot_adu/rx72n-envision-kit/linker_section_sample.esi index caf4bb3..e37655d 100644 --- a/configuration/samples/iot_adu/rx72n-envision-kit/linker_section_sample.esi +++ b/configuration/samples/iot_adu/rx72n-envision-kit/linker_section_sample.esi @@ -12,7 +12,6 @@ - From fa580d620ca8ab518c4557e757847512bba4d781 Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Mon, 17 Apr 2023 19:04:03 +0900 Subject: [PATCH 04/12] [fix] boot loader section setting --- .../samples/boot_loader/ck-rx65n/ether/linker_section_sample.esi | 1 - .../samples/boot_loader/rsk-rx65n-2mb/linker_section_sample.esi | 1 - .../boot_loader/rx72n-envision-kit/linker_section_sample.esi | 1 - 3 files changed, 3 deletions(-) diff --git a/configuration/samples/boot_loader/ck-rx65n/ether/linker_section_sample.esi b/configuration/samples/boot_loader/ck-rx65n/ether/linker_section_sample.esi index c1b473b..5dbe180 100644 --- a/configuration/samples/boot_loader/ck-rx65n/ether/linker_section_sample.esi +++ b/configuration/samples/boot_loader/ck-rx65n/ether/linker_section_sample.esi @@ -10,7 +10,6 @@ - diff --git a/configuration/samples/boot_loader/rsk-rx65n-2mb/linker_section_sample.esi b/configuration/samples/boot_loader/rsk-rx65n-2mb/linker_section_sample.esi index c1b473b..5dbe180 100644 --- a/configuration/samples/boot_loader/rsk-rx65n-2mb/linker_section_sample.esi +++ b/configuration/samples/boot_loader/rsk-rx65n-2mb/linker_section_sample.esi @@ -10,7 +10,6 @@ - diff --git a/configuration/samples/boot_loader/rx72n-envision-kit/linker_section_sample.esi b/configuration/samples/boot_loader/rx72n-envision-kit/linker_section_sample.esi index 8d02c68..33c504e 100644 --- a/configuration/samples/boot_loader/rx72n-envision-kit/linker_section_sample.esi +++ b/configuration/samples/boot_loader/rx72n-envision-kit/linker_section_sample.esi @@ -12,7 +12,6 @@ - From ac665d4835d4fe9a950ac6ada8603d2d5ebd325b Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Mon, 17 Apr 2023 19:56:58 +0900 Subject: [PATCH 05/12] [fix] boot loader public key comment --- .../samples/boot_loader/common/key/code_signer_public_key.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/samples/boot_loader/common/key/code_signer_public_key.h b/configuration/samples/boot_loader/common/key/code_signer_public_key.h index f2a38a9..1e2b996 100644 --- a/configuration/samples/boot_loader/common/key/code_signer_public_key.h +++ b/configuration/samples/boot_loader/common/key/code_signer_public_key.h @@ -32,8 +32,8 @@ * PEM-encoded code signer public key. * * Must include the PEM header and footer: - * "-----BEGIN CERTIFICATE-----\n"\ - * "...base64 data...\n"\ + * "-----BEGIN CERTIFICATE-----"\ + * "...base64 data..."\ * "-----END CERTIFICATE-----" */ From c4701cb511c0d89ac2b0d4a62c019565ea8bbc06 Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Mon, 17 Apr 2023 23:42:47 +0900 Subject: [PATCH 06/12] [fix] MAC address setting --- .../samples/iot_adu/ether/nx_driver_rx_fit.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/configuration/samples/iot_adu/ether/nx_driver_rx_fit.c b/configuration/samples/iot_adu/ether/nx_driver_rx_fit.c index 379c648..33e0c39 100644 --- a/configuration/samples/iot_adu/ether/nx_driver_rx_fit.c +++ b/configuration/samples/iot_adu/ether/nx_driver_rx_fit.c @@ -89,8 +89,6 @@ static netx_driver_rx_fit_data_t netx_driver_rx_fit_data[1]; initializing the driver by calling 'nx_ip_interface_physical_address_set()' otherwise the default address will be used.*/ extern uint8_t df__netx_driver_rx_fit_mac_address[6]; -uint8_t _netx_driver_rx_fit_mac_address[6]; - VOID nx_driver_rx_fit(NX_IP_DRIVER *driver_req_ptr) { @@ -191,16 +189,11 @@ static VOID _netx_driver_initialize(NX_IP_DRIVER *driver_req_ptr) netx_driver_rx_fit_data[chan].deferred_events_flags = 0u; /* Save the MAC address. */ - for (UINT i = 0; i < NX_DRIVER_PHYSICAL_ADDRESS_SIZE ; i++) - { - _netx_driver_rx_fit_mac_address[i] = df__netx_driver_rx_fit_mac_address[i]; - } - interface_ptr->nx_interface_physical_address_msw = - (ULONG)((_netx_driver_rx_fit_mac_address[0] << 8) | (_netx_driver_rx_fit_mac_address[1])); + (ULONG)((df__netx_driver_rx_fit_mac_address[0] << 8) | (df__netx_driver_rx_fit_mac_address[1])); interface_ptr->nx_interface_physical_address_lsw = - (ULONG)((_netx_driver_rx_fit_mac_address[2] << 24) | (_netx_driver_rx_fit_mac_address[3] << 16) | - (_netx_driver_rx_fit_mac_address[4] << 8) | (_netx_driver_rx_fit_mac_address[5])); + (ULONG)((df__netx_driver_rx_fit_mac_address[2] << 24) | (df__netx_driver_rx_fit_mac_address[3] << 16) | + (df__netx_driver_rx_fit_mac_address[4] << 8) | (df__netx_driver_rx_fit_mac_address[5])); /* Indicate to the IP software that IP to physical mapping is required. */ @@ -259,7 +252,7 @@ static VOID _netx_driver_enable(NX_IP_DRIVER *driver_req_ptr) /* Open the Ethernet channel. Note that the API function R_ETHER_Initial must be called in advance. */ - rx_ether_ret = R_ETHER_Open_ZC2(chan, _netx_driver_rx_fit_mac_address, ETHER_FLAG_OFF); + rx_ether_ret = R_ETHER_Open_ZC2(chan, df__netx_driver_rx_fit_mac_address, ETHER_FLAG_OFF); if(rx_ether_ret != ETHER_SUCCESS) { driver_req_ptr->nx_ip_driver_status = NX_DRIVER_ERROR; return; From 8307db9310cf3b0b91e01349f84addefd4bceb7a Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Tue, 18 Apr 2023 10:33:57 +0900 Subject: [PATCH 07/12] [modify] Relocate the error directive --- .../samples/iot_adu/common/demo_printf.h | 1 - .../common/nx_azure_iot_adu_agent_rx_driver.c | 16 +++++++++------- .../samples/iot_adu/ether/hardware_setup.h | 8 -------- .../samples/iot_adu/wifi/hardware_setup.h | 9 --------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/configuration/samples/iot_adu/common/demo_printf.h b/configuration/samples/iot_adu/common/demo_printf.h index d6acd2a..87944f8 100644 --- a/configuration/samples/iot_adu/common/demo_printf.h +++ b/configuration/samples/iot_adu/common/demo_printf.h @@ -6,7 +6,6 @@ #define LOG_TERMINAL demo_printf void demo_printf_init(void); - void demo_printf(char *format, ...); #endif diff --git a/configuration/samples/iot_adu/common/nx_azure_iot_adu_agent_rx_driver.c b/configuration/samples/iot_adu/common/nx_azure_iot_adu_agent_rx_driver.c index 9ed44c2..307b402 100644 --- a/configuration/samples/iot_adu/common/nx_azure_iot_adu_agent_rx_driver.c +++ b/configuration/samples/iot_adu/common/nx_azure_iot_adu_agent_rx_driver.c @@ -9,18 +9,20 @@ /* */ /**************************************************************************/ -#include "nx_azure_iot_adu_agent.h" -#include #include +#include "nx_azure_iot_adu_agent.h" +#include "r_flash_rx_if.h" #include "r_fwup_if.h" +#include "r_bsp_config.h" #include "demo_printf.h" -/* -#define ENABLE_SECURE_BOOT -*/ +#if (BSP_CFG_CODE_FLASH_BANK_MODE != 0) +#error "Error! Please set a device as dual bank device on the Smart Configurator." +#endif + -#if ((BSP_CFG_CODE_FLASH_BANK_MODE != 0) && !defined(DISABLE_ADU_SAMPLE)) -#error "Error! Need to define Dual mode in the bank mode of dual-bank function" +#if (BSP_CFG_RTOS_USED != 5) +#error "Error! Need to define Azure RTOS in BSP configuration" #endif void nx_azure_iot_adu_agent_driver(NX_AZURE_IOT_ADU_AGENT_DRIVER *driver_req_ptr); diff --git a/configuration/samples/iot_adu/ether/hardware_setup.h b/configuration/samples/iot_adu/ether/hardware_setup.h index 227e296..1d4654b 100644 --- a/configuration/samples/iot_adu/ether/hardware_setup.h +++ b/configuration/samples/iot_adu/ether/hardware_setup.h @@ -2,18 +2,10 @@ #ifndef HARDWARE_SETUP_H #define HARDWARE_SETUP_H -/* Wi-Fi is used to connect Azure cloud.*/ -/* -#define ENABLE_WIFI -*/ /* Ether is used to connect Azure cloud.*/ #define ENABLE_ETHER -#if (BSP_CFG_RTOS_USED != 5) -#error "Error! Need to define Azure RTOS in BSP configuration" -#endif - #ifndef MAC_ADDRESS #define MAC_ADDRESS {0x0,0x04,0x00,0x00,0x00,0x00} #endif diff --git a/configuration/samples/iot_adu/wifi/hardware_setup.h b/configuration/samples/iot_adu/wifi/hardware_setup.h index 1450d2f..c1106a1 100644 --- a/configuration/samples/iot_adu/wifi/hardware_setup.h +++ b/configuration/samples/iot_adu/wifi/hardware_setup.h @@ -5,15 +5,6 @@ /* Wi-Fi is used to connect Azure cloud.*/ #define ENABLE_WIFI -/* Ether is used to connect Azure cloud.*/ -/* -#define ENABLE_ETHER -*/ - -#if (BSP_CFG_RTOS_USED != 5) -#error "Error! Need to define Azure RTOS in BSP configuration" -#endif - #ifndef WIFI_SSID #define WIFI_SSID "" #endif /* WIFI_SSID */ From 699c85e9e6b437e74c286bf4e0e4d704e70420f5 Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Tue, 18 Apr 2023 15:09:18 +0900 Subject: [PATCH 08/12] [change] reset setting on flash programmer --- .../RX65N_Cloudkit/RX65NCK_ADU_Write/RX65NCK_ADU_Write.rpj | 2 +- .../RX65N_RSK/RSKRX65N_ADU_write/RSKRX65N_ADU_write.rpj | 2 +- .../RX671_RSK/RX671RSK_ADU_Write/RX671RSK_ADU_Write.rpj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/samples/iot_adu/tools/FlashProjects/RX65N_Cloudkit/RX65NCK_ADU_Write/RX65NCK_ADU_Write.rpj b/configuration/samples/iot_adu/tools/FlashProjects/RX65N_Cloudkit/RX65NCK_ADU_Write/RX65NCK_ADU_Write.rpj index 466880b..b8db9db 100644 --- a/configuration/samples/iot_adu/tools/FlashProjects/RX65N_Cloudkit/RX65NCK_ADU_Write/RX65NCK_ADU_Write.rpj +++ b/configuration/samples/iot_adu/tools/FlashProjects/RX65N_Cloudkit/RX65NCK_ADU_Write/RX65NCK_ADU_Write.rpj @@ -72,7 +72,7 @@ RFPSet 0 0 - Low + High 09000000 IFTYPE_FINE 1000000 diff --git a/configuration/samples/iot_adu/tools/FlashProjects/RX65N_RSK/RSKRX65N_ADU_write/RSKRX65N_ADU_write.rpj b/configuration/samples/iot_adu/tools/FlashProjects/RX65N_RSK/RSKRX65N_ADU_write/RSKRX65N_ADU_write.rpj index 9f4d1af..5c9faff 100644 --- a/configuration/samples/iot_adu/tools/FlashProjects/RX65N_RSK/RSKRX65N_ADU_write/RSKRX65N_ADU_write.rpj +++ b/configuration/samples/iot_adu/tools/FlashProjects/RX65N_RSK/RSKRX65N_ADU_write/RSKRX65N_ADU_write.rpj @@ -71,7 +71,7 @@ RFPSet 0 0 - Low + High 09000000 IFTYPE_FINE 1000000 diff --git a/configuration/samples/iot_adu/tools/FlashProjects/RX671_RSK/RX671RSK_ADU_Write/RX671RSK_ADU_Write.rpj b/configuration/samples/iot_adu/tools/FlashProjects/RX671_RSK/RX671RSK_ADU_Write/RX671RSK_ADU_Write.rpj index 6727466..df3b498 100644 --- a/configuration/samples/iot_adu/tools/FlashProjects/RX671_RSK/RX671RSK_ADU_Write/RX671RSK_ADU_Write.rpj +++ b/configuration/samples/iot_adu/tools/FlashProjects/RX671_RSK/RX671RSK_ADU_Write/RX671RSK_ADU_Write.rpj @@ -71,7 +71,7 @@ RFPSet 0 0 - Low + High 09000000 IFTYPE_FINE 1000000 From c896c8f8eeb5f643d9deea50ffc9760c745d294c Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Tue, 18 Apr 2023 17:22:21 +0900 Subject: [PATCH 09/12] [fix] device model name --- .../iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl index 134c73f..13cd14b 100644 --- a/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/rsk-rx65n-2mb/RSKRX65N-2MB-iot-sdk-adu_scfg.ftl @@ -48,9 +48,9 @@ - + - + From 8bc213b9bfaa364c2927d7d8f226df4d30f79621 Mon Sep 17 00:00:00 2001 From: TatsuyaOgawa Date: Tue, 18 Apr 2023 21:49:10 +0900 Subject: [PATCH 10/12] [fix] device model name --- .../samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl b/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl index 9e90764..45760a5 100644 --- a/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl +++ b/configuration/samples/iot_adu/rsk-rx671/RSKRX671-iot-sdk-adu_scfg.ftl @@ -49,9 +49,9 @@ - + - + From c3ba992f99da2293188c4f1013b9e7eaef3566cb Mon Sep 17 00:00:00 2001 From: Phuong Nam Nguyen Date: Wed, 19 Apr 2023 11:07:36 +0800 Subject: [PATCH 11/12] Correct copy file mistake in xml file --- configuration/azure-rtos.xml | 40 +++++++------------ .../src/smc_gen/r_config/r_sci_rx_config.h | 16 ++++---- .../src/smc_gen/r_config/r_sci_rx_config.h | 14 +++---- .../src/smc_gen/r_config/r_sci_rx_config.h | 14 +++---- 4 files changed, 36 insertions(+), 48 deletions(-) diff --git a/configuration/azure-rtos.xml b/configuration/azure-rtos.xml index 8f30070..03723b2 100644 --- a/configuration/azure-rtos.xml +++ b/configuration/azure-rtos.xml @@ -1111,13 +1111,9 @@ CK-RX65N RSKRX65N-2MB RSKRX65N-2MB(TSIP) - configuration/samples/iot_adu/ck-rx65n/ether/src/main.c - src - - RX72NEnvisionKit EnvisionKitRX72N - configuration/samples/iot_adu/rx72n-envision-kit/src/main.c + configuration/samples/iot_adu/ether/main.c src @@ -1170,9 +1166,9 @@ RX65NCloudKit CloudKitRX65N RSKRX671 - configuration/samples/iot_adu/rx65n-cloudkit/src/main.c - configuration/samples/iot_adu/rx65n-cloudkit/src/nx_driver_rx_wifi.c - configuration/samples/iot_adu/rx65n-cloudkit/src/nx_driver_rx_wifi.h + configuration/samples/iot_adu/wifi/main.c + configuration/samples/iot_adu/wifi/nx_driver_rx_wifi.c + configuration/samples/iot_adu/wifi/nx_driver_rx_wifi.h src @@ -1700,13 +1696,9 @@ CK-RX65N RSKRX65N-2MB RSKRX65N-2MB(TSIP) - configuration/samples/iot_adu/ck-rx65n/ether/src/main.c - src - - RX72NEnvisionKit EnvisionKitRX72N - configuration/samples/iot_adu/rx72n-envision-kit/src/main.c + configuration/samples/iot_adu/ether/main.c src @@ -1761,9 +1753,9 @@ RX65NCloudKit CloudKitRX65N RSKRX671 - configuration/samples/iot_adu/rx65n-cloudkit/src/main.c - configuration/samples/iot_adu/rx65n-cloudkit/src/nx_driver_rx_wifi.c - configuration/samples/iot_adu/rx65n-cloudkit/src/nx_driver_rx_wifi.h + configuration/samples/iot_adu/wifi/main.c + configuration/samples/iot_adu/wifi/nx_driver_rx_wifi.c + configuration/samples/iot_adu/wifi/nx_driver_rx_wifi.h src @@ -2103,7 +2095,7 @@ CK-RX65N configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_pincfg - src/smc_gen + src/smc_gen/r_pincfg GNURX @@ -2286,13 +2278,9 @@ CK-RX65N RSKRX65N-2MB RSKRX65N-2MB(TSIP) - configuration/samples/iot_adu/ck-rx65n/ether/src/main.c - src - - RX72NEnvisionKit EnvisionKitRX72N - configuration/samples/iot_adu/rx72n-envision-kit/src/main.c + configuration/samples/iot_adu/ether/main.c src @@ -2347,9 +2335,9 @@ RX65NCloudKit CloudKitRX65N RSKRX671 - configuration/samples/iot_adu/rx65n-cloudkit/src/main.c - configuration/samples/iot_adu/rx65n-cloudkit/src/nx_driver_rx_wifi.c - configuration/samples/iot_adu/rx65n-cloudkit/src/nx_driver_rx_wifi.h + configuration/samples/iot_adu/wifi/main.c + configuration/samples/iot_adu/wifi/nx_driver_rx_wifi.c + configuration/samples/iot_adu/wifi/nx_driver_rx_wifi.h src @@ -2701,7 +2689,7 @@ CK-RX65N configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_pincfg - src/smc_gen + src/smc_gen/r_pincfg GNURX diff --git a/configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h b/configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h index b61eb96..8817a4b 100644 --- a/configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h +++ b/configuration/samples/iot_sdk_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h @@ -105,13 +105,13 @@ Configuration Options * CH12 X X X X X X X X X Xs X X X X X X X X X X */ -#define SCI_CFG_CH0_INCLUDED (1) +#define SCI_CFG_CH0_INCLUDED (0) #define SCI_CFG_CH1_INCLUDED (0) #define SCI_CFG_CH2_INCLUDED (0) #define SCI_CFG_CH3_INCLUDED (0) #define SCI_CFG_CH4_INCLUDED (0) -#define SCI_CFG_CH5_INCLUDED (0) -#define SCI_CFG_CH6_INCLUDED (0) +#define SCI_CFG_CH5_INCLUDED (1) +#define SCI_CFG_CH6_INCLUDED (1) #define SCI_CFG_CH7_INCLUDED (0) #define SCI_CFG_CH8_INCLUDED (0) #define SCI_CFG_CH9_INCLUDED (0) @@ -125,8 +125,8 @@ Configuration Options #define SCI_CFG_CH2_TX_BUFSIZ (80) #define SCI_CFG_CH3_TX_BUFSIZ (80) #define SCI_CFG_CH4_TX_BUFSIZ (80) -#define SCI_CFG_CH5_TX_BUFSIZ (4096) -#define SCI_CFG_CH6_TX_BUFSIZ (80) +#define SCI_CFG_CH5_TX_BUFSIZ (2048) +#define SCI_CFG_CH6_TX_BUFSIZ (4096) #define SCI_CFG_CH7_TX_BUFSIZ (80) #define SCI_CFG_CH8_TX_BUFSIZ (80) #define SCI_CFG_CH9_TX_BUFSIZ (80) @@ -135,13 +135,13 @@ Configuration Options #define SCI_CFG_CH12_TX_BUFSIZ (80) /* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */ -#define SCI_CFG_CH0_RX_BUFSIZ (8192) +#define SCI_CFG_CH0_RX_BUFSIZ (80) #define SCI_CFG_CH1_RX_BUFSIZ (80) #define SCI_CFG_CH2_RX_BUFSIZ (80) #define SCI_CFG_CH3_RX_BUFSIZ (80) #define SCI_CFG_CH4_RX_BUFSIZ (80) -#define SCI_CFG_CH5_RX_BUFSIZ (80) -#define SCI_CFG_CH6_RX_BUFSIZ (80) +#define SCI_CFG_CH5_RX_BUFSIZ (2048) +#define SCI_CFG_CH6_RX_BUFSIZ (8192) #define SCI_CFG_CH7_RX_BUFSIZ (80) #define SCI_CFG_CH8_RX_BUFSIZ (80) #define SCI_CFG_CH9_RX_BUFSIZ (80) diff --git a/configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h b/configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h index 94552e8..8817a4b 100644 --- a/configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h +++ b/configuration/samples/iot_sdk_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h @@ -105,13 +105,13 @@ Configuration Options * CH12 X X X X X X X X X Xs X X X X X X X X X X */ -#define SCI_CFG_CH0_INCLUDED (1) +#define SCI_CFG_CH0_INCLUDED (0) #define SCI_CFG_CH1_INCLUDED (0) #define SCI_CFG_CH2_INCLUDED (0) #define SCI_CFG_CH3_INCLUDED (0) #define SCI_CFG_CH4_INCLUDED (0) #define SCI_CFG_CH5_INCLUDED (1) -#define SCI_CFG_CH6_INCLUDED (0) +#define SCI_CFG_CH6_INCLUDED (1) #define SCI_CFG_CH7_INCLUDED (0) #define SCI_CFG_CH8_INCLUDED (0) #define SCI_CFG_CH9_INCLUDED (0) @@ -120,13 +120,13 @@ Configuration Options #define SCI_CFG_CH12_INCLUDED (0) /* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */ -#define SCI_CFG_CH0_TX_BUFSIZ (4096) +#define SCI_CFG_CH0_TX_BUFSIZ (80) #define SCI_CFG_CH1_TX_BUFSIZ (80) #define SCI_CFG_CH2_TX_BUFSIZ (80) #define SCI_CFG_CH3_TX_BUFSIZ (80) #define SCI_CFG_CH4_TX_BUFSIZ (80) #define SCI_CFG_CH5_TX_BUFSIZ (2048) -#define SCI_CFG_CH6_TX_BUFSIZ (80) +#define SCI_CFG_CH6_TX_BUFSIZ (4096) #define SCI_CFG_CH7_TX_BUFSIZ (80) #define SCI_CFG_CH8_TX_BUFSIZ (80) #define SCI_CFG_CH9_TX_BUFSIZ (80) @@ -135,13 +135,13 @@ Configuration Options #define SCI_CFG_CH12_TX_BUFSIZ (80) /* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */ -#define SCI_CFG_CH0_RX_BUFSIZ (8192) +#define SCI_CFG_CH0_RX_BUFSIZ (80) #define SCI_CFG_CH1_RX_BUFSIZ (80) #define SCI_CFG_CH2_RX_BUFSIZ (80) #define SCI_CFG_CH3_RX_BUFSIZ (80) #define SCI_CFG_CH4_RX_BUFSIZ (80) -#define SCI_CFG_CH5_RX_BUFSIZ (80) -#define SCI_CFG_CH6_RX_BUFSIZ (80) +#define SCI_CFG_CH5_RX_BUFSIZ (2048) +#define SCI_CFG_CH6_RX_BUFSIZ (8192) #define SCI_CFG_CH7_RX_BUFSIZ (80) #define SCI_CFG_CH8_RX_BUFSIZ (80) #define SCI_CFG_CH9_RX_BUFSIZ (80) diff --git a/configuration/samples/temperature_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h b/configuration/samples/temperature_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h index 94552e8..8817a4b 100644 --- a/configuration/samples/temperature_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h +++ b/configuration/samples/temperature_pnp_ewf/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h @@ -105,13 +105,13 @@ Configuration Options * CH12 X X X X X X X X X Xs X X X X X X X X X X */ -#define SCI_CFG_CH0_INCLUDED (1) +#define SCI_CFG_CH0_INCLUDED (0) #define SCI_CFG_CH1_INCLUDED (0) #define SCI_CFG_CH2_INCLUDED (0) #define SCI_CFG_CH3_INCLUDED (0) #define SCI_CFG_CH4_INCLUDED (0) #define SCI_CFG_CH5_INCLUDED (1) -#define SCI_CFG_CH6_INCLUDED (0) +#define SCI_CFG_CH6_INCLUDED (1) #define SCI_CFG_CH7_INCLUDED (0) #define SCI_CFG_CH8_INCLUDED (0) #define SCI_CFG_CH9_INCLUDED (0) @@ -120,13 +120,13 @@ Configuration Options #define SCI_CFG_CH12_INCLUDED (0) /* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */ -#define SCI_CFG_CH0_TX_BUFSIZ (4096) +#define SCI_CFG_CH0_TX_BUFSIZ (80) #define SCI_CFG_CH1_TX_BUFSIZ (80) #define SCI_CFG_CH2_TX_BUFSIZ (80) #define SCI_CFG_CH3_TX_BUFSIZ (80) #define SCI_CFG_CH4_TX_BUFSIZ (80) #define SCI_CFG_CH5_TX_BUFSIZ (2048) -#define SCI_CFG_CH6_TX_BUFSIZ (80) +#define SCI_CFG_CH6_TX_BUFSIZ (4096) #define SCI_CFG_CH7_TX_BUFSIZ (80) #define SCI_CFG_CH8_TX_BUFSIZ (80) #define SCI_CFG_CH9_TX_BUFSIZ (80) @@ -135,13 +135,13 @@ Configuration Options #define SCI_CFG_CH12_TX_BUFSIZ (80) /* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */ -#define SCI_CFG_CH0_RX_BUFSIZ (8192) +#define SCI_CFG_CH0_RX_BUFSIZ (80) #define SCI_CFG_CH1_RX_BUFSIZ (80) #define SCI_CFG_CH2_RX_BUFSIZ (80) #define SCI_CFG_CH3_RX_BUFSIZ (80) #define SCI_CFG_CH4_RX_BUFSIZ (80) -#define SCI_CFG_CH5_RX_BUFSIZ (80) -#define SCI_CFG_CH6_RX_BUFSIZ (80) +#define SCI_CFG_CH5_RX_BUFSIZ (2048) +#define SCI_CFG_CH6_RX_BUFSIZ (8192) #define SCI_CFG_CH7_RX_BUFSIZ (80) #define SCI_CFG_CH8_RX_BUFSIZ (80) #define SCI_CFG_CH9_RX_BUFSIZ (80) From 33261e35cad7297f21290492411dafd6b4d542c1 Mon Sep 17 00:00:00 2001 From: Phuong Nam Nguyen Date: Wed, 19 Apr 2023 11:08:53 +0800 Subject: [PATCH 12/12] Update README.md for samples with EWF --- configuration/samples/iot_sdk/README.md | 9 ++++++++- configuration/samples/iot_sdk_pnp/README.md | 9 ++++++++- configuration/samples/temperature_pnp/README.md | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/configuration/samples/iot_sdk/README.md b/configuration/samples/iot_sdk/README.md index 55746cb..3455b33 100644 --- a/configuration/samples/iot_sdk/README.md +++ b/configuration/samples/iot_sdk/README.md @@ -16,7 +16,7 @@ For example, if you create project with C++ option and CC-RX compiler, you will ------------------------ 2. Caution / Known Issue ------------------------ -After the project generation is completed, please do the pin assignment check for SCI. +2.1. After the project generation is completed, please do the pin assignment check for SCI. In Smart Configurator editor (.scfg) - go to Pins tab - at Pin Function, select SCI channel being used on the left panel (channel with opened blue box) @@ -24,3 +24,10 @@ In Smart Configurator editor (.scfg) RXDx and TXDx should be used but the default setting could be SMISOx and SMOSIx This issue is fixed from e2 studio 2023-04 and Smart Configurator for RX 2.17. + +2.2. If you use sample project with EWF library (Preliminary version) and disable the debug log, +the sample program can not communicate with RYZ014A module. +For the details of issue and workaround, please refer to this link +https://github.com/Azure/embedded-wireless-framework/issues/16 + +The issue will be fixed at next update of software package. diff --git a/configuration/samples/iot_sdk_pnp/README.md b/configuration/samples/iot_sdk_pnp/README.md index 22a5f8f..ceeebb6 100644 --- a/configuration/samples/iot_sdk_pnp/README.md +++ b/configuration/samples/iot_sdk_pnp/README.md @@ -16,7 +16,7 @@ For example, if you create project with C++ option and CC-RX compiler, you will ------------------------ 2. Caution / Known Issue ------------------------ -After the project generation is completed, please do the pin assignment check for SCI. +2.1. After the project generation is completed, please do the pin assignment check for SCI. In Smart Configurator editor (.scfg) - go to Pins tab - at Pin Function, select SCI channel being used on the left panel (channel with opened blue box) @@ -24,3 +24,10 @@ In Smart Configurator editor (.scfg) RXDx and TXDx should be used but the default setting could be SMISOx and SMOSIx This issue is fixed from e2 studio 2023-04 and Smart Configurator for RX 2.17. + +2.2. If you use sample project with EWF library (Preliminary version) and disable the debug log, +the sample program can not communicate with RYZ014A module. +For the details of issue and workaround, please refer to this link +https://github.com/Azure/embedded-wireless-framework/issues/16 + +The issue will be fixed at next update of software package. diff --git a/configuration/samples/temperature_pnp/README.md b/configuration/samples/temperature_pnp/README.md index 8b69649..4b8393b 100644 --- a/configuration/samples/temperature_pnp/README.md +++ b/configuration/samples/temperature_pnp/README.md @@ -16,7 +16,7 @@ For example, if you create project with C++ option and CC-RX compiler, you will ------------------------ 2. Caution / Known Issue ------------------------ -After the project generation is completed, please do the pin assignment check for SCI. +2.1. After the project generation is completed, please do the pin assignment check for SCI. In Smart Configurator editor (.scfg) - go to Pins tab - at Pin Function, select SCI channel being used on the left panel (channel with opened blue box) @@ -24,3 +24,10 @@ In Smart Configurator editor (.scfg) RXDx and TXDx should be used but the default setting could be SMISOx and SMOSIx This issue is fixed from e2 studio 2023-04 and Smart Configurator for RX 2.17. + +2.2. If you use sample project with EWF library (Preliminary version) and disable the debug log, +the sample program can not communicate with RYZ014A module. +For the details of issue and workaround, please refer to this link +https://github.com/Azure/embedded-wireless-framework/issues/16 + +The issue will be fixed at next update of software package. \ No newline at end of file