Browse Source

Fix AudioInputAnalog

dds
PaulStoffregen 10 years ago
parent
commit
87b715ad2d
2 changed files with 6 additions and 4 deletions
  1. +2
    -1
      input_adc.cpp
  2. +4
    -3
      input_adc.h

+ 2
- 1
input_adc.cpp View File

DMAMEM static uint16_t analog_rx_buffer[AUDIO_BLOCK_SAMPLES]; DMAMEM static uint16_t analog_rx_buffer[AUDIO_BLOCK_SAMPLES];
audio_block_t * AudioInputAnalog::block_left = NULL; audio_block_t * AudioInputAnalog::block_left = NULL;
uint16_t AudioInputAnalog::block_offset = 0; uint16_t AudioInputAnalog::block_offset = 0;
uint16_t AudioInputAnalog::dc_average = 0;
bool AudioInputAnalog::update_responsibility = false; bool AudioInputAnalog::update_responsibility = false;
DMAChannel AudioInputAnalog::dma(false); DMAChannel AudioInputAnalog::dma(false);




AudioInputAnalog::AudioInputAnalog(uint8_t pin) : AudioStream(0, NULL)
void AudioInputAnalog::init(uint8_t pin)
{ {
uint32_t i, sum=0; uint32_t i, sum=0;



+ 4
- 3
input_adc.h View File

class AudioInputAnalog : public AudioStream class AudioInputAnalog : public AudioStream
{ {
public: public:
AudioInputAnalog(uint8_t pin);
AudioInputAnalog() : AudioStream(0, NULL) { AudioInputAnalog(A2); }
AudioInputAnalog() : AudioStream(0, NULL) { init(A2); }
AudioInputAnalog(uint8_t pin) : AudioStream(0, NULL) { init(pin); }
virtual void update(void); virtual void update(void);
friend void dma_ch9_isr(void); friend void dma_ch9_isr(void);
private: private:
static audio_block_t *block_left; static audio_block_t *block_left;
static uint16_t block_offset; static uint16_t block_offset;
uint16_t dc_average;
static uint16_t dc_average;
static bool update_responsibility; static bool update_responsibility;
static DMAChannel dma; static DMAChannel dma;
static void isr(void); static void isr(void);
static void init(uint8_t pin);
}; };


#endif #endif

Loading…
Cancel
Save