Skip to content

Commit

Permalink
Merge pull request #4 from renesas/FSPRA-2985-update_to_6.4.0
Browse files Browse the repository at this point in the history
Update to v6.4.0
  • Loading branch information
renesas-adam-benson authored May 29, 2024
2 parents 8602410 + 6d6c739 commit 4bb6e69
Show file tree
Hide file tree
Showing 2,773 changed files with 2,060,892 additions and 38,562 deletions.
13 changes: 13 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"image": "ghcr.io/tiejunms/azure_rtos_docker",

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.cpptools",
"ms-vscode.cmake-tools"
],

"remoteUser": "vscode",

"runArgs": [ "--cap-add=NET_ADMIN"]
}
220 changes: 220 additions & 0 deletions .github/workflows/regression_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
# This is a basic workflow that is manually triggered

name: regression_test

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
workflow_dispatch:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
NetXDuo:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_nxd.sh
test_script: ./scripts/test_nxd.sh
cmake_path: ./test/cmake/netxduo
result_affix: NetXDuo
skip_deploy: true
Web:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_web.sh
test_script: ./scripts/test_web.sh
cmake_path: ./test/cmake/web
result_affix: Web
skip_deploy: true
PTP:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_ptp.sh
test_script: ./scripts/test_ptp.sh
cmake_path: ./test/cmake/ptp
result_affix: PTP
skip_deploy: true
MQTT:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_mqtt.sh
test_script: ./scripts/test_mqtt.sh
cmake_path: ./test/cmake/mqtt
result_affix: MQTT
skip_deploy: true
NetXDuo64:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_nxd64.sh
test_script: ./scripts/test_nxd64.sh
cmake_path: ./test/cmake/netxduo64
result_affix: NetXDuo64
skip_deploy: true
NetXDuo_Fast:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_nxd_fast.sh
test_script: ./scripts/test_nxd_fast.sh
cmake_path: ./test/cmake/netxduo_fast
result_affix: NetXDuo_Fast
skip_deploy: true
skip_coverage: true
Azure_IoT:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_azure_iot.sh
test_script: ./scripts/test_azure_iot.sh
cmake_path: ./test/cmake/azure_iot
result_affix: Azure_IoT
skip_deploy: true
Azure_IoT_Windows:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
runs-on: windows-2019
steps:
- name: Check out the repository
uses: actions/checkout@v4
with:
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}
- name: CMake
run: |
mkdir build
cd build
cmake ../test/cmake/azure_iot -A Win32
- name: Build
run: |
cd build
cmake --build .
Secure:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_secure.sh
test_script: ./scripts/test_secure.sh
cmake_path: ./test/cmake/nx_secure
result_affix: Secure
skip_deploy: true
Crypto:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
build_script: ./scripts/build_crypto.sh
test_script: ./scripts/test_crypto.sh
cmake_path: ./test/cmake/crypto
result_affix: Crypto
skip_deploy: true
Secure_Interoperability:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
install_script: ./scripts/install_secure.sh
build_script: ./scripts/build_secure_interoperability.sh
test_script: ./scripts/test_secure_interoperability.sh
cmake_path: ./test/cmake/nx_secure_interoperability
result_affix: Secure_Interoperability
skip_deploy: true
MQTT_Interoperability:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
pages: write
id-token: write
uses: azure-rtos/threadx/.github/workflows/regression_template.yml@master
with:
install_script: ./scripts/install_mqtt.sh
build_script: ./scripts/build_mqtt_interoperability.sh
test_script: ./scripts/test_mqtt_interoperability.sh
cmake_path: ./test/cmake/mqtt_interoperability
result_affix: MQTT_Interoperability
skip_deploy: true
Deploy:
permissions:
contents: read
issues: read
checks: write
pull-requests: write
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
with:
skip_test: true
deploy_list: "NetXDuo Web MQTT NetXDuo64 NetXDuo_Fast Azure_IoT Secure Crypto Secure_Interoperability MQTT_Interoperability"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.vscode/
_deps/
build/
coverage_report/
CMakeFiles/
CMakeScripts/
CMakeLists.txt.user
Expand All @@ -11,4 +12,5 @@ cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
.run.sh

