不韋 呂 / Mbed 2 deprecated Demo_DSP_ADDA_Multirate

ライブラリ "DSP_MultirateLinearphase" の使用例．

Dependencies:   mbed DSP_MultirateLinearphase

Files at this revision

API Documentation at this revision

Revision 8:8256c55a802a, committed 2020-11-28

Comitter:
MikamiUitOpen
Date:
Sat Nov 28 02:27:28 2020 +0000
Parent:
7:8b2c55af5715
Child:
9:388a0203ac37
Commit message:
9

Changed in this revision

DSP_MultirateLinearphase.lib Show annotated file Show diff for this revision Revisions of this file
coefficients.hpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/DSP_MultirateLinearphase.lib	Sat Nov 07 02:19:50 2020 +0000
+++ b/DSP_MultirateLinearphase.lib	Sat Nov 28 02:27:28 2020 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/MikamiUitOpen/code/DSP_MultirateLinearphase/#51726b376b75
+https://os.mbed.com/users/MikamiUitOpen/code/DSP_MultirateLinearphase/#356d0c5f97c3

--- a/coefficients.hpp	Sat Nov 07 02:19:50 2020 +0000
+++ b/coefficients.hpp	Sat Nov 28 02:27:28 2020 +0000
@@ -5,47 +5,47 @@
 //
 //  このファイルを使ってデフォルト以外の係数を使う場合は，以下のいずれかの
 //  #define 文を，このファイルをインクルードする前に記述すること
-//      #define FIR_INTERPOLATOR_ORDER96
-//      #define FIR_INTERPOLATOR_ORDER4
+//      #define FIR_INTERPOLATOR_ORDER94
+//      #define FIR_INTERPOLATOR_ORDER2
 //
-//  2020/06/18, Copyright (c) 2020 MIKAMI, Naoki
+//  2020/11/28, Copyright (c) 2020 MIKAMI, Naoki
 //------------------------------------------------------------------
 
-#ifdef FIR_INTERPOLATOR_ORDER96
+#ifdef FIR_INTERPOLATOR_ORDER94
 // 使用窓関数   Kaiser 窓
 // 標本化周波数 (kHz)      40.000000
-// 次数                    96
+// 次数                    94
 // 種類         LPF
 // 遮断周波数 (kHz)         5.000000
 // 減衰量 (dB)             40.00 
