From 568154f9e6855b47b37bf3d5d507bbd57bba1926 Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:12:16 +0100 Subject: [PATCH 1/8] Update version number --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7e2fd4c9..193731fe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,8 +1,8 @@ lib_mic_array change log ======================== -UNRELEASED ----------- +5.3.0 +----- * FIXED: Vanilla configuration now compiles correctly under XTC 15.3.0 * ADDED: Support for XCommon CMake build system From f71043746615b4a4546431317412957524374277 Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:14:00 +0100 Subject: [PATCH 2/8] Bump version number --- Jenkinsfile | 4 ++-- settings.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e17725f2..8c731905 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('xmos_jenkins_shared_library@v0.25.0') _ +@Library('xmos_jenkins_shared_library@v0.33.0') _ getApproval() pipeline { agent none @@ -15,7 +15,7 @@ pipeline { parameters { string( name: 'TOOLS_VERSION', - defaultValue: '15.2.1', + defaultValue: '15.3.0', description: 'The XTC tools version' ) } diff --git a/settings.yml b/settings.yml index d79f1cd8..90b8f5bf 100644 --- a/settings.yml +++ b/settings.yml @@ -1,7 +1,7 @@ --- project: lib_mic_array title: Mic Array Library -version: 5.1.0 +version: 5.3.0 documentation: exclude_patterns_path: doc/exclude_patterns.inc From eab6de343bfb6f279a13067ca05bb5965f2fe7c5 Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:35:41 +0100 Subject: [PATCH 3/8] Bump infr_apps and infr_scripts_py --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8c731905..1ff3af5c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,8 +59,8 @@ pipeline { println "RUNNING ON" println env.NODE_NAME // Clone infrastructure repos - sh "git clone --branch v1.4.6 git@github.com:xmos/infr_apps" - sh "git clone --branch v1.2.1 git@github.com:xmos/infr_scripts_py" + sh "git clone --branch v1.6.0 git@github.com:xmos/infr_apps" + sh "git clone --branch v1.3.0 git@github.com:xmos/infr_scripts_py" // clone dir("$REPO") { checkout scm From bc2c186928e06ec8637627bc72431ef5f6208444 Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:41:06 +0100 Subject: [PATCH 4/8] Include platform.h --- demos/demo/src/app.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/demo/src/app.cpp b/demos/demo/src/app.cpp index 2e923f4c..4ac995ff 100644 --- a/demos/demo/src/app.cpp +++ b/demos/demo/src/app.cpp @@ -2,7 +2,7 @@ // This Software is subject to the terms of the XMOS Public Licence: Version 1. #include "app.h" - +#include "platform.h" #include "mic_array/cpp/Prefab.hpp" #define DCOE_ENABLED true From 70798c74b592ac591bbb26b5820ad31f9da9cab6 Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:44:49 +0100 Subject: [PATCH 5/8] More platform.h fixes --- demos/common/src/dac_port.c | 1 + 1 file changed, 1 insertion(+) diff --git a/demos/common/src/dac_port.c b/demos/common/src/dac_port.c index bdd8fa58..d38c6feb 100644 --- a/demos/common/src/dac_port.c +++ b/demos/common/src/dac_port.c @@ -6,6 +6,7 @@ #include "app_config.h" #include "i2c.h" #include "aic3204/aic3204.h" +#include "platform.h" i2c_master_t i2c_master_ctx; From 129ef7cbda1d5ed9cefe3ee00a2d4145e2af5bcb Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:49:50 +0100 Subject: [PATCH 6/8] Yet more platform.h changes --- demos/demo_par_decimator/src/app.cpp | 1 + demos/demo_par_decimator/src/app_i2s.c | 1 + demos/demo_vanilla/src/app_i2s.c | 1 + 3 files changed, 3 insertions(+) diff --git a/demos/demo_par_decimator/src/app.cpp b/demos/demo_par_decimator/src/app.cpp index 16efa007..8576d797 100644 --- a/demos/demo_par_decimator/src/app.cpp +++ b/demos/demo_par_decimator/src/app.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "app_config.h" #include "app_mic_array.hpp" diff --git a/demos/demo_par_decimator/src/app_i2s.c b/demos/demo_par_decimator/src/app_i2s.c index 9efb0b3b..9925fd1e 100644 --- a/demos/demo_par_decimator/src/app_i2s.c +++ b/demos/demo_par_decimator/src/app_i2s.c @@ -18,6 +18,7 @@ #include #include #include +#include #include diff --git a/demos/demo_vanilla/src/app_i2s.c b/demos/demo_vanilla/src/app_i2s.c index bb161bb9..ca42a60c 100644 --- a/demos/demo_vanilla/src/app_i2s.c +++ b/demos/demo_vanilla/src/app_i2s.c @@ -15,6 +15,7 @@ #include #include #include +#include #include From d7d87459832ae7780e6ffaeb8ffa3e0e8817c85d Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 16:57:20 +0100 Subject: [PATCH 7/8] Another set of platform.h fixes --- demos/demo/src/app.cpp | 2 +- demos/demo/src/app_i2s.c | 1 + demos/measure_mips/src/app.cpp | 1 + tests/building/prefab/src/app.cpp | 1 + tests/legacy/src/app.cpp | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/demos/demo/src/app.cpp b/demos/demo/src/app.cpp index 4ac995ff..f992063e 100644 --- a/demos/demo/src/app.cpp +++ b/demos/demo/src/app.cpp @@ -2,7 +2,7 @@ // This Software is subject to the terms of the XMOS Public Licence: Version 1. #include "app.h" -#include "platform.h" +#include #include "mic_array/cpp/Prefab.hpp" #define DCOE_ENABLED true diff --git a/demos/demo/src/app_i2s.c b/demos/demo/src/app_i2s.c index b2c6ea59..d773bf6a 100644 --- a/demos/demo/src/app_i2s.c +++ b/demos/demo/src/app_i2s.c @@ -15,6 +15,7 @@ #include #include #include +#include #include diff --git a/demos/measure_mips/src/app.cpp b/demos/measure_mips/src/app.cpp index ec0f70ba..d04760b0 100644 --- a/demos/measure_mips/src/app.cpp +++ b/demos/measure_mips/src/app.cpp @@ -6,6 +6,7 @@ #include #include "app.h" +#include #include "mic_array/cpp/MicArray.hpp" #include "mic_array/cpp/Prefab.hpp" diff --git a/tests/building/prefab/src/app.cpp b/tests/building/prefab/src/app.cpp index 33bb8dd7..6a289a19 100644 --- a/tests/building/prefab/src/app.cpp +++ b/tests/building/prefab/src/app.cpp @@ -2,6 +2,7 @@ // This Software is subject to the terms of the XMOS Public Licence: Version 1. #include "app.h" +#include #include "mic_array/cpp/Prefab.hpp" diff --git a/tests/legacy/src/app.cpp b/tests/legacy/src/app.cpp index 3d34cc03..3d5d222d 100644 --- a/tests/legacy/src/app.cpp +++ b/tests/legacy/src/app.cpp @@ -3,6 +3,7 @@ #include "mic_array.h" #include "mic_array/cpp/Prefab.hpp" #include "app.h" +#include #if (N_MICS != 2) From 4b50c3de28914713272d6c6eb5cf92faf9f45bc1 Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 30 Jul 2024 17:12:01 +0100 Subject: [PATCH 8/8] Fix xscope invocation in tests --- script/mic_array/device_context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/mic_array/device_context.py b/script/mic_array/device_context.py index 2dc8d87f..5da94977 100644 --- a/script/mic_array/device_context.py +++ b/script/mic_array/device_context.py @@ -7,7 +7,7 @@ class DeviceContext(object): - XRUN_CMD_BASE = ('xrun', '--xscope-realtime', '--xscope-port','localhost:10234') + XRUN_CMD_BASE = ('xrun', '--xscope', '--xscope-port','localhost:10234') def __init__(self, xe_path, /, probes=[], **kwargs):