From 948546e0d040a67eb16e1267177d28d273e1fac5 Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 22 Jun 2020 16:29:18 +0100 Subject: [PATCH 1/7] Bump! --- CHANGELOG.rst | 5 +++++ lib_xua/module_build_info | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0160f5d3..baca1c68 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ lib_xua Change Log ================== +1.1.1 +----- + + * ADDED: DELETE-ME - Version bump placeholder for develop branch + 1.1.0 ----- diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info index 6f454747..8259a798 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -1,4 +1,4 @@ -VERSION = 1.1.0 +VERSION = 1.1.1 DEPENDENT_MODULES = lib_logging(>=3.0.0) \ lib_xassert(>=4.0.0) \ From 2164d8d023d970b3d567dc5b1e3f41723809fd76 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 2 Sep 2020 11:56:05 +0100 Subject: [PATCH 2/7] Cherry pick decouple bug fix (v0.1.4) that solves the I2S timing pushout on startup --- lib_xua/src/core/buffer/ep/ep_buffer.xc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib_xua/src/core/buffer/ep/ep_buffer.xc b/lib_xua/src/core/buffer/ep/ep_buffer.xc index 2093502f..9a995f8d 100644 --- a/lib_xua/src/core/buffer/ep/ep_buffer.xc +++ b/lib_xua/src/core/buffer/ep/ep_buffer.xc @@ -36,9 +36,10 @@ extern unsigned int g_curSamFreqMultiplier; #define SET_SHARED_GLOBAL0(x,y) SET_SHARED_GLOBAL(x,y) #endif - -/* Global var for speed. Related to feedback. Used by input stream to determine IN packet size */ -unsigned g_speed; +/* Initialise g_speed now so we get a sensible packet size until we start properly calculating feedback in the SoF case */ +/* Without this, zero size input packets fill the input FIFO and it takes a long time to clear out when feedback starts */ +/* This can cause a delay to the decouple ISR being serviced pushing our I2S timing. Initialising solves this */ +unsigned g_speed = (AUDIO_CLASS == 2) ? (DEFAULT_FREQ/8000) << 16 : (DEFAULT_FREQ/1000) << 16; unsigned g_freqChange = 0; unsigned feedbackValid = 0; From c4f32aceab4afffe940698df7ef0dcaeccd6bbfa Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 3 Sep 2020 17:19:01 +0100 Subject: [PATCH 3/7] Update changelog --- CHANGELOG.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index baca1c68..e6bd462d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,8 @@ lib_xua Change Log 1.1.1 ----- - * ADDED: DELETE-ME - Version bump placeholder for develop branch + * RESOLVED: Zero length input packets generated before enumeration causing I2S + timing pushout at startup 1.1.0 ----- From e0b8cdf5f78b0fd75a8be2a36da1dab1302be34f Mon Sep 17 00:00:00 2001 From: lucianom Date: Tue, 22 Sep 2020 09:00:36 +0100 Subject: [PATCH 4/7] Replace Pipfile --- Pipfile | 7 ------- python/setup.py | 19 +++++++++++++++++++ requirements.txt | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 7 deletions(-) delete mode 100644 Pipfile create mode 100644 python/setup.py create mode 100644 requirements.txt diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 6d52bfd2..00000000 --- a/Pipfile +++ /dev/null @@ -1,7 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] -flake8 = "*" diff --git a/python/setup.py b/python/setup.py new file mode 100644 index 00000000..a6efe999 --- /dev/null +++ b/python/setup.py @@ -0,0 +1,19 @@ +# Copyright (c) 2020, XMOS Ltd, All rights reserved +import setuptools + +# Another repository might depend on python code defined in this one. The +# procedure to set up a suitable python environment for that repository may +# pip-install this one as editable using this setup.py file. To minimise the +# chance of version conflicts while ensuring a minimal degree of conformity, +# the 3rd-party modules listed here require the same major version and at +# least the same minor version as specified in the requirements.txt file. +# The same modules should appear in the requirements.txt file as given below. +setuptools.setup( + name='lib_xua', + packages=setuptools.find_packages(), + install_requires=[ + 'flake8~=3.8', + ], + dependency_links=[ + ], +) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..99e7dd7b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,34 @@ +# python_version 3.7.6 +# +# The parse_version_from_requirements() function in the installPipfile.groovy +# file of the Jenkins Shared Library uses the python_version comment to set +# the version of python used. + +# Distributed (released) dependencies +# +# The python modules listed below specify a known working combination required +# by the python code in this repository. The procedure used to set up a +# suitable python environment for it installs the version of each module in +# the list. Using a specific version ensures a controlled infrastructure for +# development, testing and release of this repository. +# +# Another repository might depend on python code defined in this one. The +# procedure to set up a suitable python environment for that repository may +# pip-install this one as editable using this repository's setup.py file. The +# same modules should appear in the setup.py list as given below. + +flake8==3.8.3 + +# Development dependencies +# +# Each link listed below specifies the path to a setup.py file which are +# installed in editable mode with '-e $PATH' (without the quotes). +# +# If python code in this repository depends on python code under development +# in another repository, then an entry for that other respository should +# appear in this list instead of the released dependencies list. +# +# If this repository uses the setup functionality (e.g., script entry points) +# of its own setup.py file, then this list must include an entry for that +# setup.py file, e.g., '-e .' or '-e ./python' (without the quotes). +-e ./python From 740f1250c75558973d6547669abda71d7bdf4210 Mon Sep 17 00:00:00 2001 From: lucianom Date: Fri, 2 Oct 2020 11:19:02 +0100 Subject: [PATCH 5/7] Update pinned version of xmos_jenkins_shared_library --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4f167c75..7be26239 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('xmos_jenkins_shared_library@v0.14.1') _ +@Library('xmos_jenkins_shared_library@v0.14.2') _ getApproval() From 0766275a9a045b73863c9d45af53eecdc35d9649 Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 5 Oct 2020 13:21:08 +0100 Subject: [PATCH 6/7] Add entry --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e6bd462d..e78a7c62 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,7 @@ lib_xua Change Log * RESOLVED: Zero length input packets generated before enumeration causing I2S timing pushout at startup + * CHANGED: Pin Python package versions 1.1.0 ----- From dde097b13016d101958bfdf967bbab290898a7fb Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 7 Oct 2020 14:31:15 +0100 Subject: [PATCH 7/7] Remove not necessary cpanfile --- CHANGELOG.rst | 1 + cpanfile | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 cpanfile diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e78a7c62..73122593 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ lib_xua Change Log * RESOLVED: Zero length input packets generated before enumeration causing I2S timing pushout at startup * CHANGED: Pin Python package versions + * REMOVED: not necessary cpanfile 1.1.0 ----- diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 071f5e6a..00000000 --- a/cpanfile +++ /dev/null @@ -1,2 +0,0 @@ -requires 'File::Copy::Recursive'; -requires 'LWP::Simple'