Merge branch 'develop' into feature/update_agents

xmos · Oct 27, 2023 · fb04c2c · fb04c2c
2 parents 8423316 + 8bc813f
commit fb04c2c
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 11 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,14 @@
 RTOS Framework change log
 =========================
 
+3.0.5
+-----
+
+  * FIXED: Added dummy definitions of vTaskCoreAffinitySet() and vTaskCoreAffinitySet() functions to
+    avoid warnings when configNUM_CORES is set to 1.
+  * UPDATED: Tested against fwk_io v3.3.0 updated from v3.0.1
+  * UPDATED: Tested against fwk_core v1.0.2 updated from v1.0.0
+
 3.0.4
 -----
 

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Supported RTOS stacks and software services include:
 - TinyUSB
 - Generic processing pipeline
 - Inferencing
-- Device control 
+- Device control
 - FatFS
 - HTTP
 - TLS
@@ -55,15 +55,17 @@ Some dependent components are included as git submodules. These can be obtained
 
 ## Testing
 
-Several tests for the RTOS framework modules exist in the [test folder](https://github.com/xmos/fwk_rtos/tree/develop/test).  
+Several tests for the RTOS framework modules exist in the [test folder](https://github.com/xmos/fwk_rtos/tree/develop/test).
 
 ## Documentation
 
-Information on building the documentation can be found in the docs [README](https://github.com/xmos/fwk_rtos/blob/develop/doc/README.rst).
+This folder contains source files for the documentation and is intended for XMOS users. Pre-built documentation is published on https://www.xmos.com.
+
+The sources do not render well in GitHub or an RST viewer.
 
 ## License
 
 This Software is subject to the terms of the [XMOS Public Licence: Version 1](https://github.com/xmos/fwk_rtos/blob/develop/LICENSE.rst)
 
-Third party copyrighted code is specified in the fwk_rtos [Copyrights and Licenses](https://github.com/xmos/fwk_rtos/blob/develop/doc/copyright.rst).  
+Third party copyrighted code is specified in the fwk_rtos [Copyrights and Licenses](https://github.com/xmos/fwk_rtos/blob/develop/doc/copyright.rst).
 
diff --git a/doc/programming_guide/reference/rtos_drivers/trace.rst b/doc/programming_guide/reference/rtos_drivers/trace.rst
@@ -105,7 +105,7 @@ by the Tracealyzer graphical tool either as a post processing step or live.
     `Recording Settings`.
 
 For general usage of Tracealyzer please refer to the Percepio's documentation here:
-`Manual <https://percepio.com/docs/FreeRTOS/manual/index.html#Introduction___Welcome_to_Tracealyzer>`_
+`Manual <https://percepio.com/getstarted/latest/html/freertos.html>`_
 
 **********
 ASCII Mode

diff --git a/doc/shared/legal.rst b/doc/shared/legal.rst
@@ -1,5 +1,16 @@
 .. _fwk_rtos_copyright:
 
+.. only:: html
+
+    Copyright & Disclaimer
+    ======================
+
+    |XMOS copyright|
+
+    |XMOS disclaimer|
+
+    |XMOS trademarks|
+
 
 Licenses
 ========

diff --git a/modules/osal/FreeRTOS/rtos_osal_thread_port.c b/modules/osal/FreeRTOS/rtos_osal_thread_port.c
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 XMOS LIMITED.
+// Copyright 2021-2023 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 
 /**
@@ -7,6 +7,23 @@
 
 #include "rtos_osal.h"
 
+// The functions below are declared in the third-party file:
+// ./modules/fwk_xvf/modules/rtos/modules/FreeRTOS/FreeRTOS-SMP-Kernel/include/task.h
+#if ( configUSE_CORE_AFFINITY == 1 ) && ( configNUM_CORES == 1 )
+
+    void vTaskCoreAffinitySet( const TaskHandle_t xTask,
+                               UBaseType_t uxCoreAffinityMask )
+    {
+        (void) (xTask);
+        (void) (uxCoreAffinityMask);
+    }
+    UBaseType_t vTaskCoreAffinityGet( const TaskHandle_t xTask )
+    {
+        (void) xTask;
+        return 0;
+    }
+#endif /* configUSE_CORE_AFFINITY and configNUM_CORES */
+
 int rtos_osal_critical_enter(void)
 {
     int state;

diff --git a/settings.yml b/settings.yml
@@ -1,7 +1,7 @@
 ---
 project: fwk_rtos
 title: XCORE RTOS Framework
-version: 3.0.4
+version: 3.0.5
 
 documentation:
   exclude_patterns_path: doc/exclude_patterns.inc

diff --git a/test/rtos_drivers/usb/serial_send_receive.py b/test/rtos_drivers/usb/serial_send_receive.py
@@ -30,7 +30,7 @@ def parse_arguments():
     return args
 
 def main(if0, if1, of0, of1):
-           
+
     all_ports = serial.tools.list_ports.comports()
     test_ports = []
     required_ports = 2

diff --git a/tools/ci/fetch_ci_deps.cmake b/tools/ci/fetch_ci_deps.cmake
@@ -8,7 +8,7 @@
         FetchContent_Declare(
             fwk_io
             GIT_REPOSITORY https://github.com/xmos/fwk_io.git
-            GIT_TAG        f35192c19824d60740003be5448c67f5df927014
+            GIT_TAG        v3.3.0
             GIT_SHALLOW    FALSE
             GIT_SUBMODULES_RECURSE TRUE
             SOURCE_DIR     ${CMAKE_BINARY_DIR}/dependencies/fwk_io
@@ -25,7 +25,7 @@
         FetchContent_Declare(
             fwk_core
             GIT_REPOSITORY https://github.com/xmos/fwk_core.git
-            GIT_TAG        9e4f6196386995e2d7786b376091404638055639
+            GIT_TAG        v1.0.2
             GIT_SHALLOW    FALSE
             GIT_SUBMODULES_RECURSE TRUE
             SOURCE_DIR     ${CMAKE_BINARY_DIR}/dependencies/fwk_core
@@ -42,7 +42,7 @@
         FetchContent_Declare(
             lib_qspi_fast_read
             GIT_REPOSITORY git@github.com:xmos/lib_qspi_fast_read.git
-            GIT_TAG        85fe54188b5f3244c744f6d2aeebd757d8f25358
+            GIT_TAG        v1.0.1
             GIT_SHALLOW    FALSE
             GIT_SUBMODULES_RECURSE TRUE
             SOURCE_DIR     ${CMAKE_BINARY_DIR}/dependencies/lib_qspi_fast_read