Merge pull request #372 from uvvpavel/submodules_bump

Submodules bump
xmos · Dec 3, 2024 · d908cb1 · d908cb1
2 parents 6c04d0e + 49f2aae
commit d908cb1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,13 +4,16 @@ XCORE-VOICE change log
 2.3.0
 -----
 
-  * CHANGED: Updated submodule fwk_io to version v3.6.0 from v3.3.0.
-  * CHANGED: Updated submodule fwk_core to version v1.1.0 from v1.0.2. 
-  * CHANGED: Updated submodule fwk_voice to version v0.8.0 from v0.7.0.  
-  * CHANGED: Updated Xmosdoc to version v6.2.0.
   * CHANGED: Updated XTC Tools to 15.3.0.
-  * REMOVED: Deleted inferencing submodule. 
+  * CHANGED: Updated submodule fwk_io to version v3.6.0 from v3.3.0.
+  * CHANGED: Updated submodule fwk_core to version v1.1.0 from v1.0.2.
+  * CHANGED: Updated submodule fwk_voice to version v0.8.0 from v0.7.0.
+  * CHANGED: Updated submodule fwk_rtos to version 3.2.0 from 3.0.5.
+  * CHANGED: Updated submodule lib_src to version 2.7.0 from 2.4.0.
+  * CHANGED: Updated submodule xscope_fileio to version 1.2.0 from 1.1.2.
+  * ADDED: lib_sw_pll submodule v2.3.1.
   * ADDED: xmos-ai-tools v1.3.1 Python requirement. 
+  * REMOVED: Deleted inferencing submodule.
   * ADDED: FFVA INT example with Cyberon speech recognition engine and model
     (DSpotter v2.2.18.0).
   * CHANGED: Moved files in folders device_memory, gpio_ctrl, intent_engine and
@@ -24,8 +27,6 @@ XCORE-VOICE change log
   * ADDED: Support for reading registers over I2C slave in FFD examples.
   * ADDED: Note in ASRC demo documentation about large latency in ASRC
     processing. References to alternative application notes have been provided.
-  * CHANGED: Updated submodule fwk_rtos to version 3.2.0 from 3.0.5.
-  * ADDED: lib_sw_pll submodule v1.1.0.
 
 2.2.0
 -----

diff --git a/examples/ffd/bsp_config/XK_VOICE_L71/platform/platform_init.c b/examples/ffd/bsp_config/XK_VOICE_L71/platform/platform_init.c
@@ -143,9 +143,10 @@ static void platform_sw_pll_init(void)
 
     // Allow p_bclk_count to count bclks
     port_set_clock(p_bclk_count, ck_bclk);
-    sw_pll_init(&sw_pll,
+    sw_pll_lut_init(&sw_pll,
                 SW_PLL_15Q16(0.0),
                 SW_PLL_15Q16(1.0),
+                SW_PLL_15Q16(0.0),
                 PLL_CONTROL_LOOP_COUNT_INT,
                 PLL_RATIO,
                 (appconfBCLK_NOMINAL_HZ / appconfLRCLK_NOMINAL_HZ),

diff --git a/examples/ffd/src/main.c b/examples/ffd/src/main.c
@@ -81,7 +81,7 @@ void sw_pll_control(void *args)
         uint16_t mclk_pt = port_get_trigger_time(i2s_callback_args->p_mclk_count); // Immediately sample mclk_count
         uint16_t bclk_pt = port_get_trigger_time(i2s_callback_args->p_bclk_count); // Now grab bclk_count (which won't have changed)
 
-        sw_pll_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
+        sw_pll_lut_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
     }
 }
 #endif

diff --git a/examples/ffva/bsp_config/XK_VOICE_L71/platform/platform_init.c b/examples/ffva/bsp_config/XK_VOICE_L71/platform/platform_init.c
@@ -191,9 +191,10 @@ static void platform_sw_pll_init(void)
 
     // Allow p_bclk_count to count bclks
     port_set_clock(p_bclk_count, ck_bclk);
-    sw_pll_init(&sw_pll,
+    sw_pll_lut_init(&sw_pll,
                 SW_PLL_15Q16(0.0),
                 SW_PLL_15Q16(1.0),
+                SW_PLL_15Q16(0.0),
                 PLL_CONTROL_LOOP_COUNT_INT,
                 PLL_RATIO,
                 (appconfBCLK_NOMINAL_HZ / appconfLRCLK_NOMINAL_HZ),

diff --git a/examples/ffva/src/main.c b/examples/ffva/src/main.c
@@ -75,7 +75,7 @@ void i2s_slave_intertile(void *args) {
     uint16_t mclk_pt = port_get_trigger_time(i2s_callback_args->p_mclk_count); // Immediately sample mclk_count
     uint16_t bclk_pt = port_get_trigger_time(i2s_callback_args->p_bclk_count); // Now grab bclk_count (which won't have changed)
 
-    sw_pll_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
+    sw_pll_lut_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
 #endif
 
     }

diff --git a/modules/sample_rate_conversion/lib_src b/modules/sample_rate_conversion/lib_src
diff --git a/modules/sw_pll b/modules/sw_pll
diff --git a/modules/xscope_fileio/xscope_fileio b/modules/xscope_fileio/xscope_fileio
+17 −0		.gitignore
+14 −0		CHANGELOG.rst
+117 −82		Jenkinsfile
+24 −46		README.rst
+21 −0		doc/01_device.rst
+23 −0		doc/02_host.rst
+12 −0		doc/Doxyfile.inc
+8 −0		doc/exclude_patterns.inc
+ −		doc/imgs/arch.png
+0 −0		doc/imgs/xscope_fileio.drawio.svg
+23 −0		examples/fileio_features_xc/CMakeLists.txt
+33 −0		examples/fileio_features_xc/README.rst
+8 −8		examples/fileio_features_xc/run_example.py
+19 −3		examples/fileio_features_xc/test.xc
+24 −0		examples/throughput_c/CMakeLists.txt
+1 −1		examples/throughput_c/Makefile
+33 −0		examples/throughput_c/README.rst
+2 −0		examples/throughput_c/main.xc
+16 −5		examples/throughput_c/run_example.py
+2 −0		examples/throughput_c/test.c
+2 −0		host/CMakeLists.txt
+28 −0		host/README.rst
+50 −15		host/xscope_io_host.c
+11 −0		index.rst
+5 −11		requirements.txt
+17 −0		settings.yml
+3 −1		setup.py
+24 −0		tests/close_files/CMakeLists.txt
+34 −0		tests/close_files/README.rst
+10 −0		tests/close_files/config.xscope
+21 −0		tests/close_files/src/main.xc
+89 −0		tests/close_files/src/test.c
+2 −0		tests/compare_bins.py
+24 −0		tests/no_hang/CMakeLists.txt
+10 −0		tests/no_hang/config.xscope
+19 −0		tests/no_hang/src/main.c
+26 −0		tests/no_hang/src/main.xc
+7 −0		tests/pytest.ini
+0 −0		tests/reports/.gitkeep
+68 −0		tests/test_close_files.py
+0 −45		tests/test_features.py
+38 −0		tests/test_features_xc_sim.py
+50 −0		tests/test_no_hang.py
+74 −32		tests/test_throughput.py
+69 −9		xscope_fileio/__init__.py
+94 −69		xscope_fileio/api/xscope_io_device.h
+1 −1		xscope_fileio/config.xscope.txt
+6 −0		xscope_fileio/lib_build_info.cmake
+1 −1		xscope_fileio/module_build_info
+43 −14		xscope_fileio/src/xscope_io_device.c
+5 −3		xscope_fileio/xscope_io_common.h