Merge pull request #3 from weston-embedded/release/v1.02.01

Release/v1.02.01
weston-embedded · May 20, 2021 · 42117ff · 42117ff
2 parents fbc2172 + 74c25f2
commit 42117ff
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 31 deletions.
diff --git a/Auth/auth.c b/Auth/auth.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                              uC/Common - Authentication Module (Auth)
 *
 * Filename : auth.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 * Note(s)  : (1) 'goto' statements were used in this software module. Their usage
 *                is restricted to cleanup purposes in exceptional program flow (e.g.

diff --git a/Auth/auth.h b/Auth/auth.h
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                              uC/Common - Authentication Module (Auth)
 *
 * Filename : auth.h
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 

diff --git a/Collections/slist.c b/Collections/slist.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                               uC/Common - Singly-linked Lists (SList)
 *
 * Filename : slist.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 

diff --git a/Collections/slist.h b/Collections/slist.h
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                               uC/Common - Singly-linked Lists (SList)
 *
 * Filename : slist.h
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 

diff --git a/KAL/None/kal.c b/KAL/None/kal.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -21,7 +21,7 @@
 *                                         No Operating System
 *
 * Filename : kal.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 * Note(s)  : (1) Since no operating system is present, most of the present features are implemented
 *                directly in the KAL.

diff --git a/KAL/POSIX/kal.c b/KAL/POSIX/kal.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -21,7 +21,7 @@
 *                                            POSIX Threads
 *
 * Filename : kal.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 * Notes    : (1) Requires a Single UNIX Specification, Version 3 compliant operating environment.
 *                On Linux _XOPEN_SOURCE must be defined to at least 600, generally by passing the

diff --git a/KAL/Template/kal.c b/KAL/Template/kal.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -21,7 +21,7 @@
 *                                              Template
 *
 * Filename : kal.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 

diff --git a/KAL/kal.h b/KAL/kal.h
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                             uC/Common - Kernel Abstraction Layer (KAL)
 *
 * Filename : kal.h
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 

diff --git a/KAL/uCOS-II/kal.c b/KAL/uCOS-II/kal.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -21,7 +21,7 @@
 *                                               uCOS-II
 *
 * Filename : kal.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 * Note(s)  : (1) 'goto' statements were used in this software module. Their usage
 *                is restricted to cleanup purposes in exceptional program flow (e.g.
@@ -1551,7 +1551,7 @@ void  KAL_SemPendAbort (KAL_SEM_HANDLE   sem_handle,
                              OS_PEND_OPT_BROADCAST,
                             &err_os);
         if ((err_os == OS_ERR_NONE) ||
-            (err_os != OS_ERR_PEND_ABORT)) {
+            (err_os == OS_ERR_PEND_ABORT)) {
            *p_err = RTOS_ERR_NONE;
         } else {
            *p_err = KAL_ErrConvert(err_os);

diff --git a/KAL/uCOS-III/kal.c b/KAL/uCOS-III/kal.c
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -21,7 +21,7 @@
 *                                              uCOS-III
 *
 * Filename : kal.c
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 * Note(s)  : (1) 'goto' statements were used in this software module. Their usage
 *                is restricted to cleanup purposes in exceptional program flow (e.g.

diff --git a/README.rst b/README.rst
@@ -0,0 +1,45 @@
+.. raw:: html
+
+   <a href="https://weston-embedded.com/micrium/overview">
+     <p align="center">
+       <img src="https://weston-embedded.com/images/logos/Github/uCOS_logo.png">
+     </p>
+   </a>
+
+µC/OS is a full-featured embedded operating system originally developed by Micriµm™. In addition to the two highly popular kernels, µC/OS features support for TCP/IP, USB-Device, USB-Host, and Modbus, as well as a robust File System.
+
+Since its founding in 1999 as a private company, Micriµm and its team of engineers have offered world-class embedded software components for the most critical and demanding real-time applications. Recognized as having some of the cleanest code in the industry, with easy-to-understand documentation, the Micrium real-time kernels, and software components have successfully been deployed in thousands of products worldwide across a broad range of industries. Micrium’s µC/OS-II™ kernel has been certified for use in safety-critical applications and remains a respected favorite in the medical, aerospace, and industrial markets. µC/OS continues to be the RTOS of choice for engineers requiring the most reliable and trusted solution for their mission-critical applications.
+
+----------
+
+.. raw:: HTML
+
+   <a href="https://weston-embedded.com">
+     <p align="center">
+       <img src="https://weston-embedded.com/images/logos/Github/WES_logo.png">
+     </p>
+   </a>
+
+Founded by a team of former Micrium employees, Weston Embedded Solutions is the official custodian for the µC/OS RTOS and Stacks software repository to ensure it remains the trusted choice for embedded engineers around the world.
+
+----------
+
+Product Documentation and Release Notes
+***************
+https://micrium.atlassian.net/
+
+Technical Support
+*****************
+https://weston-embedded.com/micrium-support
+
+Example Projects
+*********
+https://weston-embedded.com/micrium-examples
+
+Commercial Licensing Option
+*********
+https://weston-embedded.com/products/cesium
+
+Who to Contact
+*********
+https://weston-embedded.com/company/contact
diff --git a/common.h b/common.h
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                                   uC/Common - Common Definitions
 *
 * Filename : common.h
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 
@@ -74,7 +74,7 @@
 *********************************************************************************************************
 */
 
-#define  COMMON_VERSION                                10200u   /* See Note #1.                                         */
+#define  COMMON_VERSION                                10201u   /* See Note #1.                                         */
 
 
 #endif /* COMMON_MODULE_PRESENT */

diff --git a/common_err.h b/common_err.h
@@ -3,7 +3,7 @@
 *                                              uC/Common
 *                                 Common Features for Micrium Stacks
 *
-*                    Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+*                    Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
 *
 *                                 SPDX-License-Identifier: APACHE-2.0
 *
@@ -20,7 +20,7 @@
 *                                   uC/Common - Generic error codes
 *
 * Filename : common_err.h
-* Version  : V1.02.00
+* Version  : V1.02.01
 *********************************************************************************************************
 */
 

diff --git a/readme.md b/readme.md