不韋 呂 / F746_SD_GraphicEqualizer

Output the audio signal with filtering by graphic equalizer in the *.wav file on the SD card using onboard CODEC. SD カードの *.wav ファイルのオーディオ信号をグラフィック･イコライザを通して，ボードに搭載されているCODEC で出力する．

Dependencies:   F746_GUI F746_SAI_IO SD_PlayerSkeleton FrequencyResponseDrawer

Files at this revision

API Documentation at this revision

Revision 24:f78f9d0ac262, committed 2017-04-10

Comitter:
MikamiUitOpen
Date:
Mon Apr 10 04:07:35 2017 +0000
Parent:
23:878419f8638b
Commit message:
25

Changed in this revision

BSP_DISCO_F746NG.lib Show diff for this revision Revisions of this file
F746_GUI.lib Show annotated file Show diff for this revision Revisions of this file
LCD_DISCO_F746NG.lib Show diff for this revision Revisions of this file
MyGraphicEqualizer/GrEqDesignerDrawer.cpp Show annotated file Show diff for this revision Revisions of this file
MyGraphicEqualizer/GrEqDesignerDrawer.hpp Show annotated file Show diff for this revision Revisions of this file
MyGraphicEqualizer/GraphicEqualizer.cpp Show annotated file Show diff for this revision Revisions of this file
MyGraphicEqualizer/GraphicEqualizer.hpp Show annotated file Show diff for this revision Revisions of this file
TS_DISCO_F746NG.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 878419f8638b -r f78f9d0ac262 BSP_DISCO_F746NG.lib
--- a/BSP_DISCO_F746NG.lib	Tue Mar 28 10:45:48 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/teams/ST/code/BSP_DISCO_F746NG/#5a395e126678

diff -r 878419f8638b -r f78f9d0ac262 F746_GUI.lib
--- a/F746_GUI.lib	Tue Mar 28 10:45:48 2017 +0000
+++ b/F746_GUI.lib	Mon Apr 10 04:07:35 2017 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/MikamiUitOpen/code/F746_GUI/#d7f9f667fa68
+https://mbed.org/users/MikamiUitOpen/code/F746_GUI/#e6648167e8d3

diff -r 878419f8638b -r f78f9d0ac262 LCD_DISCO_F746NG.lib
--- a/LCD_DISCO_F746NG.lib	Tue Mar 28 10:45:48 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/teams/ST/code/LCD_DISCO_F746NG/#d44525b1de98

diff -r 878419f8638b -r f78f9d0ac262 MyGraphicEqualizer/GrEqDesignerDrawer.cpp
--- a/MyGraphicEqualizer/GrEqDesignerDrawer.cpp	Tue Mar 28 10:45:48 2017 +0000
+++ b/MyGraphicEqualizer/GrEqDesignerDrawer.cpp	Mon Apr 10 04:07:35 2017 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //  イコライザ用フィルタのパラメータを設定し，その周波数特性を描画するためのクラス
 //  
-//  2017/03/16, Copyright (c) 2017 MIKAMI, Naoki
+//  2017/04/10, Copyright (c) 2017 MIKAMI, Naoki
 //------------------------------------------------------------------------------
 
 #include "GrEqDesignerDrawer.hpp"
