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

Fixes for release v5.3.0 #218

Merged
merged 8 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('xmos_jenkins_shared_library@v0.25.0') _
@Library('xmos_jenkins_shared_library@v0.33.0') _
getApproval()
pipeline {
agent none
Expand All @@ -15,7 +15,7 @@ pipeline {
parameters {
string(
name: 'TOOLS_VERSION',
defaultValue: '15.2.1',
defaultValue: '15.3.0',
description: 'The XTC tools version'
)
}
Expand Down Expand Up @@ -59,8 +59,8 @@ pipeline {
println "RUNNING ON"
println env.NODE_NAME
// Clone infrastructure repos
sh "git clone --branch v1.4.6 [email protected]:xmos/infr_apps"
sh "git clone --branch v1.2.1 [email protected]:xmos/infr_scripts_py"
sh "git clone --branch v1.6.0 [email protected]:xmos/infr_apps"
sh "git clone --branch v1.3.0 [email protected]:xmos/infr_scripts_py"
// clone
dir("$REPO") {
checkout scm
Expand Down
1 change: 1 addition & 0 deletions demos/common/src/dac_port.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "app_config.h"
#include "i2c.h"
#include "aic3204/aic3204.h"
#include "platform.h"

i2c_master_t i2c_master_ctx;

Expand Down
2 changes: 1 addition & 1 deletion demos/demo/src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions demos/demo/src/app_i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <platform.h>

#include <math.h>

Expand Down
1 change: 1 addition & 0 deletions demos/demo_par_decimator/src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <stdint.h>
#include <xcore/channel_streaming.h>
#include <xcore/interrupt.h>
#include <platform.h>

#include "app_config.h"
#include "app_mic_array.hpp"
Expand Down
1 change: 1 addition & 0 deletions demos/demo_par_decimator/src/app_i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <platform.h>

#include <math.h>

Expand Down
1 change: 1 addition & 0 deletions demos/demo_vanilla/src/app_i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <platform.h>

#include <math.h>

Expand Down
1 change: 1 addition & 0 deletions demos/measure_mips/src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <xcore/channel_streaming.h>

#include "app.h"
#include <platform.h>

#include "mic_array/cpp/MicArray.hpp"
#include "mic_array/cpp/Prefab.hpp"
Expand Down
2 changes: 1 addition & 1 deletion script/mic_array/device_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down
2 changes: 1 addition & 1 deletion settings.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/building/prefab/src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +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"

Expand Down
1 change: 1 addition & 0 deletions tests/legacy/src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "mic_array.h"
#include "mic_array/cpp/Prefab.hpp"
#include "app.h"
#include <platform.h>


#if (N_MICS != 2)
Expand Down
Loading