Merge pull request #154 from xmos/release/v1.1.1

Merge release/v1.1.1 into master

CHANGELOG.rst

@@ -1,6 +1,14 @@
 lib_xua Change Log
 ==================
 
+1.1.1
+-----
+
+  * 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
 -----
 

Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('xmos_jenkins_shared_library@v0.14.1') _
+@Library('xmos_jenkins_shared_library@v0.14.2') _
 
 getApproval()
 

Pipfile

@@ -1,7 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-flake8 = "*"

cpanfile

@@ -1,2 +0,0 @@
-requires 'File::Copy::Recursive';
-requires 'LWP::Simple'

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) \

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
 
-
+/* Initialise g_speed now so we get a sensible packet size until we start properly calculating feedback in the SoF case */
-/* Global var for speed.  Related to feedback. Used by input stream to determine IN packet size */
+/* Without this, zero size input packets fill the input FIFO and it takes a long time to clear out when feedback starts */
-unsigned g_speed;
+/* 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;
 

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=[
+    ],
+)

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