Skip to content

Feature/pendragon #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisc-xmos merged 15 commits into from
Nov 25, 2019
Merged

Feature/pendragon #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d8e5e28
Merge ed/mic_dual into syntient_demo
larry-xmos Sep 5, 2019
99c2e49
Use a non-numbered version tag in changelog
larry-xmos Sep 9, 2019
76a35a3
Remove debug print
larry-xmos Oct 9, 2019
ad3ff8d
Merge branch 'develop' into feature/pendragon
mbanth Nov 5, 2019
bddf878
Merge branch 'develop' into feature/pendragon
mbanth Nov 13, 2019
0342fc4
Merge from develop branch.
mbanth Nov 13, 2019
9c5f469
Remove debugging code.
mbanth Nov 13, 2019
eec2323
Add default values for configuration constants.
mbanth Nov 21, 2019
696159a
Remove the default definition for the MIC_DUAL_FRAME_SIZE configurati…
mbanth Nov 21, 2019
9f17862
Define the correct symbol!
mbanth Nov 21, 2019
961dbe7
Define the correct symbol (take 2)!
mbanth Nov 21, 2019
da483e9
Move the default definition of MIC_ARRAY_MAX_FRAME_SIZE_LOG2 to mic_a…
mbanth Nov 21, 2019
df0d765
Add a default definition of MIC_DUAL_ENABLED and set it to false.
mbanth Nov 22, 2019
f98c838
Do not establish a default value for MIC_DUAL_FRAME_SIZE if MIC_DUAL_…
mbanth Nov 22, 2019
e49f3e2
Update copyright date range.
mbanth Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion lib_mic_array/api/mic_array_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
// Copyright (c) 2015-2017, XMOS Ltd, All rights reserved
// Copyright (c) 2015-2019, XMOS Ltd, All rights reserved
#ifndef MIC_ARRAY_FRAME_H_
#define MIC_ARRAY_FRAME_H_

#include <stdint.h>
#include "mic_array_conf.h"
#include "dsp_fft.h"

#ifndef MIC_DUAL_ENABLED
#define MIC_DUAL_ENABLED (0)
#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.
Copy link
Copy Markdown
Contributor

@oscarbailey-xmos oscarbailey-xmos Nov 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be:

Only define MIC_DUAL_FRAME_SIZE to a default value if MIC_DUAL_ENABLED is false.

#ifndef MIC_DUAL_FRAME_SIZE
#if defined(MIC_DUAL_ENABLED) && (MIC_DUAL_ENABLED != 0)
#define MIC_DUAL_FRAME_SIZE (1)
#endif
#endif

#ifndef MIC_ARRAY_FRAME_SIZE
#define MIC_ARRAY_FRAME_SIZE (1)
#endif

#ifndef MIC_ARRAY_WORD_LENGTH_SHORT
#define MIC_ARRAY_WORD_LENGTH_SHORT 0
#endif
Expand Down
Loading