arduinofft: Move to submodule, define srqt_internal externally

InfiniTimeOrg · Jun 17, 2023 · 505520d · 505520d
1 parent 473a079
commit 505520d
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 2,311 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "src/libs/QCBOR"]
 	path = src/libs/QCBOR
 	url = https://github.com/laurencelundblade/QCBOR.git
+[submodule "src/libs/arduinoFFT"]
+	path = src/libs/arduinoFFT
+	url = https://github.com/kosme/arduinoFFT.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -672,9 +672,9 @@ set(INCLUDE_FILES
         heartratetask/HeartRateTask.h
         components/heartrate/Ppg.h
         components/heartrate/HeartRateController.h
-        libs/arduinoFFT-develop/src/arduinoFFT.h
-        libs/arduinoFFT-develop/src/defs.h
-        libs/arduinoFFT-develop/src/types.h
+        libs/arduinoFFT/src/arduinoFFT.h
+        libs/arduinoFFT/src/defs.h
+        libs/arduinoFFT/src/types.h
         components/motor/MotorController.h
         buttonhandler/ButtonHandler.h
         touchhandler/TouchHandler.h

diff --git a/src/components/heartrate/Ppg.h b/src/components/heartrate/Ppg.h
@@ -5,8 +5,9 @@
 #include <cstdint>
 // Note: Change internal define 'sqrt_internal sqrt' to
 // 'sqrt_internal sqrtf' to save ~3KB of flash.
+#define sqrt_internal sqrtf
 #define FFT_SPEED_OVER_PRECISION
-#include "libs/arduinoFFT-develop/src/arduinoFFT.h"
+#include "libs/arduinoFFT/src/arduinoFFT.h"
 
 namespace Pinetime {
   namespace Controllers {

diff --git a/src/libs/arduinoFFT b/src/libs/arduinoFFT
diff --git a/src/libs/arduinoFFT-develop/.gitignore b/src/libs/arduinoFFT-develop/.gitignore
diff --git a/src/libs/arduinoFFT-develop/Examples/FFT_01/FFT_01.ino b/src/libs/arduinoFFT-develop/Examples/FFT_01/FFT_01.ino
diff --git a/src/libs/arduinoFFT-develop/Examples/FFT_02/FFT_02.ino b/src/libs/arduinoFFT-develop/Examples/FFT_02/FFT_02.ino
diff --git a/src/libs/arduinoFFT-develop/Examples/FFT_03/FFT_03.ino b/src/libs/arduinoFFT-develop/Examples/FFT_03/FFT_03.ino