Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: BSP_DISCO_F746NG F746_GUI LCD_DISCO_F746NG SDFileSystem_Warning_Fixed TS_DISCO_F746NG mbed FrequencyResponseDrawer F746_SAI_IO Array_Matrix
Revision 8:e9309409f4a7, committed 2016-05-09
- Comitter:
- MikamiUitOpen
- Date:
- Mon May 09 13:55:48 2016 +0000
- Parent:
- 7:2964179ff931
- Child:
- 9:fe097e4c9024
- Commit message:
- 9
Changed in this revision
| F746_SAI_IO.lib | 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/F746_SAI_IO.lib Sat May 07 07:58:42 2016 +0000 +++ b/F746_SAI_IO.lib Mon May 09 13:55:48 2016 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/MikamiUitOpen/code/F746_SAI_IO/#eade5d3ae0eb +http://mbed.org/users/MikamiUitOpen/code/F746_SAI_IO/#1aef7b703249
--- a/main.cpp Sat May 07 07:58:42 2016 +0000
+++ b/main.cpp Mon May 09 13:55:48 2016 +0000
@@ -5,7 +5,7 @@
// IIR フィルタ ---- 低域通過および高域通過フィルタ
// 出力：モノラル
//
-// 2016/05/07, Copyright (c) 2016 MIKAMI, Naoki
+// 2016/05/09, Copyright (c) 2016 MIKAMI, Naoki
//--------------------------------------------------------------
#include "MyFunctions.hpp"
@@ -121,6 +121,7 @@
// IIR フィルタの内部の遅延器のクリア
for (int k=0; k<ORDER/2; k++) hn[k].Clear();
+ mySai.PlayOut(); // Play 開始
for (int k=0; k<loopCount; k++)
{
@@ -131,7 +132,7 @@
{
menu.Inactivate(2); // PAUSE 無効
menu.Activate(3); // RESUME 有効
- mySai.Pause();
+ mySai.PauseOut();
// PLAY か RESUME か STOP がタッチされるまで待つ
int touch134 = -1;
@@ -140,14 +141,14 @@
hn, ck, g0, filterOn);
switch (touch134)
{
- case 1: playOk = true; // 最初から PLAY
+ case 1: playOk = true; // 最初から PLAY
break;
- case 3: mySai.Resume(); // PAUSE したところから PLAY 再開
+ case 3: mySai.ResumeOut(); // PAUSE したところから PLAY 再開
menu.Activate(2);
menu.Inactivate(3);
menu.TouchedColor(1);
break;
- case 4: stopOk = true; // STOP
+ case 4: stopOk = true; // STOP
break;
}
}
@@ -157,7 +158,7 @@
// １フレーム分の信号処理 (IIR フィルタ) の実行
ProcessSignal(sdReader, mySai, sn, g0, hn, ORDER, filterOn);
}
- mySai.Stop();
+ mySai.StopOut();
menu.Activate(0); // OPEN 有効
if (!playOk) menu.Activate(1); // PLAY 有効
for (int n=2; n<5; n++) // その他は無効