ESP32 PWMDriverESP32

Author: pschatzmann

src/AudioPWM/PWMAudioAVR.h

@@ -131,7 +131,7 @@ class PWMDriverAVR : public DriverPWMBase {
 };
 
 /// separate method that can be defined as friend so that we can access protected information
-inline void defaultPWMAudioOutputCallback(){
+void defaultPWMAudioOutputCallback(){
     if (accessAudioPWM!=nullptr && accessAudioPWM->is_timer_started){
         accessAudioPWM->playNextFrame();
     }

src/AudioPWM/PWMAudioESP32.h

@@ -14,6 +14,7 @@ class PWMDriverESP32;
  */
 using PWMDriver = PWMDriverESP32;
 static PWMDriverESP32 *accessAudioPWM = nullptr; 
+void IRAM_ATTR defaultPWMAudioOutputCallback();
 
 
 /**
@@ -36,8 +37,8 @@ typedef PinInfoESP32 PinInfo;
  */
 
 class PWMDriverESP32 : public DriverPWMBase {
-    friend void defaultPWMAudioOutputCallback();
     public:
+        friend void defaultPWMAudioOutputCallback();
 
         PWMDriverESP32(){
             TRACED();
@@ -103,7 +104,7 @@ class PWMDriverESP32 : public DriverPWMBase {
             LOGI("-> timer counter is %zu", counter);
             LOGD("-> timerAttachInterrupt");
             bool interrupt_edge_type = true;
-            timerAttachInterrupt(timer, &defaultPWMAudioOutputCallback, interrupt_edge_type);
+            timerAttachInterrupt(timer, defaultPWMAudioOutputCallback, interrupt_edge_type);
             LOGD("-> timerAlarmWrite");
             bool auto_reload = true;
             timerAlarmWrite(timer, counter, auto_reload); // Timer fires at ~44100Hz [40Mhz / 907]
@@ -146,16 +147,16 @@ class PWMDriverESP32 : public DriverPWMBase {
 
 
 };
-
-/// timer callback: write the next frame to the pins
-inline void IRAM_ATTR defaultPWMAudioOutputCallback() {
+        /// timer callback: write the next frame to the pins
+void IRAM_ATTR defaultPWMAudioOutputCallback() {
     if (accessAudioPWM!=nullptr){
         portENTER_CRITICAL_ISR(&(accessAudioPWM->timerMux));
         accessAudioPWM->playNextFrame();
         portEXIT_CRITICAL_ISR(&(accessAudioPWM->timerMux));
     }
 }
 
+
 }
 
 #endif

src/AudioPWM/PWMAudioMBED.h

@@ -102,7 +102,7 @@ class PWMDriverMBED : public DriverPWMBase {
         }
 
         /// timer callback: write the next frame to the pins
-        static inline void  defaultPWMAudioOutputCallback(void *obj) {
+        static void  defaultPWMAudioOutputCallback(void *obj) {
             PWMDriverMBED* accessAudioPWM = (PWMDriverMBED*) obj;
             if (accessAudioPWM!=nullptr){
                 accessAudioPWM->playNextFrame();

src/AudioPWM/PWMAudioRP2040.h

@@ -153,7 +153,7 @@ class PWMDriverRP2040 : public DriverPWMBase {
         }
 
         // timed output executed at the sampleRate
-        inline static void defaultPWMAudioOutputCallbackPico(void* ptr) {
+        static void defaultPWMAudioOutputCallbackPico(void* ptr) {
             PWMDriverRP2040 *self = (PWMDriverRP2040*)  ptr;
             self->playNextFrame();
         }

src/AudioPWM/PWMAudioSTM32.h

@@ -195,7 +195,7 @@ class PWMDriverSTM32 : public DriverPWMBase {
         }
 
         /// timer callback: write the next frame to the pins
-        static inline void  defaultPWMAudioOutputCallback(void *obj) {
+        static void  defaultPWMAudioOutputCallback(void *obj) {
             PWMDriverSTM32* accessAudioPWM = (PWMDriverSTM32*) obj;
             if (accessAudioPWM!=nullptr){
                 accessAudioPWM->playNextFrame();