Feature/pendragon#103
Conversation
All conflicts manually resolved.
The merge of mic_array_dual.xc has been deferred until this repo has a feature/pendragon_change_use_mic_dual branch.
This merge was deferred to allow for some additional checking which has now concluded.
…on constant since it has been defined in mic_array_frame.h. Instead of throwing a link error if MIC_DUAL_ENABLED is not set greater than 0, throw a compilation error.
…rray_conf.h so that an assembler file can pick it up using a #include.
…ENABLED doesn't exist or is false. MIC_DUAL_FRAME_SIZE has no meaning unless MIC_DUAL_ENABLED is true.
larry-xmos
left a comment
larry-xmos
left a comment
There was a problem hiding this comment.
I don't see a problem with these changes. It would be good to ensure that no examples or tests that currently run have been broken, but this is unlikely since the changes seem to introduce defaults where there were no defaults before.
|
The Jenkins CI process includes building the examples and building and running the tests. They all pass. |
There was a problem hiding this comment.
Looks good, although the diff of decimate-to_pcm_4ch.S looks huge it appears to be just removing non-unix line endings (a good thing)
Just a small correction necessary in one of the comments
EDIT: After talking with Michael, the comment was correct initially
| #endif | ||
|
|
||
| // MIC_DUAL_FRAME_SIZE has no meaning if MIC_DUAL_ENABLED is false. | ||
| // Only define MIC_DUAL_FRAME_SIZE to a default value if MIC_DUAL_ENABLED is true. |
There was a problem hiding this comment.
Should be:
Only define MIC_DUAL_FRAME_SIZE to a default value if MIC_DUAL_ENABLED is false.
4 participants
No description provided.