7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ project(netxduo

option(NXD_ENABLE_FILE_SERVERS "Includes a dependency on FileX to support 'server' protocol handlers" ON)
option(NXD_ENABLE_AZURE_IOT "Enable Azure IoT" OFF)
option(NX_AZURE_DISABLE_IOT_SECURITY_MODULE "Disable Azure IoT Security Module" OFF)

if(NOT DEFINED THREADX_ARCH)
message(FATAL_ERROR "Error: THREADX_ARCH not defined")
Expand All @@ -31,9 +30,6 @@ endif()
if(NXD_ENABLE_AZURE_IOT)
message(STATUS "NXD_ENABLE_AZURE_IOT - defined")
target_link_libraries(${PROJECT_NAME} PUBLIC az_iot_hub az_iot_provisioning)
if(NOT NX_AZURE_DISABLE_IOT_SECURITY_MODULE)
target_link_libraries(${PROJECT_NAME} PUBLIC iot_security_module)
endif()
endif()

# A place for generated/copied include files (no need to change)
Expand All @@ -59,6 +55,9 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/nx_secure)
# Utility components
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/utility)

# Link layer
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tsn)

# If the user provided an override, copy it to the custom directory
if (NOT NX_USER_FILE)
message(STATUS "Using default nx_user.h file")
Expand Down
45 changes: 24 additions & 21 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ MICROSOFT SOFTWARE LICENSE TERMS

MICROSOFT AZURE RTOS

Shape

These license terms are an agreement between you and Microsoft Corporation (or
one of its affiliates). They apply to the software named above and any Microsoft
Expand All @@ -14,18 +13,19 @@ HAVE THE RIGHTS BELOW. BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS.

1. INSTALLATION AND USE RIGHTS.

a) General. You may install and use the software and the included Microsoft
applications solely for internal development, testing and evaluation purposes.
Any distribution or production use requires a separate license as set forth in
Section 2.
a) General. You may (I) install, use and modify the software and (ii) install and use the included Microsoft
Applications (if any), each solely for internal development, testing and evaluation purposes.
Distribution or production use is governed by the license terms set forth in
Section 2. You may also obtain distribution or production use rights through a separate agreement with
Microsoft.

b) Contributions. Microsoft welcomes contributions to this software. In the event
that you make a contribution to this software you will be required to agree to a
Contributor License Agreement (CLA) declaring that you have the right to, and
actually do, grant Microsoft the rights to use your contribution. For details,
visit https://cla.microsoft.com.

c) Included Microsoft Applications. The software includes other Microsoft
c) Included Microsoft Applications. The software may include other Microsoft
applications which are governed by the licenses embedded in or made available
with those applications.

Expand Down Expand Up @@ -57,7 +57,6 @@ i. You may use the software in production (e.g. program the modified or unmodifi
software to devices you own or control) and distribute (i.e. make available to
third parties) the modified or unmodified binary image produced from this code.


ii. You may permit your device distributors or developers to copy and distribute the
binary image as programmed or to be programmed to your devices.

Expand All @@ -70,17 +69,12 @@ b) Requirements. For any code you distribute, you must:

i. when distributed in binary form, except as embedded in a device, include with
such distribution the terms of this agreement;

ii. when distributed in source code form to distributors or developers of your
devices, include with such distribution the terms of this agreement; and

iii. indemnify, defend and hold harmless Microsoft from any claims, including
attorneys’ fees, related to the distribution or use of your devices, except to
the extent that any claim is based solely on the unmodified software.
iii. indemnify, defend and hold harmless Microsoft from any claims, including claims arising from any High Risk Uses, and inclusive of attorneys’ fees, related to the distribution or use of your devices that include the software, except to the extent that any intellectual property claim is based solely on the unmodified software.

c) Restrictions. You may not:

i. use or modify the software to create a competing real time operating system
i. use or modify the software to create competing real time operating system
software;

ii. remove any copyright notices or licenses contained in the software;
Expand Down Expand Up @@ -179,12 +173,13 @@ breach of which would endanger the purpose of this agreement and the compliance
with which a party may constantly trust in (so-called "cardinal obligations").
In other cases of slight negligence, Microsoft will not be liable for slight
negligence.

12. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS IS.” YOU BEAR THE RISK OF
12. DISCLAIMER OF WARRANTY.
a) THE SOFTWARE IS LICENSED “AS IS.” YOU BEAR THE RISK OF
USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES, OR CONDITIONS. TO
THE EXTENT PERMITTED UNDER APPLICABLE LAWS, MICROSOFT EXCLUDES ALL IMPLIED
WARRANTIES, INCLUDING MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
NON-INFRINGEMENT.
b) HIGH RISK USE DISCLAIMER. WARNING: THE SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE WHERE FAILURE OR FAULT OF ANY KIND OF THE SOFTWARE COULD RESULT IN DEATH OR SERIOUS BODILY INJURY, OR IN PHYSICAL OR ENVIRONMENTAL DAMAGE (“collectively High Risk Use”). Accordingly, You must design and implement your hardware and software such that, in the event of any interruption, defect, error, or other failure of the software, the safety of people, property, and the environment are not reduced below a level that is reasonable, appropriate, and legal, whether in general or for a specific industry. Your High Risk Use of the software is at Your own risk.

13. LIMITATION ON AND EXCLUSION OF DAMAGES. IF YOU HAVE ANY BASIS FOR RECOVERING
DAMAGES DESPITE THE PRECEDING DISCLAIMER OF WARRANTY, YOU CAN RECOVER FROM
Expand All @@ -203,21 +198,29 @@ possibility of the damages. The above limitation or exclusion may not apply to
you because your state, province, or country may not allow the exclusion or
limitation of incidental, consequential, or other damages.



Please note: As this software is distributed in Canada, some of the clauses in
Please note: As this software is distributed in Canada, some of the clauses in
this agreement are provided below in French.

Remarque: Ce logiciel étant distribué au Canada, certaines des clauses dans ce
contrat sont fournies ci-dessous en français.

EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert « tel quel
EXONÉRATION DE GARANTIE.
a) Le logiciel visé par une licence est offert « tel quel
». Toute utilisation de ce logiciel est à votre seule risque et péril. Microsoft
n’accorde aucune autre garantie expresse. Vous pouvez bénéficier de droits
additionnels en vertu du droit local sur la protection des consommateurs, que ce
contrat ne peut modifier. La ou elles sont permises par le droit locale, les
garanties implicites de qualité marchande, d’adéquation à un usage particulier
et d’absence de contrefaçon sont exclues.
b) CLAUSE D’EXCLUSION DE RESPONSABILITÉ RELATIVE À L’UTILISATION À HAUT RISQUE.
AVERTISSEMENT: LE LOGICIEL N’EST PAS CONÇU OU DESTINÉ À ÊTRE UTILISÉ LORSQU’UNE
DÉFAILLANCE OU UN DÉFAUT DE QUELQUE NATURE QUE CE SOIT POURRAIT ENTRAÎNER LA
MORT OU DES BLESSURES CORPORELLES GRAVES, OU DES DOMMAGES PHYSIQUES OU
ENVIRONNEMENTAUX (« Utilisation à haut risque »). Par conséquent, vous devez concevoir et mettre en
œuvre votre équipement et votre logiciel de manière à ce que, en cas d’interruption, de défaut, d’erreur
ou de toute autre défaillance du logiciel, la sécurité des personnes, des biens et de l’environnement ne
soit pas réduite en dessous d’un niveau raisonnable, approprié et légal, que ce soit en général ou pour
un secteur spécifique. Votre utilisation à haut risque du logiciel est à vos propres risques.

LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES
DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une
Expand All @@ -243,4 +246,4 @@ ci-dessus ne s’appliquera pas à votre égard.
EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous
pourriez avoir d’autres droits prévus par les lois de votre pays. Le présent
contrat ne modifie pas les droits que vous confèrent les lois de votre pays si
celles-ci ne le permettent pas.
celles-ci ne le permettent pas.
Loading

0 comments on commit 4bb6e69

Please sign in to comment.