Cleanup PWM

Author: pschatzmann

src/AudioTools/CoreAudio.h

@@ -19,7 +19,7 @@
 #include "AudioTools/CoreAudio/AudioTimer.h"
 #include "AudioTools/CoreAudio/AudioFilter.h"
 #include "AudioTools/CoreAudio/I2SStream.h"
-#include "AudioTools/CoreAudio/AudioPWM.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMAudioOutput.h"
 #include "AudioTools/CoreAudio/AnalogAudioStream.h"
 #include "AudioTools/CoreAudio/AudioEffects.h"
 #include "AudioTools/CoreAudio/AudioMetaData.h"

src/AudioTools/CoreAudio/AudioPWM.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#include "AudioTools/CoreAudio/AudioPWM/AudioPWM.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMAudioOutput.h"

src/AudioTools/CoreAudio/AudioPWM/AudioPWM.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMAudioOutput.h

@@ -2,13 +2,13 @@
 #include "AudioToolsConfig.h"
 #if defined(USE_PWM)
 
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioESP32.h"
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioMBED.h"
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioRP2040.h"
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioRenesas.h"
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioSTM32.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverESP32.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverMBED.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverRP2040.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverRenesas.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverSTM32.h"
 // this is experimental at the moment
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioAVR.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverAVR.h"
 
 namespace audio_tools {
 

src/AudioTools/CoreAudio/AudioPWM/PWMAudioAVR.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverAVR.h

@@ -2,7 +2,7 @@
 #pragma once
 #include "AudioToolsConfig.h"
 #if defined(USE_PWM) && defined(__AVR__)
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h"
 #include "AudioTools/CoreAudio/AudioTimer/AudioTimerAVR.h"
 
 namespace audio_tools {

src/AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h

@@ -49,6 +49,9 @@ struct PWMConfig : public AudioInfo {
   /// Timer used: Only used by ESP32 must be between 0 and 3                         
   uint8_t timer_id = 0;    
 
+  /// Dead time in microseconds for symmetric PWM (ESP32 only)
+  uint16_t dead_time_us = 0;
+
   /// max sample sample rate that still produces good audio
   uint32_t max_sample_rate = PWM_MAX_SAMPLE_RATE;
 
@@ -96,6 +99,7 @@ struct PWMConfig : public AudioInfo {
     LOGI("buffer_count: %u", buffers);
     LOGI("pwm_frequency: %u", (unsigned)pwm_frequency);
     LOGI("resolution: %d", resolution);
+    LOGI("dead_time_us: %u", dead_time_us);
     // LOGI("timer_id: %d", timer_id);
   }
 

src/AudioTools/CoreAudio/AudioPWM/PWMAudioESP32.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverESP32.h

@@ -1,7 +1,7 @@
 
 #pragma once
 #ifdef ESP32
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h"
 
 namespace audio_tools {
 

src/AudioTools/CoreAudio/AudioPWM/PWMAudioMBED.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverMBED.h

@@ -1,7 +1,8 @@
 
 #pragma once
-#if defined(ARDUINO_ARCH_MBED)
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h"
+#if defined(ARDUINO_ARCH_MBED) || defined(ARDUINO_ARCH_MBED_RP2040) || defined(ARDUINO_ARCH_MBED_NANO) || defined(ARDUINO_ARCH_MBED_NICLA) || defined(ARDUINO_ARCH_MBED_GIGA) || defined(ARDUINO_ARCH_MBED_PORTENTA) || defined(ARDUINO_NANO33BLE) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h"
 #include "AudioTools/CoreAudio/AudioTimer/AudioTimer.h"
 #include "mbed.h"
 

src/AudioTools/CoreAudio/AudioPWM/PWMAudioRP2040.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverRP2040.h

@@ -1,7 +1,7 @@
 
 #pragma once
 #if defined(RP2040_HOWER)
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h"
 #include "hardware/adc.h"
 #include "hardware/clocks.h"
 #include "hardware/gpio.h"

src/AudioTools/CoreAudio/AudioPWM/PWMAudioRenesas.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverRenesas.h

@@ -1,6 +1,6 @@
 #pragma once
 #if defined(ARDUINO_ARCH_RENESAS)
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h"
 #include "AudioTools/CoreAudio/AudioTimer/AudioTimer.h"
 #include "pwm.h"
 

src/AudioTools/CoreAudio/AudioPWM/PWMAudioSTM32.h renamed to src/AudioTools/CoreAudio/AudioPWM/PWMDriverSTM32.h

@@ -1,7 +1,7 @@
 
 #pragma once
 #if defined(STM32)
-#include "AudioTools/CoreAudio/AudioPWM/PWMAudioBase.h"
+#include "AudioTools/CoreAudio/AudioPWM/PWMDriverBase.h"
 #include "AudioTools/CoreAudio/AudioTimer/AudioTimer.h"
 
 namespace audio_tools {