diff --git a/SampleSrc/accel02.ino b/SampleSrc/accel02.ino index e1eef66..f78541d 100644 --- a/SampleSrc/accel02.ino +++ b/SampleSrc/accel02.ino @@ -5,7 +5,7 @@ */ #include -#include "arduinoFFT.h" +#include #define SAMPLE_PERIOD 10 // サンプリング間隔(mS) @@ -13,7 +13,7 @@ double vReal[FFTsamples]; double vImag[FFTsamples]; const double samplingFrequency = 1000.0 / (double)SAMPLE_PERIOD; -arduinoFFT FFT = arduinoFFT(vReal, vImag, FFTsamples, samplingFrequency); +ArduinoFFT FFT = ArduinoFFT(vReal, vImag, FFTsamples, samplingFrequency); int Y0 = 15; int _height = 135 - Y0; @@ -70,10 +70,10 @@ } DCRemoval(vReal, FFTsamples); // 直流分を除去 - FFT.Windowing(FFT_WIN_TYP_HAMMING, FFT_FORWARD); // 窓関数 - FFT.Compute(FFT_FORWARD); // FFT処理(複素数で計算) - FFT.ComplexToMagnitude(); // 複素数を実数に変換 - double x = FFT.MajorPeak(); + FFT.windowing(FFT_WIN_TYP_HAMMING, FFT_FORWARD); // 窓関数 + FFT.compute(FFT_FORWARD); // FFT処理(複素数で計算) + FFT.complexToMagnitude(); // 複素数を実数に変換 + double x = FFT.majorPeak(); M5.Lcd.fillScreen(WHITE); // 画面をクリア drawChart(FFTsamples / 2); diff --git a/SampleSrc/button01.ino b/SampleSrc/button01.ino index 10d9beb..46ea678 100644 --- a/SampleSrc/button01.ino +++ b/SampleSrc/button01.ino @@ -40,3 +40,4 @@ + diff --git a/SampleSrc/pref01.ino b/SampleSrc/pref01.ino index 3805932..d466f00 100644 --- a/SampleSrc/pref01.ino +++ b/SampleSrc/pref01.ino @@ -54,3 +54,4 @@ ESP.restart(); } +