AudioOutputI2SNoDAC not working for RP2040 due to constructor differences with AudioOutputI2S (parent class) (#477)
Updated code to correctly call the parent classes constructor for the RP2040. Changed the code for the RP2040 to correctly call the parent classes constructor.
This commit is contained in:
1 parent
7a82ba2ab3
commit
d5dea4f20c
2 files changed
+31
No files matched your search
@@ -29,6 +29,25 @@
|
|||||||
#include "AudioOutputI2SNoDAC.h"
|
#include "AudioOutputI2SNoDAC.h"
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(ARDUINO_ARCH_RP2040)
|
||||||
|
//
|
||||||
|
// Create an alternate constructor for the RP2040. The AudioOutputI2S has an alternate
|
||||||
|
// constructor for the RP2040, so the code was passing port to the sampleRate and false to sck.
|
||||||
|
//
|
||||||
|
// AudioOutputI2S(long sampleRate = 44100, pin_size_t sck = 26, pin_size_t data = 28);
|
||||||
|
//
|
||||||
|
// So this new constructor adds the ability to pass both port and sck to the underlying class, but
|
||||||
|
// uses the same defaults in the AudioOutputI2S constructor.
|
||||||
|
//
|
||||||
|
AudioOutputI2SNoDAC::AudioOutputI2SNoDAC(int port, int sck) : AudioOutputI2S(44100, sck, port)
|
||||||
|
{
|
||||||
|
SetOversampling(32);
|
||||||
|
lastSamp = 0;
|
||||||
|
cumErr = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
AudioOutputI2SNoDAC::AudioOutputI2SNoDAC(int port) : AudioOutputI2S(port, false)
|
AudioOutputI2SNoDAC::AudioOutputI2SNoDAC(int port) : AudioOutputI2S(port, false)
|
||||||
{
|
{
|
||||||
SetOversampling(32);
|
SetOversampling(32);
|
||||||
@@ -38,7 +57,10 @@ AudioOutputI2SNoDAC::AudioOutputI2SNoDAC(int port) : AudioOutputI2S(port, false)
|
|||||||
WRITE_PERI_REG(PERIPHS_IO_MUX_MTDO_U, orig_bck);
|
WRITE_PERI_REG(PERIPHS_IO_MUX_MTDO_U, orig_bck);
|
||||||
WRITE_PERI_REG(PERIPHS_IO_MUX_GPIO2_U, orig_ws);
|
WRITE_PERI_REG(PERIPHS_IO_MUX_GPIO2_U, orig_ws);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
AudioOutputI2SNoDAC::~AudioOutputI2SNoDAC()
|
AudioOutputI2SNoDAC::~AudioOutputI2SNoDAC()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -25,7 +25,16 @@
|
|||||||
class AudioOutputI2SNoDAC : public AudioOutputI2S
|
class AudioOutputI2SNoDAC : public AudioOutputI2S
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
//
|
||||||
|
// Define a different constructor for the RP2040, as this class calls the constructor
|
||||||
|
// of the AudioOutputI2S which has an alternate constructor for the RP2040
|
||||||
|
//
|
||||||
|
#if defined(ARDUINO_ARCH_RP2040)
|
||||||
|
AudioOutputI2SNoDAC(int port = 28,int sck = 26);
|
||||||
|
#else
|
||||||
AudioOutputI2SNoDAC(int port = 0);
|
AudioOutputI2SNoDAC(int port = 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
virtual ~AudioOutputI2SNoDAC() override;
|
virtual ~AudioOutputI2SNoDAC() override;
|
||||||
virtual bool begin() override { return AudioOutputI2S::begin(false); }
|
virtual bool begin() override { return AudioOutputI2S::begin(false); }
|
||||||
virtual bool ConsumeSample(int16_t sample[2]) override;
|
virtual bool ConsumeSample(int16_t sample[2]) override;
|
||||||
|
|||||||
Reference in new issue
Block a user