@@ -9,8 +9,8 @@
 namespace Mikami
 {
     // Constructor
-    GrEqDesignerDrawer::GrEqDesignerDrawer(uint16_t x0, uint16_t y0,
-                                   int bands, float f0, int fs, float db1)
+    GrEqDesignerDrawer::GrEqDesignerDrawer(uint16_t x0, uint16_t y0, float db1,
+                                           int bands, float f0, int fs)
         : X0_(x0), Y0_(y0), BANDS_(bands), Q_VAL_(1.0f/sqrtf(2.0f)),
           f0_(bands), ck_(bands),
           calculator_(bands, fs), frqResp_(bands),

diff -r 878419f8638b -r f78f9d0ac262 MyGraphicEqualizer/GrEqDesignerDrawer.hpp
--- a/MyGraphicEqualizer/GrEqDesignerDrawer.hpp	Tue Mar 28 10:45:48 2017 +0000
+++ b/MyGraphicEqualizer/GrEqDesignerDrawer.hpp	Mon Apr 10 04:07:35 2017 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //  イコライザ用フィルタのパラメータを設定し，その周波数特性を描画するためのクラス -- Header
 //  
-//  2016/03/17, Copyright (c) 2017 MIKAMI, Naoki
+//  2016/04/10, Copyright (c) 2017 MIKAMI, Naoki
 //------------------------------------------------------------------------------
 
 #ifndef F746_GREQ_DISIGNER_AND_DRAWER_HPP
@@ -18,8 +18,8 @@
     {
     public:
         // Constructor
-        GrEqDesignerDrawer(uint16_t x0, uint16_t y0,
-                           int bands, float f0, int fs, float db1);
+        GrEqDesignerDrawer(uint16_t x0, uint16_t y0, float db1,
+                           int bands, float f0, int fs);
 
         virtual ~GrEqDesignerDrawer() {};
 

diff -r 878419f8638b -r f78f9d0ac262 MyGraphicEqualizer/GraphicEqualizer.cpp
--- a/MyGraphicEqualizer/GraphicEqualizer.cpp	Tue Mar 28 10:45:48 2017 +0000
+++ b/MyGraphicEqualizer/GraphicEqualizer.cpp	Mon Apr 10 04:07:35 2017 +0000
@@ -2,7 +2,7 @@
 //  グラフィックイコライザ用のクラス
 //  （SD_PlayerSkeleton の派生クラス）
 //
-//  2017/03/22, Copyright (c) 2017 MIKAMI, Naoki
+//  2017/04/10, Copyright (c) 2017 MIKAMI, Naoki
 //--------------------------------------------------------------
 
 #include "GraphicEqualizer.hpp"

diff -r 878419f8638b -r f78f9d0ac262 MyGraphicEqualizer/GraphicEqualizer.hpp
--- a/MyGraphicEqualizer/GraphicEqualizer.hpp	Tue Mar 28 10:45:48 2017 +0000
+++ b/MyGraphicEqualizer/GraphicEqualizer.hpp	Mon Apr 10 04:07:35 2017 +0000
@@ -2,7 +2,7 @@
 //  グラフィックイコライザ用のクラス（ヘッダ）
 //  （SD_PlayerSkeleton の派生クラス）
 //
-//  2017/03/28, Copyright (c) 2017 MIKAMI, Naoki
+//  2017/04/10, Copyright (c) 2017 MIKAMI, Naoki
 //--------------------------------------------------------------
 
 #ifndef F746_SD_GRAPHIC_EQUALIZER_HPP
@@ -13,8 +13,6 @@
 #include "SeekbarGroup.hpp"
 #include "BiquadGrEq.hpp"
 
-using namespace Mikami;
-
 namespace Mikami
 {
     class GraphicEqualizer : public SD_PlayerSkeleton

diff -r 878419f8638b -r f78f9d0ac262 TS_DISCO_F746NG.lib
--- a/TS_DISCO_F746NG.lib	Tue Mar 28 10:45:48 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://developer.mbed.org/teams/ST/code/TS_DISCO_F746NG/#fe0cf5e2960f

diff -r 878419f8638b -r f78f9d0ac262 main.cpp
--- a/main.cpp	Tue Mar 28 10:45:48 2017 +0000
+++ b/main.cpp	Mon Apr 10 04:07:35 2017 +0000
@@ -5,10 +5,7 @@
 //                   上記以外の形式は扱わない
 //      出力：モノラル（L+R，左右チャンネルに出力）
 //
-//  ライブラリのリビジョン：
-//      BSP_DISCO_F746NG    rev.5
-//
-//  2017/03/28, Copyright (c) 2017 MIKAMI, Naoki
+//  2017/04/10, Copyright (c) 2017 MIKAMI, Naoki
 //----------------------------------------------------------------
 
 #include "GraphicEqualizer.hpp"
@@ -21,10 +18,10 @@
     GrEqDesignerDrawer drawerObj(
         50,         // グラフの左端の位置
         130,        // グラフの下端の位置
+        2.5f,       // 1 dB 当たりのピクセル数
         9,          // バンド数
         62.5f,      // 最低域の周波数特性を決める周波数
-        AUDIO_FREQUENCY_44K,    // 標本化周波数
-        2.5f);      // 1 dB 当たりのピクセル数
+        AUDIO_FREQUENCY_44K);    // 標本化周波数
 
     GraphicEqualizer myPlayer("9-band Graphic Equalizer",
                               drawerObj);