Skip to content

Commit

Permalink
Complie Errors SDFAT library
Browse files Browse the repository at this point in the history
  • Loading branch information
@pschatzmann
pschatzmann committed May 29, 2024
1 parent f1b4272 commit f7c5f06
Show file tree
Hide file tree
Showing 4 changed files with 534 additions and 549 deletions.
101 changes: 50 additions & 51 deletions src/AudioLibs/AudioSourceIdxSDFAT.h
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
#pragma once

#include "AudioConfig.h"

#include <SPI.h>
#include <SdFat.h>
#include "AudioLogger.h"

#include "AudioBasic/StrExt.h"
#include "AudioConfig.h"
#include "AudioLogger.h"
#include "AudioTools/AudioSource.h"

#define USE_SDFAT
#include "AudioLibs/SDIndex.h"


// SD_FAT_TYPE = 0 for SdFat/File as defined in SdFatConfig.h,
// 1 for FAT16/FAT32, 2 for exFAT, 3 for FAT16/FAT32 and exFAT.
#ifndef SD_FAT_TYPE
Expand All @@ -20,20 +19,19 @@
// Try max SPI clock for an SD. Reduce SPI_CLOCK if errors occur. (40?)
#define SPI_CLOCK SD_SCK_MHZ(50)
#if SD_FAT_TYPE == 0
typedef SdFat AudioFs;
typedef File AudioFile;
typedef SdFat AudioFs;
typedef File AudioFile;
#elif SD_FAT_TYPE == 1
typedef SdFat32 AudioFs;
typedef File32 AudioFile;
typedef SdFat32 AudioFs;
typedef File32 AudioFile;
#elif SD_FAT_TYPE == 2
typedef SdExFat AudioFs;
typedef ExFile AudioFile;
typedef SdExFat AudioFs;
typedef ExFile AudioFile;
#elif SD_FAT_TYPE == 3
typedef SdFs AudioFs;
typedef FsFile AudioFile;
typedef SdFs AudioFs;
typedef FsFile AudioFile;
#endif


