Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a DIN pin to Audio::setPinout. #35

Merged
merged 1 commit into from
Apr 25, 2020
Merged

Add a DIN pin to Audio::setPinout. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add a DIN pin to Audio::setPinout.
  • Loading branch information
@CelliesProjects
CelliesProjects committed Apr 25, 2020
commit b62e751fe746df0d546090cc743634bef8f9da00
7 changes: 4 additions & 3 deletions src/Audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Audio::Audio() {
m_BCLK=26; // Bit Clock
m_LRC=25; // Left/Right Clock
m_DOUT=27; // Data Out
setPinout(m_BCLK, m_LRC, m_DOUT);
setPinout(m_BCLK, m_LRC, m_DOUT, m_DIN);

}

Expand Down Expand Up @@ -1562,16 +1562,17 @@ int Audio::sendBytes(uint8_t *data, size_t len) {
return bytesDecoded;
}
//---------------------------------------------------------------------------------------------------------------------
bool Audio::setPinout(uint8_t BCLK, uint8_t LRC, uint8_t DOUT){
bool Audio::setPinout(uint8_t BCLK, uint8_t LRC, uint8_t DOUT, uint8_t DIN){
m_BCLK=BCLK; // Bit Clock
m_LRC=LRC; // Left/Right Clock
m_DOUT=DOUT; // Data Out
m_DIN=DIN; // Data In

i2s_pin_config_t pins = {
.bck_io_num = m_BCLK,
.ws_io_num = m_LRC, // wclk,
.data_out_num = m_DOUT,
.data_in_num = I2S_PIN_NO_CHANGE
.data_in_num = m_DIN
};
i2s_set_pin((i2s_port_t)m_i2s_num, &pins);
return true;
Expand Down
3 changes: 2 additions & 1 deletion src/Audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Audio {
* @return true if audio file active and speed is valid, otherwise false
*/
bool audioFileSeek(const int8_t speed);
bool setPinout(uint8_t BCLK, uint8_t LRC, uint8_t DOUT);
bool setPinout(uint8_t BCLK, uint8_t LRC, uint8_t DOUT, uint8_t DIN=I2S_PIN_NO_CHANGE);
void stopSong();
/**
* @brief pauseResume pauses current playback
Expand Down Expand Up @@ -140,6 +140,7 @@ class Audio {
uint8_t m_BCLK=0; // Bit Clock
uint8_t m_LRC=0; // Left/Right Clock
uint8_t m_DOUT=0; // Data Out
uint8_t m_DIN=0; // Data In
uint8_t m_vol=64; // volume
uint8_t m_bps; // bitsPerSample
uint8_t m_channels;
Expand Down