Skip to content

Commit e9ded2e

Browse files
authored
Merge pull request #8 from xiongyu0523/update_threadx
update threadX to v6.1.12
2 parents d262d80 + 8e88b1f commit e9ded2e

File tree

190 files changed

+3310
-1651
lines changed

Some content is hidden

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

190 files changed

+3310
-1651
lines changed

.github/workflows/arduino_ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v2
12-
- uses: Arduino-CI/action@stable-1.x # or latest, or a pinned version
12+
- uses: Arduino-CI/action@552260fdcead3b5c7eba3cd4b8b203734649f646
13+
14+
lint:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
- uses: arduino/arduino-lint-action@v1
19+
with:
20+
library-manager: update

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ The port and provided demo is verified on following board and Arduino Core.
1010

1111
| Board | Chip | Architecture | Verified Arduino Core |
1212
| - | - | - | -|
13-
| [Seeeduino XIAO](https://wiki.seeedstudio.com/Seeeduino-XIAO/) | [ATSAMD21](https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d) | Cortex-M0+ | [Seeed-Studio/ArduinoCore-samd 1.8.2](https://github.com/Seeed-Studio/ArduinoCore-samd)
14-
| [Seeeduino Wio Terminal](https://wiki.seeedstudio.com/Wio-Terminal-Getting-Started/) | [ATSAMD51](https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d) | Cortex-M4 | [Seeed-Studio/ArduinoCore-samd 1.8.2](https://github.com/Seeed-Studio/ArduinoCore-samd)
15-
| [B-L4S5I-IOT01A](https://www.st.com/en/evaluation-tools/b-l4s5i-iot01a.html) | [STM32L4S5](https://www.st.com/zh/microcontrollers-microprocessors/stm32l4r5-s5.html) | Cortex-M4 | [stm32duino/Arduino_Core_STM32 2.0.0](https://github.com/stm32duino/Arduino_Core_STM32)
16-
| [32F746GDISCOVERY](https://www.st.com/en/evaluation-tools/32f746gdiscovery.html) | [STM32F746](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html) | Cortex-M7 | [stm32duino/Arduino_Core_STM32 2.0.0](https://github.com/stm32duino/Arduino_Core_STM32)
13+
| [Seeeduino XIAO](https://wiki.seeedstudio.com/Seeeduino-XIAO/) | [ATSAMD21](https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d) | Cortex-M0+ | [Seeed-Studio/ArduinoCore-samd 1.8.3](https://github.com/Seeed-Studio/ArduinoCore-samd)
14+
| [Seeeduino Wio Terminal](https://wiki.seeedstudio.com/Wio-Terminal-Getting-Started/) | [ATSAMD51](https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d) | Cortex-M4 | [Seeed-Studio/ArduinoCore-samd 1.8.3](https://github.com/Seeed-Studio/ArduinoCore-samd)
15+
| [B-L4S5I-IOT01A](https://www.st.com/en/evaluation-tools/b-l4s5i-iot01a.html) | [STM32L4S5](https://www.st.com/zh/microcontrollers-microprocessors/stm32l4r5-s5.html) | Cortex-M4 | [stm32duino/Arduino_Core_STM32 2.3.0](https://github.com/stm32duino/Arduino_Core_STM32)
16+
| [32F746GDISCOVERY](https://www.st.com/en/evaluation-tools/32f746gdiscovery.html) | [STM32F746](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html) | Cortex-M7 | [stm32duino/Arduino_Core_STM32 2.3.0](https://github.com/stm32duino/Arduino_Core_STM32)
1717

1818
## Version
1919

@@ -22,6 +22,7 @@ The version of this library is evolving independent to Azure RTOS ThreadX versio
2222
| Library version | ThreadX version | Note |
2323
| - | - | - |
2424
| v1.0.0 | [v6.1.7](https://github.com/azure-rtos/threadx/tree/v6.1.7_rel) | Initial release |
25+
| v1.0.1 | [v6.1.12](https://github.com/azure-rtos/threadx/tree/v6.1.7_rel) | Update ThreadX version |
2526

2627
## License
2728

examples/demo_threadx/demo_threadx.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ UINT status;
183183
/* Print results */
184184
if (thread_0_counter % 10 == 0) {
185185
Serial.print("**** Azure RTOS ThreadX Demo for Arduino ****\r\n");
186+
Serial.print(" OS version = "); Serial.print(THREADX_MAJOR_VERSION); Serial.print("."); Serial.print(THREADX_MINOR_VERSION); Serial.print("."); Serial.println(THREADX_PATCH_VERSION);
186187
Serial.print(" thread 0 events sent: "); Serial.println(thread_0_counter);
187188
Serial.print(" thread 1 messages sent: "); Serial.println(thread_1_counter);
188189
Serial.print(" thread 2 messages received: "); Serial.println(thread_2_counter);

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Azure RTOS ThreadX
2-
version=1.0.0
2+
version=1.0.1
33
author=Microsoft
44
maintainer=Neo Xiong <xiongyu0523@gmail.com>
55
sentence=Azure RTOS ThreadX Library for Arduino

ports/arch/cortex_m0/tx_port_cortex_m0.h

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* PORT SPECIFIC C INFORMATION RELEASE */
2727
/* */
2828
/* tx_port.h Cortex-M0/GNU */
29-
/* 6.1.6 */
29+
/* 6.1.11 */
3030
/* */
3131
/* AUTHOR */
3232
/* */
@@ -47,12 +47,15 @@
4747
/* */
4848
/* DATE NAME DESCRIPTION */
4949
/* */
50-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
51-
/* 09-30-2020 William E. Lamie Modified comment(s), */
50+
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
51+
/* 09-30-2020 William E. Lamie Modified comment(s), */
5252
/* resulting in version 6.1 */
53-
/* 04-02-2021 Bhupendra Naphade Modified comment(s),updated */
53+
/* 04-02-2021 Bhupendra Naphade Modified comment(s),updated */
5454
/* macro definition, */
5555
/* resulting in version 6.1.6 */
56+
/* 04-25-2022 Scott Larson Modified comments and added */
57+
/* volatile to registers, */
58+
/* resulting in version 6.1.11 */
5659
/* */
5760
/**************************************************************************/
5861

@@ -145,19 +148,20 @@ typedef unsigned short USHORT;
145148
For example, if the time source is at the address 0x0a800024 and is 16-bits in size, the clock
146149
source constants would be:
147150
148-
#define TX_TRACE_TIME_SOURCE *((ULONG *) 0x0a800024)
151+
#define TX_TRACE_TIME_SOURCE *((volatile ULONG *) 0x0a800024)
149152
#define TX_TRACE_TIME_MASK 0x0000FFFFUL
150153
151154
*/
152155

153156
#ifndef TX_MISRA_ENABLE
154157
#ifndef TX_TRACE_TIME_SOURCE
155-
#define TX_TRACE_TIME_SOURCE *((ULONG *) 0xE0001004)
158+
#define TX_TRACE_TIME_SOURCE *((volatile ULONG *) 0xE0001004)
156159
#endif
157160
#else
158161
ULONG _tx_misra_time_stamp_get(VOID);
159162
#define TX_TRACE_TIME_SOURCE _tx_misra_time_stamp_get()
160163
#endif
164+
161165
#ifndef TX_TRACE_TIME_MASK
162166
#define TX_TRACE_TIME_MASK 0xFFFFFFFFUL
163167
#endif
@@ -330,7 +334,8 @@ __attribute__( ( always_inline ) ) static inline void _tx_thread_system_return_i
330334
{
331335
unsigned int interrupt_save;
332336

333-
*((ULONG *) 0xE000ED04) = ((ULONG) 0x10000000);
337+
/* Set PendSV to invoke ThreadX scheduler. */
338+
*((volatile ULONG *) 0xE000ED04) = ((ULONG) 0x10000000);
334339
if (__get_ipsr_value() == 0)
335340
{
336341
interrupt_save = __get_primask_value();
@@ -364,7 +369,7 @@ unsigned int interrupt_save;
364369

365370
#ifdef TX_THREAD_INIT
366371
CHAR _tx_version_id[] =
367-
"Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-M0/GNU Version 6.1.6 *";
372+
"Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-M0/GNU Version 6.1.11 *";
368373
#else
369374
extern CHAR _tx_version_id[];
370375
#endif

0 commit comments

Comments
 (0)