-const int ORDER_ = 96;
+const int ORDER_ = 94;
 const float HK1_[] = {
-    -3.181336E-03f,  5.128636E-03f, -7.675400E-03f,  1.095993E-02f,
-    -1.517799E-02f,  2.063008E-02f, -2.781909E-02f,  3.767194E-02f,
-    -5.211612E-02f,  7.591348E-02f, -1.247794E-01f,  2.984461E-01f,
-     8.997624E-01f, -1.773076E-01f,  9.513684E-02f, -6.231776E-02f,
-     4.412812E-02f, -3.232678E-02f,  2.396353E-02f, -1.772480E-02f,
-     1.293674E-02f, -9.214960E-03f,  6.319428E-03f, -4.087220E-03f};
+    -2.834375E-03f,  4.733192E-03f, -7.242540E-03f,  1.050347E-02f,
+    -1.471384E-02f,  2.017552E-02f, -2.739185E-02f,  3.728930E-02f,
+    -5.179396E-02f,  7.566552E-02f, -1.246163E-01f,  2.983749E-01f,
+     8.997384E-01f, -1.771898E-01f,  9.493016E-02f, -6.203116E-02f,
+     4.377384E-02f, -3.191974E-02f,  2.352042E-02f, -1.726323E-02f,
+     1.247434E-02f, -8.768420E-03f,  5.903704E-03f, -3.714820E-03f};
 const float HK2_[] = {
-    -5.116816E-03f,  8.067276E-03f, -1.190903E-02f,  1.685387E-02f,
-    -2.320755E-02f,  3.144941E-02f, -4.240016E-02f,  5.761400E-02f,
-    -8.044372E-02f,  1.196597E-01f, -2.075416E-01f,  6.350536E-01f,
-     6.350536E-01f, -2.075416E-01f,  1.196597E-01f, -8.044372E-02f,
-     5.761400E-02f, -4.240016E-02f,  3.144941E-02f, -2.320755E-02f,
-     1.685387E-02f, -1.190903E-02f,  8.067276E-03f, -5.116816E-03f};
+    -4.607768E-03f,  7.493168E-03f, -1.128657E-02f,  1.620341E-02f,
+    -2.255220E-02f,  3.081388E-02f, -4.180948E-02f,  5.709228E-02f,
+    -8.001272E-02f,  1.193378E-01f, -2.073427E-01f,  6.349864E-01f,
+     6.349864E-01f, -2.073427E-01f,  1.193378E-01f, -8.001272E-02f,
+     5.709228E-02f, -4.180948E-02f,  3.081388E-02f, -2.255220E-02f,
+     1.620341E-02f, -1.128657E-02f,  7.493168E-03f, -4.607768E-03f};
 const float HK3_[] = {
-    -4.087220E-03f,  6.319428E-03f, -9.214960E-03f,  1.293674E-02f,
-    -1.772480E-02f,  2.396353E-02f, -3.232678E-02f,  4.412812E-02f,
-    -6.231776E-02f,  9.513684E-02f, -1.773076E-01f,  8.997624E-01f,
-     2.984461E-01f, -1.247794E-01f,  7.591348E-02f, -5.211612E-02f,
-     3.767194E-02f, -2.781909E-02f,  2.063008E-02f, -1.517799E-02f,
-     1.095993E-02f, -7.675400E-03f,  5.128636E-03f, -3.181336E-03f};
-#endif  // FIR_INTERPOLATOR_ORDER96
+    -3.714820E-03f,  5.903704E-03f, -8.768420E-03f,  1.247434E-02f,
+    -1.726323E-02f,  2.352042E-02f, -3.191974E-02f,  4.377384E-02f,
+    -6.203116E-02f,  9.493016E-02f, -1.771898E-01f,  8.997384E-01f,
+     2.983749E-01f, -1.246163E-01f,  7.566552E-02f, -5.179396E-02f,
+     3.728930E-02f, -2.739185E-02f,  2.017552E-02f, -1.471384E-02f,
+     1.050347E-02f, -7.242540E-03f,  4.733192E-03f, -2.834375E-03f};
+#endif  // FIR_INTERPOLATOR_ORDER94
 
-#ifdef FIR_INTERPOLATOR_ORDER4
+#ifdef FIR_INTERPOLATOR_ORDER2
 // 以下は，出力の際の補間を行わない場合に相当する信号を出力したい場合に使う
-const int ORDER_ = 4; 
+const int ORDER_ = 2;
 const float HK1_[] = {1};
 const float HK2_[] = {1};
 const float HK3_[] = {1};
-#endif  // FIR_INTERPOLATOR_ORDER4
\ No newline at end of file
+#endif  // FIR_INTERPOLATOR_ORDER2
\ No newline at end of file

--- a/main.cpp	Sat Nov 07 02:19:50 2020 +0000
+++ b/main.cpp	Sat Nov 28 02:27:28 2020 +0000
@@ -6,15 +6,15 @@
 //
 //  処理の内容：AD 変換器からの入力をそのまま DA 変換器に出力する
 //
-//  2020/11/07, Copyright (c) 2020 MIKAMI, Naoki
+//  2020/11/28, Copyright (c) 2020 MIKAMI, Naoki
 //--------------------------------------------------------------------------
 
 #include "MultirateLiPh.hpp"    // マルチレート処理用
 
 // 補間フィルタの係数として，デフォルト以外の係数を使う場合の例：
 //      以下の #define 文のいずれかを有効にする
-#define FIR_INTERPOLATOR_ORDER96    // 96 次のフィルタで補間を行う場合
-//#define FIR_INTERPOLATOR_ORDER4     // 補間を行わない場合
+//#define FIR_INTERPOLATOR_ORDER94    // 94 次のフィルタで補間を行う場合
+//#define FIR_INTERPOLATOR_ORDER2     // 補間を行わない場合
 #include "coefficients.hpp"     // デフォルトの補間用フィルタの係数を使う場合は不要
 
 using namespace Mikami;