Resolve conflicts for PI and support compile for RP2040

Author: pschatzmann

.vscode/settings.json

@@ -79,6 +79,7 @@
         "concepts": "cpp",
         "memory_resource": "cpp",
         "ranges": "cpp",
-        "stop_token": "cpp"
+        "stop_token": "cpp",
+        "math": "cpp"
     }
 }

README.md

@@ -13,7 +13,7 @@ This project has been implemented as Arduino Library and runs on ESP32 processor
 
 ## Further information
 
-The oringial STK library is asking to include each used header file separately. For convinence I have added the StkAll.h which provides all header files.
+The oringial STK library is asking to include each used header file separately. For convinence I have added the StkAll.h which provides all header files. It also provides the related use namespace.
 
 Further information can be found in my Blogs
 - [Overview](https://www.pschatzmann.ch/home/2020/09/24/the-synthesis-toolkit-skt-library-for-the-arduino-esp32/)
@@ -23,6 +23,7 @@ Further information can be found in my Blogs
 
 
 ## Installation
+
 Download the project as zip and install the file in the Arduino IDE via -> Sketch -> Include Library -> Add ZIP Library or execute the following command in the Arduino Library Folder
 
 ```
@@ -32,7 +33,9 @@ git clone https://github.com/pschatzmann/Arduino-STK.git
 ## Supported Processors
 
 - ESP32 - The deveopment and testing has been done with the ESP32 so this will be the most stable and complete platform. 
-- ESP8266 - I managed to have the code base compiling with the ESP8266 as well. This environment does not support Bluetooth. 
+- I managed to have the code to compile with the following processors the as well:
+  - ESP8266
+  - RP2040
 
 You can consult the ArdConig.h file for the available functionality for your processor!
 

library.properties

@@ -6,5 +6,5 @@ sentence=The Synthesis ToolKit in C++ (STK)
 paragraph=Syntheizer which  plays on an I2S DAC or a software-driven delta-sigma DAC and 1-transistor amplifier.
 category=Signal Input/Output
 url=https://github.com/pschatzmann/Arduino-STK
-architectures=esp8266,esp32
+architectures=esp8266,esp32,rp2040
 

src/ArdConfig.cpp

@@ -0,0 +1,11 @@
+#include "ArdConfig.h"
+
+#ifdef STK_ERROR_MSG_LEN
+char stk_error_msg[STK_ERROR_MSG_LEN];
+#endif
+
+
+#ifdef ARDUINO_ARCH_RP2040
+extern "C" void __sync_synchronize() {
+}
+#endif

src/ArdConfig.h

@@ -1,3 +1,4 @@
+#pragma once
 /**
     ArdConfig.h
  
@@ -18,9 +19,6 @@
 //  Uncomment after installing https://github.com/pschatzmann/ESP32-A2DP
 //  #define __BT_A2DP__         // output to A2DP sink
 
-    #undef PI
-    #undef TWO_PI
-
 #elif defined(ESP8266)
     #define __RAW_ARRAYS__      
     #define __STREAMS__
@@ -29,8 +27,6 @@
     #define __NO_FSTREAM__      // No Messanger, MidiFileIn and Skini and FileRead
 
     #include "FS.h"
-    #undef PI
-    #undef TWO_PI
     #undef round(x)
 
 #elif defined(ARDUINO)
@@ -42,10 +38,10 @@
     #define __NO_FSTREAM__      // No Messanger, MidiFileIn and Skini and FileRead
     #define __NO_RT__           // no STK RT functions
 
-    #include <ArduinoSTL.h>
-
-    #undef PI
-    #undef TWO_PI
+    // Logging support
+    #define STK_ERROR_MSG_LEN 200
+    extern char stk_error_msg[STK_ERROR_MSG_LEN];
+    #define ESP_LOGD(APP,...) { snprintf(stk_error_msg, STK_ERROR_MSG_LEN, __VA_ARGS__); Serial.println(stk_error_msg); }
 
 #endif
 

src/BandedWG.cpp

@@ -199,7 +199,7 @@ void BandedWG :: setFrequency( StkFloat frequency )
     //	std::cerr << std::endl;
 
     // Set the bandpass filter resonances
-    radius = 1.0 - PI * 32 / Stk::sampleRate(); //frequency_ * modes_[i] / Stk::sampleRate()/32;
+    radius = 1.0 - STK_PI * 32 / Stk::sampleRate(); //frequency_ * modes_[i] / Stk::sampleRate()/32;
     if ( radius < 0.0 ) radius = 0.0;
     bandpass_[i].setResonance(frequency * modes_[i], radius, true);
 

src/BiQuad.cpp

@@ -65,7 +65,7 @@ void BiQuad :: setResonance( StkFloat frequency, StkFloat radius, bool normalize
 #endif
 
   a_[2] = radius * radius;
-  a_[1] = -2.0 * radius * cos( TWO_PI * frequency / Stk::sampleRate() );
+  a_[1] = -2.0 * radius * cos( STK_TWO_PI * frequency / Stk::sampleRate() );
 
   if ( normalize ) {
     // Use zeros at +- 1 and normalize the filter peak gain.
@@ -90,7 +90,7 @@ void BiQuad :: setNotch( StkFloat frequency, StkFloat radius )
 
   // This method does not attempt to normalize the filter gain.
   b_[2] = radius * radius;
-  b_[1] = (StkFloat) -2.0 * radius * cos( TWO_PI * (double) frequency / Stk::sampleRate() );
+  b_[1] = (StkFloat) -2.0 * radius * cos( STK_TWO_PI * (double) frequency / Stk::sampleRate() );
 }
 
 void BiQuad :: setEqualGainZeroes( void )

src/Blit.cpp

@@ -55,7 +55,7 @@ void Blit :: setFrequency( StkFloat frequency )
   }
 
   p_ = Stk::sampleRate() / frequency;
-  rate_ = PI / p_;
+  rate_ = STK_PI / p_;
   this->updateHarmonics();
 }
 

src/Blit.h

@@ -46,13 +46,13 @@ class Blit: public Generator
   /*!
     Set the phase of the signal, in the range 0 to 1.
   */
-  void setPhase( StkFloat phase ) { phase_ = PI * phase; };
+  void setPhase( StkFloat phase ) { phase_ = STK_PI * phase; };
 
   //! Get the current phase of the signal.
   /*!
     Get the phase of the signal, in the range [0 to 1.0).
   */
-  StkFloat getPhase() const { return phase_ / PI; };
+  StkFloat getPhase() const { return phase_ / STK_PI; };
 
   //! Set the impulse train rate in terms of a frequency in Hz.
   void setFrequency( StkFloat frequency );
@@ -123,7 +123,7 @@ inline StkFloat Blit :: tick( void )
   }
 
   phase_ += rate_;
-  if ( phase_ >= PI ) phase_ -= PI;
+  if ( phase_ >= STK_PI ) phase_ -= STK_PI;
 
   lastFrame_[0] = tmp;
 	return lastFrame_[0];

src/BlitSaw.cpp

@@ -55,7 +55,7 @@ void BlitSaw :: setFrequency( StkFloat frequency )
 
   p_ = Stk::sampleRate() / frequency;
   C2_ = 1 / p_;
-  rate_ = PI * C2_;
+  rate_ = STK_PI * C2_;
   this->updateHarmonics();
 }
 

src/BlitSaw.h

@@ -119,7 +119,7 @@ inline StkFloat BlitSaw :: tick( void )
   state_ = tmp * 0.995;
 
   phase_ += rate_;
-  if ( phase_ >= PI ) phase_ -= PI;
+  if ( phase_ >= STK_PI ) phase_ -= STK_PI;
 
   lastFrame_[0] = tmp;
 	return lastFrame_[0];

src/BlitSquare.cpp

@@ -69,7 +69,7 @@ void BlitSquare :: setFrequency( StkFloat frequency )
   // waveform at half the blit frequency.  Thus, we need to scale the
   // frequency value here by 0.5. (GPS, 2006).
   p_ = 0.5 * Stk::sampleRate() / frequency;
-  rate_ = PI / p_;
+  rate_ = STK_PI / p_;
   this->updateHarmonics();
 }
 

src/BlitSquare.h

@@ -55,13 +55,13 @@ class BlitSquare: public Generator
   /*!
     Set the phase of the signal, in the range 0 to 1.
   */
-  void setPhase( StkFloat phase ) { phase_ = PI * phase; };
+  void setPhase( StkFloat phase ) { phase_ = STK_PI * phase; };
 
   //! Get the current phase of the signal.
   /*!
     Get the phase of the signal, in the range [0 to 1.0).
   */
-  StkFloat getPhase() const { return phase_ / PI; };
+  StkFloat getPhase() const { return phase_ / STK_PI; };
 
   //! Set the impulse train rate in terms of a frequency in Hz.
   void setFrequency( StkFloat frequency );
@@ -126,7 +126,7 @@ inline StkFloat BlitSquare :: tick( void )
   StkFloat denominator = sin( phase_ );
   if ( fabs( denominator )  < std::numeric_limits<StkFloat>::epsilon() ) {
     // Inexact comparison safely distinguishes betwen *close to zero*, and *close to PI*.
-    if ( phase_ < 0.1f || phase_ > TWO_PI - 0.1f )
+    if ( phase_ < 0.1f || phase_ > STK_TWO_PI - 0.1f )
       lastBlitOutput_ = a_;
     else
       lastBlitOutput_ = -a_;
@@ -143,7 +143,7 @@ inline StkFloat BlitSquare :: tick( void )
   dcbState_ = lastBlitOutput_;
 
   phase_ += rate_;
-  if ( phase_ >= TWO_PI ) phase_ -= TWO_PI;
+  if ( phase_ >= STK_TWO_PI ) phase_ -= STK_TWO_PI;
 
 	return lastFrame_[0];
 }

src/BlowHole.cpp

@@ -74,8 +74,8 @@ BlowHole :: BlowHole( StkFloat lowestFrequency )
   double r_rh = 0.0015;    // register vent radius
   te = 1.4 * r_rh;         // effective length of the open hole
   double xi = 0.0;         // series resistance term
-  double zeta = 347.23 + 2*PI*pow(rb,2)*xi/1.1769;
-  double psi = 2*PI*pow(rb,2)*te / (PI*pow(r_rh,2));
+  double zeta = 347.23 + 2*STK_PI*pow(rb,2)*xi/1.1769;
+  double psi = 2*STK_PI*pow(rb,2)*te / (STK_PI*pow(r_rh,2));
   StkFloat rhCoeff = (zeta - 2 * Stk::sampleRate() * psi) / (zeta + 2 * Stk::sampleRate() * psi);
   rhGain_ = -347.23 / (zeta + 2 * Stk::sampleRate() * psi);
   vent_.setA1( rhCoeff );

src/Filter.h

@@ -97,7 +97,7 @@ inline StkFloat Filter :: phaseDelay( StkFloat frequency )
     handleError( StkError::WARNING ); return 0.0;
   }
 
-  StkFloat omegaT = 2 * PI * frequency / Stk::sampleRate();
+  StkFloat omegaT = 2 * STK_PI * frequency / Stk::sampleRate();
   StkFloat real = 0.0, imag = 0.0;
   for ( unsigned int i=0; i<b_.size(); i++ ) {
     real += b_[i] * std::cos( i * omegaT );
@@ -115,7 +115,7 @@ inline StkFloat Filter :: phaseDelay( StkFloat frequency )
   }
 
   phase -= std::atan2( imag, real );
-  phase = std::fmod( -phase, 2 * PI );
+  phase = std::fmod( -phase, 2 * STK_PI );
   return phase / omegaT;
 }
 

src/FormSwep.cpp

@@ -68,7 +68,7 @@ void FormSwep :: setResonance( StkFloat frequency, StkFloat radius )
   frequency_ = frequency;
 
   a_[2] = radius * radius;
-  a_[1] = -2.0 * radius * cos( TWO_PI * frequency / Stk::sampleRate() );
+  a_[1] = -2.0 * radius * cos( STK_TWO_PI * frequency / Stk::sampleRate() );
 
   // Use zeros at +- 1 and normalize the filter peak gain.
   b_[0] = 0.5 - 0.5 * a_[2];

src/Guitar.cpp

@@ -94,7 +94,7 @@ void Guitar :: setBodyFile( std::string bodyfile )
     // Smooth the start and end of the noise.
     unsigned int N = (unsigned int) M * 0.2; // arbitrary value
     for ( unsigned int n=0; n<N; n++ ) {
-      StkFloat weight = 0.5 * ( 1.0 - cos( n * PI / (N-1) ) );
+      StkFloat weight = 0.5 * ( 1.0 - cos( n * STK_PI / (N-1) ) );
       excitation_[n] *= weight;
       excitation_[M-n-1] *= weight;
     }

src/LentPitShift.h

@@ -173,7 +173,7 @@ inline void LentPitShift::process()
 
   // Initialization of the Hamming window used in the algorithm
   for ( int n=-(int)lastPeriod_; n<(int)lastPeriod_; n++ )
-    window[n+lastPeriod_] = (1 + cos(PI*n/lastPeriod_)) / 2	;
+    window[n+lastPeriod_] = (1 + cos(STK_PI*n/lastPeriod_)) / 2	;
 
   long M;  // Index of reading in the input delay line
   long N;  // Index of writing in the output delay line

src/Makefile.in

@@ -18,6 +18,8 @@
 #include "pgmspace.h"
 #elif defined(ESP8266)
 #include "pgmspace.h"
+#elif defined(ARDUINO)
+#include "pgmspace.h"
 #endif
 
 #define VFS_INC_SIZE 10