iot/yoradio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.337b

Browse Source
This commit is contained in:
e2002
2024-11-27 12:43:44 +03:00
parent 778dd1e847
commit 4f1582b7d6
193 changed files with 68179 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
yoRadio/src/audioVS1053/audioVS1053Ex.cpp
View File

@@ -1,5 +1,4 @@
#include "../core/options.h"
#include "../core/spidog.h"
#if I2S_DOUT==255
/*
* vs1053_ext.cpp
@@ -143,12 +142,11 @@ uint32_t AudioBuffer::getReadPos() {
//---------------------------------------------------------------------------------------------------------------------
// **** VS1053 Impl ****
//---------------------------------------------------------------------------------------------------------------------
Audio::Audio(uint8_t _cs_pin, uint8_t _dcs_pin, uint8_t _dreq_pin, uint8_t spi, uint8_t mosi, uint8_t miso, uint8_t sclk) :
Audio::Audio(uint8_t _cs_pin, uint8_t _dcs_pin, uint8_t _dreq_pin, SPIClass *spi) :
cs_pin(_cs_pin), dcs_pin(_dcs_pin), dreq_pin(_dreq_pin)
{
spi_VS1053 = new SPIClass(spi);
spi_VS1053->begin(sclk, miso, mosi, -1);
spi_VS1053 = spi;
spi_VS1053->begin();
clientsecure.setInsecure(); // update to ESP32 Arduino version 1.0.5-rc05 or higher
m_endFillByte=0;
curvol=50;
@@ -425,9 +423,9 @@ void Audio::stopSong()
{
uint16_t modereg; // Read from mode register
int i; // Loop control
if(audiofile){
cardLock(true);audiofile.close();cardLock(false);
}
if(audiofile){
audiofile.close();
}
m_f_localfile = false;
m_f_webfile = false;
m_f_webstream = false;
@@ -570,16 +568,7 @@ void Audio::showstreamtitle(const char* ml) {
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void Audio::cardLock(bool lock){
#if (SDC_CS!=255)
if(lock){
sdog.takeMutex();
}else{
sdog.giveMutex();
}
#endif
}
//---------------------------------------------------------------------------------------------------------------------
void Audio::loop(){
// - localfile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -647,7 +636,7 @@ void Audio::processLocalFile() {
}
}
//----------------------------------------------------------------------------------------------------
cardLock(true); bytesAddedToBuffer = audiofile.read(InBuff.getWritePtr(), bytesCanBeWritten); cardLock(false);
bytesAddedToBuffer = audiofile.read(InBuff.getWritePtr(), bytesCanBeWritten);
if(bytesAddedToBuffer > 0) {
InBuff.bytesWritten(bytesAddedToBuffer);
}
@@ -744,9 +733,7 @@ void Audio::processLocalFile() {
f_stream = false;
m_f_localfile = false;
cardLock(true);
char *afn =strdup(audiofile.name()); // store temporary the name
cardLock(false);
stopSong();
sprintf(chbuf, "End of file \"%s\"", afn);
if(audio_info) audio_info(chbuf);
@@ -1592,7 +1579,7 @@ uint32_t Audio::stop_mp3client(){
uint32_t pos = 0;
if(m_f_localfile){
pos = getFilePos() - InBuff.bufferFilled();
cardLock(true); audiofile.close(); cardLock(false);
audiofile.close();
m_f_localfile=false;
}
int v=read_register(SCI_VOL);
@@ -1934,7 +1921,6 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) {
sprintf(chbuf, "Reading file: \"%s\"", audioName);
if(audio_info) {vTaskDelay(2); audio_info(chbuf);}
if(audio_beginSDread) audio_beginSDread();
cardLock(true);
audiofile.close();
if(fs.exists(audioName)) {
audiofile = fs.open(audioName);
@@ -1947,7 +1933,6 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) {
if(!audiofile) {
if(audio_info) {vTaskDelay(2); audio_info("Failed to open file for reading");}
cardLock(false);
return false;
}
@@ -1955,7 +1940,6 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) {
m_file_size = audiofile.size();//TEST loop
char* afn = strdup(audiofile.name()); // audioFileName
cardLock(false);
uint8_t dotPos = lastIndexOf(afn, ".");
for(uint8_t i = dotPos + 1; i < strlen(afn); i++){
afn[i] = toLowerCase(afn[i]);
@@ -2006,7 +1990,7 @@ bool Audio::connecttoFS(fs::FS &fs, const char* path, uint32_t resumeFilePos) {
sprintf(chbuf, "The %s format is not supported", afn + dotPos);
if(audio_info) audio_info(chbuf);
if(audio_error) audio_error(chbuf);
cardLock(true); audiofile.close(); cardLock(false);
audiofile.close();
if(afn) free(afn);
return false;
}
@@ -2481,25 +2465,19 @@ void Audio::showID3Tag(const char* tag, const char* value){
//---------------------------------------------------------------------------------------------------------------------
uint32_t Audio::getFileSize(){
if (!audiofile) return 0;
cardLock(true);
uint32_t s = audiofile.size();
cardLock(false);
return s;
}
//---------------------------------------------------------------------------------------------------------------------
uint32_t Audio::getFilePos(){
if (!audiofile) return 0;
cardLock(true);
uint32_t p = audiofile.position();
cardLock(false);
return p;
}
//---------------------------------------------------------------------------------------------------------------------
bool Audio::setFilePos(uint32_t pos){
if (!audiofile) return false;
cardLock(true);
bool s = audiofile.seek(pos);
cardLock(false);
return s;
}
uint32_t Audio::getAudioFileDuration(){

7
yoRadio/src/audioVS1053/audioVS1053Ex.h
View File

@@ -31,6 +31,9 @@
#include "vs1053b-patches-flac.h"
#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
#include "hal/gpio_ll.h"
#endif
extern __attribute__((weak)) void audio_info(const char*);
extern __attribute__((weak)) void audio_showstreamtitle(const char*);
extern __attribute__((weak)) void audio_showstation(const char*);
@@ -283,7 +286,8 @@ protected:
public:
// Constructor. Only sets pin values. Doesn't touch the chip. Be sure to call begin()!
//Audio(uint8_t _cs_pin, uint8_t _dcs_pin, uint8_t _dreq_pin, uint8_t spi, uint8_t mosi, uint8_t miso, uint8_t sclk);
Audio ( uint8_t _cs_pin, uint8_t _dcs_pin, uint8_t _dreq_pin, uint8_t spi = VSPI, uint8_t mosi = 23, uint8_t miso = 19, uint8_t sclk = 18);
//Audio ( uint8_t _cs_pin, uint8_t _dcs_pin, uint8_t _dreq_pin, uint8_t spi = VSPI, uint8_t mosi = 23, uint8_t miso = 19, uint8_t sclk = 18);
Audio ( uint8_t _cs_pin, uint8_t _dcs_pin, uint8_t _dreq_pin, SPIClass *spi=&SPI);
~Audio();
void begin() ; // Begin operation. Sets pins correctly and prepares SPI bus.
@@ -322,7 +326,6 @@ public:
void setVUmeter();
void getVUlevel();
uint8_t vuLeft, vuRight;
void cardLock(bool lock);
bool eofHeader;
// implement several function with respect to the index of string
bool startsWith (const char* base, const char* str) { return (strstr(base, str) - base) == 0;}