Skip to content

Commit

Permalink
Merge branch 'master' into typo
Browse files Browse the repository at this point in the history
  • Loading branch information
yuxinzhou5 authored May 28, 2024
2 parents 9d29a9a + 485a02f commit e755542
Show file tree
Hide file tree
Showing 243 changed files with 1,808 additions and 252 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Create a report to help us improve Azure RTOS.
about: Create a report to help us improve Eclipse ThreadX.
title: ''
labels: bug, hardware
assignees: ''
Expand All @@ -13,7 +13,7 @@ A clear and concise description of what the bug is.
Please also mention any information which could help others to understand
the problem you're facing:
- What target device are you using?
- Which version of Azure RTOS?
- Which version of Eclipse ThreadX?
- What toolchain and environment?
- What have you tried to diagnose or workaround this issue?

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Suggest an idea or enhancement to existing feature for Azure RTOS.
about: Suggest an idea or enhancement to existing feature for Eclipse ThreadX.
title: ''
labels: feature
assignees: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/hardware-or-architecture-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ assignees: ''
---

**Is this request related to a particular hardware platform, SoC, board? Please describe.**
Describe in details the hardware support being requested and why this support benefits Azure RTOS.
Describe in details the hardware support being requested and why this support benefits Eclipse ThreadX.

**Describe why you are asking for this support?**
Describe why you are asking for this support.

If this is a new board or SoC, please state whether you are willing to maintain the Azure RTOS support together with you.
If this is a new board or SoC, please state whether you are willing to maintain the Eclipse ThreadX support together with you.

**Additional context**
Add any other context or graphics (drag-and-drop an image) about the hardware here.
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,9 @@ Instruction for building the ThreadX as static library using Arm GNU Toolchain a
$ cmake --build ./build
```

## Professional support


## Licensing

License terms for using Eclipse ThreadX are defined in the LICENSE.txt file of this repo. Please refer to this file for all definitive licensing information.
License terms for using Eclipse ThreadX are defined in the LICENSE.txt file of this repo. Please refer to this file for all definitive licensing information for all content, incl. the history of this repo.

## Resources

Expand Down
7 changes: 5 additions & 2 deletions common/inc/tx_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* tx_api.h PORTABLE C */
/* 6.4.0 */
/* 6.4.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -103,6 +103,9 @@
/* 12-31-2023 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.0 */
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.1 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -142,7 +145,7 @@ extern "C" {
#define AZURE_RTOS_THREADX
#define THREADX_MAJOR_VERSION 6
#define THREADX_MINOR_VERSION 4
#define THREADX_PATCH_VERSION 0
#define THREADX_PATCH_VERSION 1

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down
7 changes: 5 additions & 2 deletions common_smp/inc/tx_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* tx_api.h PORTABLE SMP */
/* 6.4.0 */
/* 6.4.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -91,6 +91,9 @@
/* 12-31-2023 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.0 */
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.1 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -143,7 +146,7 @@ extern "C" {
#define AZURE_RTOS_THREADX
#define THREADX_MAJOR_VERSION 6
#define THREADX_MINOR_VERSION 4
#define THREADX_PATCH_VERSION 0
#define THREADX_PATCH_VERSION 1

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down
Loading

0 comments on commit e755542

Please sign in to comment.