Skip to content

Commit

Permalink
Merge pull request eclipse-threadx#232 from TiejunMS/ericwol-eclipse-…
Browse files Browse the repository at this point in the history
…threadx-update

Update resources from azure-rtos to eclipse-threadx
  • Loading branch information
wickste authored Jan 17, 2024
2 parents 6053c3f + 52c447f commit c42ae94
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 56 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/regression_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_nxd.sh
test_script: ./scripts/test_nxd.sh
Expand All @@ -36,7 +36,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_web.sh
test_script: ./scripts/test_web.sh
Expand All @@ -51,7 +51,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_ptp.sh
test_script: ./scripts/test_ptp.sh
Expand All @@ -66,7 +66,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_mqtt.sh
test_script: ./scripts/test_mqtt.sh
Expand All @@ -81,7 +81,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_nxd64.sh
test_script: ./scripts/test_nxd64.sh
Expand All @@ -96,7 +96,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_nxd_fast.sh
test_script: ./scripts/test_nxd_fast.sh
Expand All @@ -112,7 +112,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_azure_iot.sh
test_script: ./scripts/test_azure_iot.sh
Expand All @@ -133,7 +133,7 @@ jobs:
submodules: true
- name: Checkout submodules
run: |
if (!(Test-Path ./test/cmake/threadx)) {git clone https://github.com/azure-rtos/threadx.git ./test/cmake/threadx --depth 1}
if (!(Test-Path ./test/cmake/threadx)) {git clone https://github.com/eclipse-threadx/threadx.git ./test/cmake/threadx --depth 1}
- name: CMake
run: |
mkdir build
Expand All @@ -151,7 +151,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_secure.sh
test_script: ./scripts/test_secure.sh
Expand All @@ -166,7 +166,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_crypto.sh
test_script: ./scripts/test_crypto.sh
Expand All @@ -181,7 +181,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
install_script: ./scripts/install_secure.sh
build_script: ./scripts/build_secure_interoperability.sh
Expand All @@ -197,7 +197,7 @@ jobs:
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
install_script: ./scripts/install_mqtt.sh
build_script: ./scripts/build_mqtt_interoperability.sh
Expand All @@ -214,7 +214,7 @@ jobs:
pages: write
id-token: write
needs: [NetXDuo, Web, MQTT, NetXDuo64, NetXDuo_Fast, Azure_IoT, Secure, Crypto, Secure_Interoperability, MQTT_Interoperability]
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@master
with:
skip_test: true
deploy_list: "NetXDuo Web MQTT NetXDuo64 NetXDuo_Fast Azure_IoT Secure Crypto Secure_Interoperability MQTT_Interoperability"
deploy_list: "NetXDuo Web MQTT NetXDuo64 NetXDuo_Fast Azure_IoT Secure Crypto Secure_Interoperability MQTT_Interoperability"
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Here are the key features and modules of NetX Duo:

Azure RTOS NetX Duo as part of Azure RTOS has been integrated to the semiconductor's SDKs and development environment. You can develop using the tools of choice from [STMicro](https://www.st.com/content/st_com/en/campaigns/x-cube-azrtos-azure-rtos-stm32.html), [NXP](https://www.nxp.com/design/software/embedded-software/azure-rtos-for-nxp-microcontrollers:AZURE-RTOS), [Renesas](https://github.com/renesas/azure-rtos) and [Microchip](https://mu.microchip.com/get-started-simplifying-your-iot-design-with-azure-rtos).

We also provide [getting started guide](https://github.com/azure-rtos/getting-started) and [samples](https://github.com/azure-rtos/samples) using hero development boards from semiconductors you can build and test with.
We also provide [getting started guide](https://github.com/eclipse-threadx/getting-started) and [samples](https://github.com/eclipse-threadx/samples) using hero development boards from semiconductors you can build and test with.

See [Overview of Azure RTOS NetX Duo](https://learn.microsoft.com/azure/rtos/netx-duo/overview-netx-duo) for the high-level overview, and all documentation and APIs can be found in: [Azure RTOS NetX Duo documentation](https://learn.microsoft.com/azure/rtos/netx-duo/).

Also there is dedicated [learning path of Azure RTOS NetX Duo](https://learn.microsoft.com/training/paths/azure-rtos-netx-duo/) for learning systematically.
Also there is dedicated [learning path of ThreadX RTOS NetX Duo](https://learn.microsoft.com/training/paths/azure-rtos-netx-duo/) for learning systematically.

## Repository Structure and Usage

Expand Down Expand Up @@ -87,15 +87,15 @@ The master branch has the most recent code with all new features and bug fixes.

## Protocols and connectivity

Protocols and connectivity support are provided as addon modules within NetX Duo in `addons` folder. Some key modules are: [**azure_iot**](https://github.com/azure-rtos/netxduo/tree/master/addons/azure_iot), [**dhcp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dhcp-client/chapter1), [**dns**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dns/chapter1), [**ftp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dns/chapter1), [**http**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-http/chapter1), [**mqtt**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-mqtt/chapter1), [**pop3**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-pop3-client/chapter1), [**ppp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-ppp/chapter1), [**rtp**](https://learn.microsoft.com/en-us/azure/rtos/netx-duo/netx-duo-rtp/chapter1), [**rtsp**](https://learn.microsoft.com/en-us/azure/rtos/netx-duo/netx-duo-rtsp/chapter1), [**sntp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-sntp-client/chapter1), and [**web**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-web-http/chapter1). For a full list of NetX Duo addons, you can find in the same [Azure RTOS NetX Duo documentation](https://learn.microsoft.com/azure/rtos/netx-duo/).
Protocols and connectivity support are provided as addon modules within NetX Duo in `addons` folder. Some key modules are: [**azure_iot**](https://github.com/eclipse-threadx/netxduo/tree/master/addons/azure_iot), [**dhcp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dhcp-client/chapter1), [**dns**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dns/chapter1), [**ftp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dns/chapter1), [**http**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-http/chapter1), [**mqtt**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-mqtt/chapter1), [**pop3**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-pop3-client/chapter1), [**ppp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-ppp/chapter1), [**rtp**](https://learn.microsoft.com/en-us/azure/rtos/netx-duo/netx-duo-rtp/chapter1), [**rtsp**](https://learn.microsoft.com/en-us/azure/rtos/netx-duo/netx-duo-rtsp/chapter1), [**sntp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-sntp-client/chapter1), and [**web**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-web-http/chapter1). For a full list of NetX Duo addons, you can find in the same [Azure RTOS NetX Duo documentation](https://learn.microsoft.com/azure/rtos/netx-duo/).

### Samples

We provide sample codes about how to use various addons in the [`samples`](./samples/) folder.

### Azure IoT Middleware for Azure RTOS

[Azure IoT Middleware for Azure RTOS](https://github.com/azure-rtos/netxduo/tree/master/addons/azure_iot) (a.k.a IoT Middleware) is a platform specific library that acts as a binding layer between the Azure RTOS and the [Azure SDK for Embedded C](https://github.com/Azure/azure-sdk-for-c). It simplifies building device application that connects to Azure IoT services.
[Azure IoT Middleware for Azure RTOS](https://github.com/eclipse-threadx/netxduo/tree/master/addons/azure_iot) (a.k.a IoT Middleware) is a platform specific library that acts as a binding layer between the Azure RTOS and the [Azure SDK for Embedded C](https://github.com/Azure/azure-sdk-for-c). It simplifies building device application that connects to Azure IoT services.

The IoT Middleware also includes built-in support for:

Expand All @@ -119,15 +119,15 @@ Instruction for building the NetX Duo as static library using Arm GNU Toolchain
* [Arm GNU Toolchain for arm-none-eabi](https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads)
* [Ninja](https://ninja-build.org/)

1. Build the [ThreadX library](https://github.com/azure-rtos/threadx#building-and-using-the-library) as the dependency.
1. Build the [ThreadX library](https://github.com/eclipse-threadx/threadx#building-and-using-the-library) as the dependency.

1. Cloning the repo. NetX Duo has a couple of dependencies that are included as submodules.

```bash
$ git clone --recursive https://github.com/azure-rtos/netxduo.git
$ git clone --recursive https://github.com/eclipse-threadx/netxduo.git
```

1. Define the features and addons you need in `nx_user.h` and build together with the component source code. You can refer to [`nx_user_sample.h`](https://github.com/azure-rtos/netxduo/blob/master/common/inc/nx_user_sample.h) as an example.
1. Define the features and addons you need in `nx_user.h` and build together with the component source code. You can refer to [`nx_user_sample.h`](https://github.com/eclipse-threadx/netxduo/blob/master/common/inc/nx_user_sample.h) as an example.

1. Building as a static library

Expand Down Expand Up @@ -157,13 +157,13 @@ The following are references to additional Azure RTOS resources:

- **Product introduction and white papers**: https://azure.com/rtos
- **General technical questions**: https://aka.ms/QnA/azure-rtos
- **Product issues and bugs, or feature requests**: https://github.com/azure-rtos/netxduo/issues
- **Product issues and bugs, or feature requests**: https://github.com/eclipse-threadx/netxduo/issues
- **Licensing and sales questions**: https://aka.ms/azrtos-license
- **Product roadmap and support policy**: https://aka.ms/azrtos/lts
- **Blogs and videos**: http://msiotblog.com and https://aka.ms/iotshow
- **Azure RTOS TraceX Installer**: https://aka.ms/azrtos-tracex-installer

You can also check [previous questions](https://stackoverflow.com/questions/tagged/azure-rtos+netxduo) or ask new ones on StackOverflow using the `azure-rtos` and `netxduo` tags.
You can also check [previous questions](https://stackoverflow.com/questions/tagged/threadx-rtos+netxduo) or ask new ones on StackOverflow using the `threadx-rtos` and `netxduo` tags.

## Security

Expand Down
18 changes: 9 additions & 9 deletions addons/azure_iot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ See the following samples on how to get started on development boards with Azure
Manufacturer | Device | Samples |
| --- | --- | --- |
| STMicroelectronics | [STM32F746GDISCOVERY](https://www.st.com/en/evaluation-tools/32f746gdiscovery.html) | [IAR](https://aka.ms/azrtos-sample/f746g-iar)[STM32Cube](https://aka.ms/azrtos-sample/f746g-cubeide)
| STMicroelectronics | [B-L4S5I-IOT01](https://www.st.com/en/evaluation-tools/b-l4s5i-iot01a.html) / [B-L475E-IOT01](https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html) | [GCC/CMake](https://github.com/azure-rtos/getting-started/tree/master/STMicroelectronics/STM32L4_L4%2B)[IAR](https://aka.ms/azrtos-sample/l4s5-iar)[STM32Cube](https://aka.ms/azrtos-sample/l4s5-cubeide)
| NXP | [MIMXRT1060-EVK](https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/mimxrt1060-evk-i-mx-rt1060-evaluation-kit:MIMXRT1060-EVK) | [GCC/CMake](https://github.com/azure-rtos/getting-started/tree/master/NXP/MIMXRT1060-EVK)[IAR](https://aka.ms/azrtos-sample/rt1060-iar)[MCUXpresso](https://aka.ms/azrtos-sample/rt1060-mcuxpresso)
| Renesas | [RX65N-RSK-2MB](https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rx65n-2mb-starter-kit-plus-renesas-starter-kit-rx65n-2mb) | [GCC/CMake](https://github.com/azure-rtos/getting-started/tree/master/Renesas/RSK_RX65N_2MB)[IAR](https://aka.ms/azrtos-samples/rx65n-rsk-2mb-iar)[E2Studio CCRX](https://aka.ms/azrtos-samples/rx65n-rsk-2mb-ccrx)[E2Studio GNURX](https://aka.ms/azrtos-samples/rx65n-rsk-2mb-gnurx)
| STMicroelectronics | [B-L4S5I-IOT01](https://www.st.com/en/evaluation-tools/b-l4s5i-iot01a.html) / [B-L475E-IOT01](https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html) | [GCC/CMake](https://github.com/eclipse-threadx/getting-started/tree/master/STMicroelectronics/STM32L4_L4%2B)[IAR](https://aka.ms/azrtos-sample/l4s5-iar)[STM32Cube](https://aka.ms/azrtos-sample/l4s5-cubeide)
| NXP | [MIMXRT1060-EVK](https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/mimxrt1060-evk-i-mx-rt1060-evaluation-kit:MIMXRT1060-EVK) | [GCC/CMake](https://github.com/eclipse-threadx/getting-started/tree/master/NXP/MIMXRT1060-EVK)[IAR](https://aka.ms/azrtos-sample/rt1060-iar)[MCUXpresso](https://aka.ms/azrtos-sample/rt1060-mcuxpresso)
| Renesas | [RX65N-RSK-2MB](https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rx65n-2mb-starter-kit-plus-renesas-starter-kit-rx65n-2mb) | [GCC/CMake](https://github.com/eclipse-threadx/getting-started/tree/master/Renesas/RSK_RX65N_2MB)[IAR](https://aka.ms/azrtos-samples/rx65n-rsk-2mb-iar)[E2Studio CCRX](https://aka.ms/azrtos-samples/rx65n-rsk-2mb-ccrx)[E2Studio GNURX](https://aka.ms/azrtos-samples/rx65n-rsk-2mb-gnurx)
| Renesas | [RX65N-Cloud-Kit](https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rx65n-cloud-kit-renesas-rx65n-cloud-kit) | [E2Studio CCRX](https://aka.ms/azrtos-samples/rx65n-ck-ccrx)[E2Studio GNURX](https://aka.ms/azrtos-samples/rx65n-ck-gnurx)
| Microchip | [ATSAME54-XPRO](https://www.microchip.com/developmenttools/productdetails/atsame54-xpro) | [GCC/CMake](https://github.com/azure-rtos/getting-started/tree/master/Microchip/ATSAME54-XPRO)[IAR](https://aka.ms/azrtos-sample/e54-iar)[MPLAB](https://aka.ms/azrtos-sample/e54-mplab)
| MXCHIP | [AZ3166](https://aka.ms/iot-devkit) | [GCC/CMake](https://github.com/azure-rtos/getting-started/tree/master/MXChip/AZ3166)
| Microchip | [ATSAME54-XPRO](https://www.microchip.com/developmenttools/productdetails/atsame54-xpro) | [GCC/CMake](https://github.com/eclipse-threadx/getting-started/tree/master/Microchip/ATSAME54-XPRO)[IAR](https://aka.ms/azrtos-sample/e54-iar)[MPLAB](https://aka.ms/azrtos-sample/e54-mplab)
| MXCHIP | [AZ3166](https://aka.ms/iot-devkit) | [GCC/CMake](https://github.com/eclipse-threadx/getting-started/tree/master/MXChip/AZ3166)

## Building

Expand All @@ -32,7 +32,7 @@ Module | Macros |
| --- | --- |
| Azure IoT Middleware for Azure RTOS | `NX_ENABLE_EXTENDED_NOTIFY_SUPPORT`<br> `NX_SECURE_ENABLE`<br> `NXD_MQTT_CLOUD_ENABLE`

Follow [`nx_user_sample.h`](https://github.com/azure-rtos/netxduo/blob/master/common/inc/nx_user_sample.h) to see how to define these macros in the NetX user header file.
Follow [`nx_user_sample.h`](https://github.com/eclipse-threadx/netxduo/blob/master/common/inc/nx_user_sample.h) to see how to define these macros in the NetX user header file.

## Features

Expand All @@ -52,7 +52,7 @@ Azure IoT Middleware for Azure RTOS stays as an addon module for the Azure RTOS

[Device Update for IoT Hub](https://learn.microsoft.com/azure/iot-hub-device-update/understand-device-update) is an Azure service that enables you to deploy over-the-air updates (OTA) for your IoT devices. The [Device Update for IoT Hub agent](https://learn.microsoft.com/azure/iot-hub-device-update/device-update-azure-real-time-operating-system) in the IoT Middleware provides simple APIs for device builders to integrate the OTA capability easily.

See the [samples](https://github.com/azure-rtos/samples) of semiconductor's hero development boards with detailed guides to learn configure, build and deploy the over-the-air (OTA) updates to the devices.
See the [samples](https://github.com/eclipse-threadx/samples) of semiconductor's hero development boards with detailed guides to learn configure, build and deploy the over-the-air (OTA) updates to the devices.

## APIs

Expand All @@ -65,8 +65,8 @@ See the [samples](https://github.com/azure-rtos/samples) of semiconductor's hero

## Need Help?

Find support channels in the [Resources](https://github.com/azure-rtos/netxduo#resources) list.
Find support channels in the [Resources](https://github.com/eclipse-threadx/netxduo#resources) list.

## Licensing

View [Licensing](https://github.com/azure-rtos/netxduo#licensing) of Azure RTOS NetX Duo.
View [Licensing](https://github.com/eclipse-threadx/netxduo#licensing) of Azure RTOS NetX Duo.
2 changes: 1 addition & 1 deletion test/cmake/azure_iot/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function test() {
cd $(dirname $0)

# if threadx repo does not exist, clone it
[ -d ../threadx ] || git clone https://github.com/azure-rtos/threadx.git ../threadx --depth 1
[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1

result=$(sed -n "/(BUILD_CONFIGURATIONS/,/)/p" CMakeLists.txt|sed ':label;N;s/\n/ /;b label'|grep -Pzo "[a-zA-Z0-9_]*build[a-zA-Z0-9_]*\s*"| tr -d '\0')
IFS=' '
Expand Down
4 changes: 2 additions & 2 deletions test/cmake/crypto/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
cd $(dirname $0)

# if threadx repo does not exist, clone it
[ -d ../threadx ] || git clone https://github.com/azure-rtos/threadx.git ../threadx --depth 1
[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
[ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
./.run.sh $*
./.run.sh $*
Loading

0 comments on commit c42ae94

Please sign in to comment.