aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorymherklotz <ymherklotz@gmail.com>2018-02-27 12:03:57 +0000
committerymherklotz <ymherklotz@gmail.com>2018-02-27 12:03:57 +0000
commit1a354b47a09800805ecdf6a0ec24fc1f67405bd8 (patch)
tree501b881a884aa43eec59fdb4ee890b313748fdfd
parent29a2f8ced7860fe31dd5d7defc052d517853f9ae (diff)
parent1c7ecd1b22a9bb7377c9a4db8214f28493b8ba05 (diff)
downloadNoiseSilencer-1a354b47a09800805ecdf6a0ec24fc1f67405bd8.tar.gz
NoiseSilencer-1a354b47a09800805ecdf6a0ec24fc1f67405bd8.zip
Merge branch 'lab5ex2fix' into lab5ex2
-rw-r--r--lab5/Images/Gainy.jpgbin74124 -> 83471 bytes
-rw-r--r--lab5/Images/ImpulseResponsey.jpgbin76361 -> 68439 bytes
-rw-r--r--lab5/Images/Phasey.jpgbin72063 -> 72038 bytes
-rw-r--r--lab5/RTDSP/.launches/RTDSP.launch2
-rw-r--r--lab5/RTDSP/intio.c15
5 files changed, 10 insertions, 7 deletions
diff --git a/lab5/Images/Gainy.jpg b/lab5/Images/Gainy.jpg
index 24f664d..459fd16 100644
--- a/lab5/Images/Gainy.jpg
+++ b/lab5/Images/Gainy.jpg
Binary files differ
diff --git a/lab5/Images/ImpulseResponsey.jpg b/lab5/Images/ImpulseResponsey.jpg
index e3e60af..15e54bd 100644
--- a/lab5/Images/ImpulseResponsey.jpg
+++ b/lab5/Images/ImpulseResponsey.jpg
Binary files differ
diff --git a/lab5/Images/Phasey.jpg b/lab5/Images/Phasey.jpg
index 3f4deb3..61e3272 100644
--- a/lab5/Images/Phasey.jpg
+++ b/lab5/Images/Phasey.jpg
Binary files differ
diff --git a/lab5/RTDSP/.launches/RTDSP.launch b/lab5/RTDSP/.launches/RTDSP.launch
index 086e65e..d970f38 100644
--- a/lab5/RTDSP/.launches/RTDSP.launch
+++ b/lab5/RTDSP/.launches/RTDSP.launch
@@ -13,7 +13,7 @@
<stringAttribute key="CCEDebugOptions.TARGET_CONFIGURATION_OPTION" value="full"/>
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.core.MRU_PROGRAM_NAME" value="C:\Github\RTDSP\lab5\RTDSP\Debug\RTDSP.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.core.MRU_MODULES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;modules&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Fri Jan 19 14:07:28 GMT 2018&quot; time_long=&quot;1516370848357&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Jan 23 11:15:11 GMT 2018&quot; time_long=&quot;1516706111426&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 01 11:44:21 GMT 2018&quot; time_long=&quot;1517485461898&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 15 13:55:55 GMT 2018&quot; time_long=&quot;1518702955359&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab5\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Feb 27 11:23:09 GMT 2018&quot; time_long=&quot;1519730589901&quot;/&gt;&#13;&#10;&lt;/modules&gt;&#13;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.core.MRU_MODULES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;modules&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Fri Jan 19 14:07:28 GMT 2018&quot; time_long=&quot;1516370848357&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Jan 23 11:15:11 GMT 2018&quot; time_long=&quot;1516706111426&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 01 11:44:21 GMT 2018&quot; time_long=&quot;1517485461898&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 15 13:55:55 GMT 2018&quot; time_long=&quot;1518702955359&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab5\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Feb 27 11:57:55 GMT 2018&quot; time_long=&quot;1519732675312&quot;/&gt;&#13;&#10;&lt;/modules&gt;&#13;&#10;"/>
<stringAttribute key="CCEDebugOptions.CPU_NAME" value="Spectrum Digital DSK-EVM-eZdsp onboard USB Emulator_0/TMS320C671X"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RTDSP"/>
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
diff --git a/lab5/RTDSP/intio.c b/lab5/RTDSP/intio.c
index 2c47420..567324c 100644
--- a/lab5/RTDSP/intio.c
+++ b/lab5/RTDSP/intio.c
@@ -133,20 +133,23 @@ void init_HWI()
void ISR_AIC()
{
int i = N-1;
-
- y[0] = 0.0;
//Shift the values
for (; i > 0; --i) {
x[i] = x[i-1];
y[i] = y[i-1];
-
- y[0] += b[i] * x[i] - a[i] * y[i];
}
x[0] = mono_read_16Bit();
-
- y[0] += b[0] * x[0];
+
+ y[0] = 0.0;
+
+ for (i = 0; i < N; ++i) {
+ y[0] += x[i] * b[i];
+ if(i != 0) {
+ y[0] -= y[i] * a[i];
+ }
+ }
mono_write_16Bit((short)y[0]);
}