Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v3.0.5 #216

Merged
merged 68 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
90a172b
remove redundant pytest from check_wifi, try new check_usb.sh based o…
GitJRS Jun 22, 2023
afe2f14
Merge pull request #197 from xmos/release/v3.0.4
shuchitak Jun 23, 2023
27de2fc
Use SOF timestamps for rate calculation
Sep 11, 2023
8fc36e4
Update copyright
Sep 18, 2023
6e32624
Changed variable name
Sep 19, 2023
881d26f
Merge pull request #202 from shuchitak/feature/use_sof_timestamps_for…
shuchitak Sep 19, 2023
2b9fa5b
fixes for xmosdoc v4
BrennanGit Sep 22, 2023
7b23dcf
move docs build to jenkins
BrennanGit Sep 22, 2023
db522c6
update xjsl for PR labels
BrennanGit Sep 22, 2023
83332aa
check if test fails when a nullptr is sent
Sep 28, 2023
e3cab13
Fix for num_bytes_sent=NULL in i2c_master_remote_write
Sep 28, 2023
7fefdee
Add test for NULL
Sep 28, 2023
3a3b9c3
fix test
Sep 28, 2023
662947e
added comments to the test
Sep 28, 2023
9a35ef0
Hardcoded sent to 1
Sep 28, 2023
6655c03
Merge pull request #204 from shuchitak/bugfix/i2c_master_null_ptr
shuchitak Sep 28, 2023
3373be1
doc_Builder -> xmosdoc
BrennanGit Oct 3, 2023
26e5bd3
Update doc README.rst
BrennanGit Oct 3, 2023
abf837a
set xmosdoc version to v4
BrennanGit Oct 10, 2023
cb9c336
Merge pull request #203 from BrennanGit/feature/doc_builder_v4
BrennanGit Oct 20, 2023
edd7dd6
Add dummy definitions
xluciano Oct 24, 2023
83dab9f
Fix typo
xluciano Oct 24, 2023
84cdc6c
Update setting file
xluciano Oct 24, 2023
9d735eb
Merge pull request #206 from lucianomartin/bugfix/warnings
xluciano Oct 25, 2023
635fdc3
Review comments
xluciano Oct 25, 2023
540ad02
add disclaimer to legal.rst
BrennanGit Oct 25, 2023
0a75668
only include dsiclaimer in html
BrennanGit Oct 25, 2023
279a1c9
missed a space
BrennanGit Oct 25, 2023
694b1e8
Merge pull request #208 from lucianomartin/feature/review
xluciano Oct 26, 2023
68fc428
Bump fwk_core and fwk_io in CI run
ed-xmos Oct 26, 2023
8c36762
Use tagged releases
ed-xmos Oct 26, 2023
d222040
Reword changelog about fetched modules
ed-xmos Oct 26, 2023
a858cbc
Merge pull request #210 from xmos/feature/update_fetch_deps_to_latest…
ed-xmos Oct 27, 2023
e7de602
Merge branch 'develop' into feature/missing_disclaimer
xluciano Oct 27, 2023
d45e20b
fix tracealyzer url
BrennanGit Oct 27, 2023
8bc813f
Merge pull request #209 from BrennanGit/feature/missing_disclaimer
xluciano Oct 27, 2023
2c58523
Added a runtime check for RPC being set up for I2S Slave case
Oct 31, 2023
dd78892
Changelog update
Oct 31, 2023
524d1fc
Merge pull request #211 from shuchitak/feature/i2s_slave_rpc_assert
shuchitak Oct 31, 2023
6e9e22f
Include xs1.h in rtos_swmem.c
xluciano Oct 31, 2023
1617355
Merge branch 'develop' into feature/include_xs1
xluciano Oct 31, 2023
a9ca97f
Update info for Windows users
xluciano Oct 31, 2023
faddc53
Merge from remote
xluciano Oct 31, 2023
239fb98
Fix syntax
xluciano Oct 31, 2023
2f451c5
Fix syntax
xluciano Oct 31, 2023
f7bd783
Fix syntax
xluciano Oct 31, 2023
5993932
Remove $
xluciano Oct 31, 2023
581ccc1
Update readme files
xluciano Nov 1, 2023
75e9b52
Merge pull request #213 from lucianomartin/feature/include_xs1
xluciano Nov 1, 2023
90750be
Address review comments
xluciano Nov 2, 2023
0095f79
Exclude more files
xluciano Nov 2, 2023
4e07363
Update doc info
xluciano Nov 2, 2023
093fa23
Remove double underscores
xluciano Nov 3, 2023
9561ee7
Fix text
xluciano Nov 3, 2023
4965d74
Update copyright notices
xluciano Nov 3, 2023
9a1d84a
Manual updates
xluciano Nov 3, 2023
0a21867
Merge pull request #215 from lucianomartin/bugfix/copyright-1
xluciano Nov 3, 2023
c801ce5
Merge branch 'develop' of github.com:xmos/fwk_rtos into feature/docs
xluciano Nov 3, 2023
bc1f350
Re-instate double underscore
xluciano Nov 3, 2023
96f1f6e
Last changes
xluciano Nov 3, 2023
0373456
Undo change
xluciano Nov 3, 2023
25c1ad2
Undo change
xluciano Nov 3, 2023
5fad254
Merge pull request #214 from lucianomartin/feature/docs
xluciano Nov 3, 2023
4f614a7
Merge pull request #207 from xmos/develop
xluciano Nov 3, 2023
edf1c89
Use tag v1.0.0 for xmos_cmake_toolchain
xluciano Nov 3, 2023
3eb1dec
Update changelog
xluciano Nov 3, 2023
e70fc03
Merge pull request #217 from lucianomartin/develop
xluciano Nov 3, 2023
0f6a32e
Merge pull request #218 from xmos/develop
xluciano Nov 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
44 changes: 0 additions & 44 deletions .github/workflows/docs.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .xmos_ignore_source_check
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
modules/FreeRTOS
modules/drivers/wifi
fatfs_mkimage/argtable/
fatfs_mkimage/src/tinydir.h
thirdparty
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
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: Updated xmos_cmake_toolchain to v1.0.0 from untagged commit e577fbc
* 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
* ADDED: Runtime check for I2S RPC functions called for I2S Slave

