RP2040 compile errors

Author: pschatzmann

src/AudioBasic/StrExt.h

@@ -24,19 +24,19 @@ class StrExt : public Str {
     public:
         StrExt() = default;
 
-        StrExt(int initialAllocatedLength){
+        StrExt(int initialAllocatedLength) : Str() {
             maxlen = initialAllocatedLength;
         }
 
-        StrExt(Str &source){
+        StrExt(Str &source) : Str() {
             set(source);
         }
 
-        StrExt(StrExt &source){
+        StrExt(StrExt &source) : Str(){
             set(source);
         }
 
-        StrExt(const char* str){
+        StrExt(const char* str) : Str() {
             if (str!=nullptr){
                 len = strlen(str);
                 maxlen = len; 

src/AudioConfig.h

@@ -96,11 +96,11 @@
  * @brief PWM
  */
 #ifndef PWM_BUFFER_SIZE 
-#define PWM_BUFFER_SIZE 512
+#define PWM_BUFFER_SIZE 1024
 #endif
 
 #ifndef PWM_BUFFERS 
-#define PWM_BUFFERS 10
+#define PWM_BUFFERS 50
 #endif
 
 #ifndef PWM_FREQUENCY 
@@ -223,8 +223,8 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #endif
 
 //----------------
-#if defined(DARDUINO_ARCH_MBED_RP2040)
-#define USE_I2S 1
+#if defined(ARDUINO_ARCH_MBED_RP2040)
+//#define USE_I2S 1
 #define USE_PWM
 
 #define PWM_START_PIN 6
@@ -241,7 +241,8 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define IRAM_ATTR
 //#define USE_ESP8266_AUDIO
 
-#elif defined(DARDUINO_ARCH_RP2040)
+//----------------
+#elif defined(ARDUINO_ARCH_RP2040)
 #define USE_I2S 1
 #define USE_PWM
 

src/AudioI2S/I2SRP2040.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#if defined(ARDUINO_ARCH_RP2040) 
+#if defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED_RP2040)
 #include "AudioI2S/I2SConfig.h"
-#include "AudioExperiments/I2SBitBangRP2040.h"
+//#include "AudioExperiments/I2SBitBangRP2040.h"
 #include <I2S.h>
 namespace audio_tools {
 

src/AudioPWM/PWMAudioBase.h

@@ -70,7 +70,7 @@ struct PWMConfig : public AudioBaseInfo {
         LOGI("bits_per_sample: %d", bits_per_sample);
         LOGI("buffer_size: %u", buffer_size);
         LOGI("pwm_frequency: %lu", pwm_frequency);
-        //LOGI("resolution: %d", resolution);
+        LOGI("resolution: %d", resolution);
         //LOGI("timer_id: %d", timer_id);
     }
 
@@ -201,7 +201,6 @@ class PWMAudioStreamBase : public AudioPrint, public AudioBaseInfoDependent {
             is_timer_started = false;
         }
 
-
         virtual int availableForWrite() { 
             return buffer==nullptr ? 0 : buffer->availableForWrite();
         }
@@ -297,7 +296,7 @@ class PWMAudioStreamBase : public AudioPrint, public AudioBaseInfoDependent {
         /// writes the next frame to the output pins 
         void playNextFrameStream(){
             if (is_timer_started){
-                 //LOGD(LOG_METHOD);
+                //LOGD(LOG_METHOD);
                 int required = (audio_config.bits_per_sample / 8) * audio_config.channels;
                 if (buffer->available() >= required){
                     for (int j=0;j<audio_config.channels;j++){
@@ -308,21 +307,18 @@ class PWMAudioStreamBase : public AudioPrint, public AudioBaseInfoDependent {
                     underflow_count++;
                 }
                 updateStatistics();
-            } else {
-                //LOGE("is_timer_started is false");
-            }
+            } 
         } 
 
         void playNextFrame(){
-             //LOGD(LOG_METHOD);
+            // LOGD(LOG_METHOD);
             if (user_callback!=nullptr){
                 playNextFrameCallback();
             } else {
                 playNextFrameStream();
             }
         }
 
-
         /// determines the next scaled value
         virtual int nextValue() {
             int result = 0;

src/AudioPWM/PWMAudioRP2040.h

@@ -1,6 +1,6 @@
 
 #pragma once
-#if defined(ARDUINO_ARCH_RP2040) 
+#if defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED_RP2040)
 #include "AudioPWM/PWMAudioBase.h"
 #include "hardware/gpio.h"
 #include "hardware/adc.h"
@@ -12,7 +12,7 @@ namespace audio_tools {
 // forwrd declaratioin of callback
 class PWMAudioStreamPico;
 typedef PWMAudioStreamPico PWMAudioStream;
-bool defaultPWMAudioOutputCallbackPico(repeating_timer* ptr);
+//bool defaultPWMAudioOutputCallbackPico(repeating_timer* ptr);
 
 /**
  * @brief Rasperry Pico Channel to pin assignments
@@ -36,7 +36,7 @@ struct PicoChannelOut {
  */
 
 class PWMAudioStreamPico : public PWMAudioStreamBase {
-    friend bool defaultPWMAudioOutputCallbackPico(repeating_timer* ptr);
+    //friend bool defaultPWMAudioOutputCallbackPico(repeating_timer* ptr);
 
     public:
 
@@ -45,8 +45,9 @@ class PWMAudioStreamPico : public PWMAudioStreamBase {
         }
 
         /// Ends the output -> resets the timer and the pins
-        void end(){
-             LOGD(LOG_METHOD);
+        void end() override {
+            LOGD(LOG_METHOD);
+            is_timer_started = false;
             if (!cancel_repeating_timer(&timer)){
                 LOGE("cancel_repeating_timer failed")
             }
@@ -61,10 +62,14 @@ class PWMAudioStreamPico : public PWMAudioStreamBase {
         Vector<PicoChannelOut> pins;      
         repeating_timer_t timer;
 
+        virtual void startTimer() override {
+            //LOGI(LOG_METHOD);
+            is_timer_started = true;
+        }
 
         // setup pwm config and all pins
-        void setupPWM(){
-             LOGD(LOG_METHOD);
+        void setupPWM() override {
+            LOGD(LOG_METHOD);
             pwm_config cfg = setupPWMConfig();
 
             // initialize empty pins
@@ -96,8 +101,11 @@ class PWMAudioStreamPico : public PWMAudioStreamBase {
             pwm_config pico_pwm_config = pwm_get_default_config();
             int wrap_value = maxOutputValue(); // amplitude of square wave (pwm values -amplitude to amplitude) for one byte
             float pwmClockDivider = static_cast<float>(clock_get_hz(clk_sys)) / (audio_config.pwm_frequency * wrap_value);
-            LOGI("->clock speed is %f", static_cast<float>(clock_get_hz(clk_sys)));
-            LOGI("->divider is %f", pwmClockDivider);
+            float clock_speed = static_cast<float>(clock_get_hz(clk_sys));
+            LOGI("->wrap_value = %d", wrap_value);
+            LOGI("->max clock speed = %f", clock_speed);
+            LOGI("->divider = %f", pwmClockDivider);
+            LOGI("->clock speed = %f", clock_speed/pwmClockDivider);
             pwm_config_set_clkdiv(&pico_pwm_config, pwmClockDivider);
             pwm_config_set_clkdiv_mode(&pico_pwm_config, PWM_DIV_FREE_RUNNING);
             //pwm_config_set_phase_correct(&pico_pwm_config, false);
@@ -106,7 +114,7 @@ class PWMAudioStreamPico : public PWMAudioStreamBase {
         } 
 
         // set up pwm 
-        void setupPWMPin(pwm_config &cfg, PicoChannelOut &pinInfo){
+        void setupPWMPin(pwm_config &cfg, PicoChannelOut &pinInfo)  {
              LOGD("%s for gpio %d",LOG_METHOD, pinInfo.gpio);
             // setup pwm pin  
             int gpio = pinInfo.gpio;
@@ -119,43 +127,45 @@ class PWMAudioStreamPico : public PWMAudioStreamBase {
             pwm_set_chan_level(pinInfo.slice, pinInfo.channel, 0); 
         }
 
-        void setupTimer(){
-             LOGD(LOG_METHOD);
+        void setupTimer() override {
+            LOGD(LOG_METHOD);
             // setup timer
             uint32_t time = 1000000UL / audio_config.sample_rate;
             LOGI("->Timer value %ld us", time);
-
             if (!add_repeating_timer_us(-time, &defaultPWMAudioOutputCallbackPico, this, &timer)){
                 LOGE("Error: alarm_pool_add_repeating_timer_us failed; no alarm slots available");
+            } else {
+                LOGI("repeating timer has started");
             }
         }
 
         /// The pico supports max 16 pwm pins
-        virtual int maxChannels() {
+        virtual int maxChannels() override{
             return 16;
         };
 
         /// Max pwm output value
-        virtual int maxOutputValue(){
-            return 255;
+        virtual int maxOutputValue()override{
+            return std::pow(audio_config.resolution,2)-1;
         }
 
         /// write a pwm value to the indicated channel. The values are between 0 and 255
-        void pwmWrite(int audioChannel, int value){
+        void pwmWrite(int audioChannel, int value)override{
             pwm_set_chan_level(pins[audioChannel].slice, pins[audioChannel].channel, value);
         }
 
+        // timed output executed at the sampleRate
+        static bool defaultPWMAudioOutputCallbackPico(repeating_timer* ptr) {
+            PWMAudioStreamPico *self = (PWMAudioStreamPico*)  ptr->user_data;
+            //if (self!=nullptr){
+                self->playNextFrame();
+            //}
+            return true;
+        }
+
 };
 
 
-// timed output executed at the sampleRate
-bool defaultPWMAudioOutputCallbackPico(repeating_timer* ptr) {
-    PWMAudioStreamPico *self = (PWMAudioStreamPico*)  ptr->user_data;
-    if (self!=nullptr){
-        self->playNextFrame();
-    }
-    return true;
-}
 
 } // Namespace