namespace audio_tools {
/**
* @brief ESP32 AudioSource for AudioPlayer using an SD card as data source.
Expand All @@ -44,36 +42,38 @@ namespace audio_tools {
* @copyright GPLv3
*/
class AudioSourceIdxSDFAT : public AudioSource {
public:
public:
/// Default constructor
AudioSourceIdxSDFAT(const char* startFilePath = "/", const char* ext = ".mp3", int chipSelect = PIN_CS, int speedMHz = 10, bool setupIndex=true) {
TRACED();
LOGI("SD chipSelect: %d", chipSelect);
LOGI("SD speedMHz: %d", speedMHz);
LOGI("ext: %s", ext);
p_cfg = new SdSpiConfig(chipSelect, DEDICATED_SPI, SD_SCK_MHZ(speedMHz));
owns_cfg = true;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
AudioSourceIdxSDFAT(const char *startFilePath = "/", const char *ext = ".mp3",
int chipSelect = PIN_CS, int speedMHz = 10,
bool setupIndex = true) {
TRACED();
LOGI("SD chipSelect: %d", chipSelect);
LOGI("SD speedMHz: %d", speedMHz);
LOGI("ext: %s", ext);
p_cfg = new SdSpiConfig(chipSelect, DEDICATED_SPI, SD_SCK_MHZ(speedMHz));
owns_cfg = true;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
}

/// Costructor with SdSpiConfig
AudioSourceSDFAT(const char* startFilePath, const char* ext, SdSpiConfig &config, bool setupIndex=true) {
TRACED();
p_cfg = &config;
owns_cfg = false;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
/// Costructor with SdSpiConfig
AudioSourceIdxSDFAT(const char *startFilePath, const char *ext,
SdSpiConfig &config, bool setupIndex = true) {
TRACED();
p_cfg = &config;
owns_cfg = false;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
}


virtual void begin() override {
TRACED();
if (!is_sd_setup) {
if (!sd.begin(*p_cfg)) {
LOGE("sd.begin failed");
if (!sd.begin(*p_cfg)) {
LOGE("sd.begin failed");
return;
}
is_sd_setup = true;
Expand All @@ -83,9 +83,9 @@ class AudioSourceIdxSDFAT : public AudioSource {
}

void end() {
#ifdef ESP32
#ifdef ESP32
sd.end();
#endif
#endif
is_sd_setup = false;
}

Expand All @@ -102,18 +102,18 @@ class AudioSourceIdxSDFAT : public AudioSource {

virtual Stream *selectStream(const char *path) override {
file.close();
if (path==nullptr){
if (path == nullptr) {
LOGE("Filename is null")
return nullptr;
}

AudioFile new_file;
if (!new_file.open(path, O_RDONLY)){
// AudioFile new_file;
if (!file.open(path, O_RDONLY)) {
LOGE("Open error: '%s'", path);
}

LOGI("-> selectStream: %s", path);
file = new_file;
// file = new_file;
return &file;
}

Expand All @@ -134,13 +134,13 @@ class AudioSourceIdxSDFAT : public AudioSource {
virtual void setPath(const char *p) { start_path = p; }

/// Provides the number of files (The max index is size()-1)
long size() { return idx.size();}
long size() { return idx.size(); }

protected:
protected:
SdSpiConfig *p_cfg = nullptr;
AudioFs sd;
AudioFile file;
SDIndex<AudioFs,AudioFile> idx{sd};
SDIndex<AudioFs, AudioFile> idx{sd};
size_t idx_pos = 0;
char file_name[MAX_FILE_LEN];
const char *exension = nullptr;
Expand All @@ -149,14 +149,13 @@ class AudioSourceIdxSDFAT : public AudioSource {
bool setup_index = true;
bool is_sd_setup = false;
int cs;
bool owns_cfg=false;
bool owns_cfg = false;

const char* getFileName(AudioFile&file){
static char name[MAX_FILE_LEN];
file.getName(name,MAX_FILE_LEN);
return name;
const char *getFileName(AudioFile &file) {
static char name[MAX_FILE_LEN];
file.getName(name, MAX_FILE_LEN);
return name;
}

};

} // namespace audio_tools
} // namespace audio_tools
105 changes: 52 additions & 53 deletions src/AudioLibs/AudioSourceSDFAT.h
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
#pragma once

#include "AudioConfig.h"

#include <SPI.h>
#include <SdFat.h>

#include "AudioBasic/StrExt.h"
#include "AudioConfig.h"
#include "AudioLogger.h"
#include "AudioTools/AudioSource.h"

#define USE_SDFAT
#include "AudioLibs/SDDirect.h"


// SD_FAT_TYPE = 0 for SdFat/File as defined in SdFatConfig.h,
// 1 for FAT16/FAT32, 2 for exFAT, 3 for FAT16/FAT32 and exFAT.
#ifndef SD_FAT_TYPE
Expand All @@ -21,61 +20,62 @@
#define SPI_CLOCK SD_SCK_MHZ(50)

#if SD_FAT_TYPE == 0
typedef SdFat AudioFs;
typedef File AudioFile;
typedef SdFat AudioFs;
typedef File AudioFile;
#elif SD_FAT_TYPE == 1
typedef SdFat32 AudioFs;
typedef File32 AudioFile;
typedef SdFat32 AudioFs;
typedef File32 AudioFile;
#elif SD_FAT_TYPE == 2
typedef SdExFat AudioFs;
typedef ExFile AudioFile;
typedef SdExFat AudioFs;
typedef ExFile AudioFile;
#elif SD_FAT_TYPE == 3
typedef SdFs AudioFs;
typedef FsFile AudioFile;
typedef SdFs AudioFs;
typedef FsFile AudioFile;
#endif


namespace audio_tools {
/**
* @brief ESP32 AudioSource for AudioPlayer using an SD card as data source.
* This class is based on the Arduino SD implementation
* Connect the SD card.
* Connect the SD card.
* For UTF8 Support change SdFatConfig.h #define USE_UTF8_LONG_NAMES 1
* @ingroup player
* @author Phil Schatzmann
* @copyright GPLv3
*/
class AudioSourceSDFAT : public AudioSource {
public:
public:
/// Default constructor
AudioSourceSDFAT(const char* startFilePath = "/", const char* ext = ".mp3", int chipSelect = PIN_CS, int speedMHz = 10,int spi_mode=DEDICATED_SPI, bool setupIndex=true) {
TRACED();
LOGI("SD chipSelect: %d", chipSelect);
LOGI("SD speedMHz: %d", speedMHz);
LOGI("ext: %s", ext);
p_cfg = new SdSpiConfig(chipSelect, spi_mode, SD_SCK_MHZ(speedMHz));
owns_cfg = true;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
AudioSourceSDFAT(const char *startFilePath = "/", const char *ext = ".mp3",
int chipSelect = PIN_CS, int speedMHz = 10,
int spi_mode = DEDICATED_SPI, bool setupIndex = true) {
TRACED();
LOGI("SD chipSelect: %d", chipSelect);
LOGI("SD speedMHz: %d", speedMHz);
LOGI("ext: %s", ext);
p_cfg = new SdSpiConfig(chipSelect, spi_mode, SD_SCK_MHZ(speedMHz));
owns_cfg = true;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
}

/// Costructor with SdSpiConfig
AudioSourceSDFAT(const char* startFilePath, const char* ext, SdSpiConfig &config, bool setupIndex=true) {
TRACED();
p_cfg = &config;
owns_cfg = false;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
/// Costructor with SdSpiConfig
AudioSourceSDFAT(const char *startFilePath, const char *ext,
SdSpiConfig &config, bool setupIndex = true) {
TRACED();
p_cfg = &config;
owns_cfg = false;
start_path = startFilePath;
exension = ext;
setup_index = setupIndex;
}


virtual void begin() override {
TRACED();
if (!is_sd_setup) {
if (!sd.begin(*p_cfg)) {
LOGE("sd.begin failed");
if (!sd.begin(*p_cfg)) {
LOGE("sd.begin failed");
return;
}
is_sd_setup = true;
Expand All @@ -91,35 +91,34 @@ class AudioSourceSDFAT : public AudioSource {
is_sd_setup = false;
}


virtual Stream *nextStream(int offset = 1) override {
LOGI("nextStream: %d", offset);
return selectStream(idx_pos + offset);
}

virtual Stream *selectStream(int index) override {
LOGI("selectStream SDFAT: %d", index);
if(index > -1){ //avoid invalid position
if (index > -1) { // avoid invalid position
idx_pos = index;
}
return selectStream(idx[idx_pos]);
}

virtual Stream *selectStream(const char *path) override {
file.close();
if (path==nullptr){
if (path == nullptr) {
LOGE("Filename is null")
return nullptr;
}

AudioFile new_file;
if (!new_file.open(path, O_RDONLY)){
LOGE("Open error: '%s'", path);
// AudioFile new_file;
if (!file.open(path, O_RDONLY)) {
LOGE("Open error: '%s'", path);
}

LOGI("-> selectStream: %s", path);
strncpy(file_name, path, MAX_FILE_LEN);
file = new_file;
// file = new_file;
return &file;
}

Expand All @@ -139,30 +138,30 @@ class AudioSourceSDFAT : public AudioSource {
/// Allows to "correct" the start path if not defined in the constructor
virtual void setPath(const char *p) { start_path = p; }

/// Provides the number of files (The max index is size()-1): WARNING this is very slow if you have a lot of files in many subdirectories
long size() { return idx.size();}
/// Provides the number of files (The max index is size()-1): WARNING this is
/// very slow if you have a lot of files in many subdirectories
long size() { return idx.size(); }

protected:
protected:
SdSpiConfig *p_cfg = nullptr;
AudioFs sd;
AudioFile file;
SDDirect<AudioFs,AudioFile> idx{sd};
SDDirect<AudioFs, AudioFile> idx{sd};
size_t idx_pos = 0;
char file_name[MAX_FILE_LEN];
const char *exension = nullptr;
const char *start_path = nullptr;
const char *file_name_pattern = "*";
int cs;
bool setup_index = true;
bool owns_cfg=false;
bool owns_cfg = false;
bool is_sd_setup = false;

const char* getFileName(AudioFile&file){
static char name[MAX_FILE_LEN];
file.getName(name,MAX_FILE_LEN);
return name;
const char *getFileName(AudioFile &file) {
static char name[MAX_FILE_LEN];
file.getName(name, MAX_FILE_LEN);
return name;
}

};

} // namespace audio_tools
} // namespace audio_tools
Loading

0 comments on commit f7c5f06

Please sign in to comment.