3.0.4
-----

Expand Down
222 changes: 136 additions & 86 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
@Library('xmos_jenkins_shared_library@v0.20.0') _
@Library('xmos_jenkins_shared_library@v0.27.0') _

getApproval()

pipeline {
agent {
label 'xcore.ai-explorer-us'
}
agent none
options {
disableConcurrentBuilds()
skipDefaultCheckout()
Expand All @@ -32,99 +30,151 @@ pipeline {
LOCAL_WIFI_PASS = credentials('hampton-office-network-wifi-password')
}
stages {
stage('Checkout') {
steps {
checkout scm
sh 'git submodule update --init --recursive --depth 1 --jobs \$(nproc)'
}
}
stage('Build tests and host apps') {
steps {
script {
uid = sh(returnStdout: true, script: 'id -u').trim()
gid = sh(returnStdout: true, script: 'id -g').trim()
}
withTools(params.TOOLS_VERSION) {
sh "bash tools/ci/build_rtos_tests.sh"
sh "bash tools/ci/build_host_apps.sh"
}
// List built files for log
sh "ls -la dist/"
sh "ls -la dist_host/"
}
}
stage('Create virtual environment') {
steps {
// Create venv
sh "pyenv install -s $PYTHON_VERSION"
sh "~/.pyenv/versions/$PYTHON_VERSION/bin/python -m venv $VENV_DIRNAME"
// Install dependencies
withVenv() {
sh "pip install git+https://github0.xmos.com/xmos-int/xtagctl.git"
sh "pip install -r test/requirements.txt"
}
}
}
stage('Cleanup xtagctl') {
steps {
// Cleanup any xtagctl cruft from previous failed runs
withTools(params.TOOLS_VERSION) {
withVenv {
sh "xtagctl reset_all $RTOS_TEST_RIG_TARGET"
stage('Build and Docs') {
parallel {
stage('Build Docs') {
agent { label "docker" }
environment { XMOSDOC_VERSION = "v4.0" }
steps {
checkout scm
sh 'git submodule update --init --recursive --depth 1'
sh "docker pull ghcr.io/xmos/xmosdoc:$XMOSDOC_VERSION"
sh """docker run -u "\$(id -u):\$(id -g)" \
--rm \
-v ${WORKSPACE}:/build \
ghcr.io/xmos/xmosdoc:$XMOSDOC_VERSION -v"""
archiveArtifacts artifacts: "doc/_build/**", allowEmptyArchive: true
}
}
sh "rm -f ~/.xtag/status.lock ~/.xtag/acquired"
}
}
stage('Run RTOS Drivers HIL test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "test/rtos_drivers/hil/check_drivers_hil.sh " + adapterIDs[0]
}
sh "pytest test/rtos_drivers/hil"
post {
cleanup {
xcoreCleanSandbox()
}
}
}
}
}
stage('Run RTOS Drivers HIL_Add test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "test/rtos_drivers/hil_add/check_drivers_hil_add.sh " + adapterIDs[0]

stage('Build and Test') {
when {
expression { !env.GH_LABEL_DOC_ONLY.toBoolean() }
}
agent {
label 'xcore.ai-explorer-us'
}
stages {
stage('Checkout') {
steps {
checkout scm
sh 'git submodule update --init --recursive --depth 1 --jobs \$(nproc)'
}
sh "pytest test/rtos_drivers/hil_add"
}
}
}
}
}
stage('Run RTOS Drivers WiFi test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "test/rtos_drivers/wifi/check_wifi.sh " + adapterIDs[0]
stage('Build tests and host apps') {
steps {
script {
uid = sh(returnStdout: true, script: 'id -u').trim()
gid = sh(returnStdout: true, script: 'id -g').trim()
}
// pull docker
sh "docker pull ghcr.io/xmos/xcore_voice_tester:develop"
withTools(params.TOOLS_VERSION) {
sh "bash tools/ci/build_rtos_tests.sh"
sh "bash tools/ci/build_host_apps.sh"
}
// List built files for log
sh "ls -la dist/"
sh "ls -la dist_host/"
}
}
stage('Create virtual environment') {
steps {
// Create venv
sh "pyenv install -s $PYTHON_VERSION"
sh "~/.pyenv/versions/$PYTHON_VERSION/bin/python -m venv $VENV_DIRNAME"
// Install dependencies
withVenv() {
sh "pip install git+https://github0.xmos.com/xmos-int/xtagctl.git"
sh "pip install -r test/requirements.txt"
}
}
}
stage('Cleanup xtagctl') {
steps {
// Cleanup any xtagctl cruft from previous failed runs
withTools(params.TOOLS_VERSION) {
withVenv {
sh "xtagctl reset_all $RTOS_TEST_RIG_TARGET"
}
}
sh "rm -f ~/.xtag/status.lock ~/.xtag/acquired"
}
}
stage('Run RTOS Drivers WiFi test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "test/rtos_drivers/wifi/check_wifi.sh " + adapterIDs[0]
}
sh "pytest test/rtos_drivers/wifi"
}
}
}
}
}
stage('Run RTOS Drivers HIL test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "test/rtos_drivers/hil/check_drivers_hil.sh " + adapterIDs[0]
}
sh "pytest test/rtos_drivers/hil"
}
}
}
}
}
stage('Run RTOS Drivers HIL_Add test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "test/rtos_drivers/hil_add/check_drivers_hil_add.sh " + adapterIDs[0]
}
sh "pytest test/rtos_drivers/hil_add"
}
}
}
}
}
stage('Run RTOS Drivers USB test') {
steps {
withTools(params.TOOLS_VERSION) {
withVenv {
script {
uid = sh(returnStdout: true, script: 'id -u').trim()
gid = sh(returnStdout: true, script: 'id -g').trim()
withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
sh "docker run --rm -u $uid:$gid --privileged -v /dev:/dev -w /fwk_rtos -v $WORKSPACE:/fwk_rtos ghcr.io/xmos/xcore_voice_tester:develop bash -l test/rtos_drivers/usb/check_usb.sh " + adapterIDs[0]
}
sh "pytest test/rtos_drivers/usb"
}
}
}
}
sh "pytest test/rtos_drivers/wifi"
}
}
post {
cleanup {
// cleanWs removes all output and artifacts of the Jenkins pipeline
// Comment out this post section to leave the workspace which can be useful for running items on the Jenkins agent.
// However, beware that this pipeline will not run if the workspace is not manually cleaned.
xcoreCleanSandbox()
}
}
}
}
}
}
post {
cleanup {
// cleanWs removes all output and artifacts of the Jenkins pipeline
// Comment out this post section to leave the workspace which can be useful for running items on the Jenkins agent.
// However, beware that this pipeline will not run if the workspace is not manually cleaned.
cleanWs()
}
}
}
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Supported RTOS stacks and software services include:
- TinyUSB
- Generic processing pipeline
- Inferencing
- Device control
- Device control
- FatFS
- HTTP
- TLS
Expand All @@ -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).

Loading