Commit Graph

2818 Commits

Author SHA1 Message Date
Tom Williams
f53c1bab09 fixed merge conflict in OSX makefile 2023-02-15 11:47:28 +00:00
Ross Owen
0c6d947e67 Merge pull request #307 from xross/feature/mixer_tests
Feature/mixer tests
2023-02-09 10:51:08 +00:00
Tom Williams
ee271e3769 fixed typos and build issues 2023-02-08 17:49:58 +00:00
Ross Owen
950beb55cb - Fixed ifndef check
- Fixed mix map update
2023-02-08 17:06:08 +00:00
Tom Williams
ca3276792a initial unified version of usb_mixer.cpp 2023-02-08 16:58:18 +00:00
Ross Owen
e26b934233 Conflicted merge from upstream/develop 2023-02-08 13:58:25 +00:00
Ross Owen
51629dba24 Merge pull request #310 from TDW89/host_usb_win
Host usb win pull_v2
2023-02-08 13:56:46 +00:00
Ross Owen
c5e944d73d Use of storeShort function in mixer weight read and comment updates 2023-02-08 13:18:28 +00:00
Ross Owen
22a3d5e043 Added array to size to extern to fix sizeof usage error 2023-02-08 12:20:42 +00:00
Ross Owen
58f691078d Added range checking when getting/setting mixer weights 2023-02-08 12:04:38 +00:00
Ross Owen
f80d7647e0 - Make usage (of lack of) of CS when setting/getting mixer weights more clear in the implementation
- Fix typo in IN_VOLUME_IN_MIXER define
2023-02-08 11:59:13 +00:00
Tom Williams
fe697929bc merge testing branch and osx updates into branch 2023-02-08 11:59:07 +00:00
Tom Williams
b265ccd8bf Merge remote-tracking branch 'xmos/develop' into develop
bringing personal fork up to date
2023-02-08 10:39:25 +00:00
Ross Owen
6c2e7e3042 Fixed issue setting mix maps (#308) 2023-02-08 10:02:32 +00:00
Ross Owen
15ca5ec281 Fixed unused var warning 2023-02-07 16:35:38 +00:00
Ross Owen
71aa64425d Added missing bounds checking when setting host and device maps in the mixer 2023-02-07 12:14:19 +00:00
Ross Owen
9080990234 Fixed typo in define check 2023-02-06 23:44:20 +00:00
Ross Owen
6d8cf9913f Increase timeout cycles for test_mixer_routing_output 2023-02-06 23:42:33 +00:00
Ross Owen
60040de58f Further build issue fixes and copyright comments 2023-02-06 21:08:47 +00:00
Ross Owen
27a59ab3bc - Fixed MIXER define usage in main
- Fixed unsafe pointer usage when MAX_MIX_COUNT=0
- Fixed syntax error building mixer when no features enabled relating to empty switch statement
2023-02-06 21:05:48 +00:00
Ross Owen
317e27e421 - Rationalised MIXER defines and usage
- Further removal of xc_ptr type usage in mixer in favour of native xc pointers
2023-02-06 20:28:29 +00:00
Ross Owen
035c20e01c Fixed build issue in mixer when FAST_MIXER not used 2023-02-06 18:14:48 +00:00
Ross Owen
ef97d667de Further moving of mixer from xc_ptr type to XC pointers 2023-02-06 18:09:33 +00:00
Ross Owen
0e07dc29bc Fix issue in mixer host app when retrieving mixer input strings. Also firmed up some usage error checking. 2023-02-03 11:09:43 +00:00
Ross Owen
43f77c177d Small updates to mixer control README 2023-02-03 11:08:23 +00:00
Ross Owen
6754f812c9 Fixed issues with setting mix map in mixer host app 2023-02-03 11:08:06 +00:00
Ross Owen
fc732b8512 Updated changelog 2023-02-03 11:06:40 +00:00
Ross Owen
39ed235476 Removed old module_description file 2023-02-03 11:06:23 +00:00
Ross Owen
0d7224bd6d Added -arch for to mixer host app makefile 2023-02-03 11:06:13 +00:00
Ross Owen
fd4dfd40a9 Tidy .gitignore 2023-02-03 11:05:21 +00:00
Ross Owen
3d50c96595 - Removed dead XTA pragmas and code from mixer
- Added some more asserts to mixer
2023-02-03 10:59:20 +00:00
Tom Williams
379e8eb54c changed jenkins file to use sh rather than runVS 2023-02-01 16:29:05 +00:00
Tom Williams
63763cf4f5 fixed progect file & typo in jenkinsfile 2023-02-01 15:50:42 +00:00
Tom Williams
b18c34fb0f OSX makefile changed to work on M1, VS project file changed to 2019 (toolset 142) and Jenkins file now builds and archives the binaries 2023-02-01 14:11:47 +00:00
Tom Williams
64d65afeaf project file fixes 2023-02-01 13:43:53 +00:00
Tom Williams
7a47d70229 Revert "added path variable to link project to sdk"
This reverts commit cffd35d146.
2023-02-01 13:40:54 +00:00
Ross Owen
ce8e5a6dbb Merge branch 'develop' into feature/mixer_tests 2023-02-01 12:01:47 +00:00
Ross Owen
bbed806aab Merge remote-tracking branch 'upstream' into develop 2023-02-01 12:01:21 +00:00
Ross Owen
9af31b8c70 Merge pull request #305 from TDW89/host_usb_mixer_control
host_usb_mixer_control_OSX_support
2023-02-01 12:00:45 +00:00
Ross Owen
73955c1a4c - Added mixer related defines to reduce use of magic numbers
- Increases debug output when DEBUG flag set
- Removed some dead code
- Increased alignment of asm mixer functions
- Removed some usages of “xc_ptr” type in favour of native pointers in XC
- Added some asserts to mixer
- Added test_mixer_routing_input
- Moved test_mixer_routing_output to use shared code
2023-02-01 11:54:48 +00:00
Tom Williams
cffd35d146 added path variable to link project to sdk 2023-01-25 16:31:05 +00:00
Tom Williams
ab535e0fb3 removed temporary debug code 2023-01-25 11:07:49 +00:00
Tom Williams
17b039dce8 licence updates 2023-01-25 10:48:44 +00:00
Tom Williams
7a0d0e1f97 Initial windows commit 2023-01-25 10:23:57 +00:00
Tom Williams
2f31260612 updated copyright headers 2023-01-18 16:51:47 +00:00
Tom Williams
9922190450 removed versioning and license files as they are now part of the top level. added the help option to the readme 2023-01-18 16:01:08 +00:00
Ross Owen
0ce91bec90 Copyright comment 2023-01-17 12:12:46 +00:00
Ross Owen
2404eaf35f Remove extern, mark static inline 2023-01-17 11:53:44 +00:00
Ross Owen
8966ad1bb9 Add external linkage to inline DoSampleTransfer 2023-01-17 11:39:22 +00:00
Ross Owen
513761ef5b Moved DoSampleTransfer to a header file so it can still be inlined (but also used in unit tests). Resolves fails in test_i2s_loopback 2023-01-17 11:33:52 +00:00