Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-09 13:07:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into httpd

Browse Source
This commit is contained in:
sebastien
2020-02-06 06:44:51 -05:00
parent 74f99e9ee7 96cfd8e27d
commit 46007853c7
4 changed files with 104 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
build-scripts/ESP32-A1S.defaults → build-scripts/ESP32-A1S-sdkconfig.defaults
View File

234
components/squeezelite/a1s/ac101.c
View File

@@ -35,6 +35,12 @@
const static char TAG[] = "AC101"; const static char TAG[] = "AC101";
#define SPKOUT_EN ((1 << 11) | (1 << 7))
#define EAROUT_EN ((1 << 11) | (1 << 12) | (1 << 13))
#define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b))
#define AC_ASSERT(a, format, b, ...) \ #define AC_ASSERT(a, format, b, ...) \
if ((a) != 0) { \ if ((a) != 0) { \
ESP_LOGE(TAG, format, ##__VA_ARGS__); \ ESP_LOGE(TAG, format, ##__VA_ARGS__); \
@@ -52,12 +58,11 @@ struct adac_s dac_a1s = { init, deinit, power, speaker, headset, volume };
static esp_err_t i2c_write_reg(uint8_t reg, uint16_t val); static esp_err_t i2c_write_reg(uint8_t reg, uint16_t val);
static uint16_t i2c_read_reg(uint8_t reg); static uint16_t i2c_read_reg(uint8_t reg);
static esp_err_t ac101_start(ac_module_t mode); static void ac101_start(ac_module_t mode);
static esp_err_t ac101_stop(void); static void ac101_stop(void);
static esp_err_t ac101_set_earph_volume(uint8_t volume); static void ac101_set_earph_volume(uint8_t volume);
static esp_err_t ac101_set_spk_volume(uint8_t volume); static void ac101_set_spk_volume(uint8_t volume);
static int ac101_get_spk_volume(void);
//static void pa_power(bool enable);
static int i2c_port; static int i2c_port;
@@ -85,16 +90,14 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) {
ESP_LOGI(TAG, "DAC using I2C sda:%u, scl:%u", i2c_config.sda_io_num, i2c_config.scl_io_num); ESP_LOGI(TAG, "DAC using I2C sda:%u, scl:%u", i2c_config.sda_io_num, i2c_config.scl_io_num);
res = i2c_write_reg(CHIP_AUDIO_RS, 0x123); res = i2c_write_reg(CHIP_AUDIO_RS, 0x123);
//huh? //huh?
//vTaskDelay(1000 / portTICK_PERIOD_MS); //vTaskDelay(1000 / portTICK_PERIOD_MS);
if (ESP_OK != res) { if (ESP_OK != res) {
ESP_LOGE(TAG, "reset failed!"); ESP_LOGE(TAG, "AC101 reset failed! %d", res);
return false; return false;
} }
i2c_write_reg(SPKOUT_CTRL, 0xe880);
// Enable the PLL from 256*44.1KHz MCLK source // Enable the PLL from 256*44.1KHz MCLK source
i2c_write_reg(PLL_CTRL1, 0x014f); i2c_write_reg(PLL_CTRL1, 0x014f);
//res |= i2c_write_reg(PLL_CTRL2, 0x83c0); //res |= i2c_write_reg(PLL_CTRL2, 0x83c0);
@@ -108,9 +111,9 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) {
//AIF config //AIF config
i2c_write_reg(I2S1LCK_CTRL, 0x8850); //BCLK/LRCK i2c_write_reg(I2S1LCK_CTRL, 0x8850); //BCLK/LRCK
i2c_write_reg(I2S1_SDOUT_CTRL, 0xc000); // i2c_write_reg(I2S1_SDOUT_CTRL, 0xc000);
i2c_write_reg(I2S1_SDIN_CTRL, 0xc000); i2c_write_reg(I2S1_SDIN_CTRL, 0xc000);
i2c_write_reg(I2S1_MXR_SRC, 0x2200); // i2c_write_reg(I2S1_MXR_SRC, 0x2200);
i2c_write_reg(ADC_SRCBST_CTRL, 0xccc4); i2c_write_reg(ADC_SRCBST_CTRL, 0xccc4);
i2c_write_reg(ADC_SRC, 0x2020); i2c_write_reg(ADC_SRC, 0x2020);
@@ -121,17 +124,10 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) {
i2c_write_reg(DAC_MXR_SRC, 0xcc00); i2c_write_reg(DAC_MXR_SRC, 0xcc00);
i2c_write_reg(DAC_DIG_CTRL, 0x8000); i2c_write_reg(DAC_DIG_CTRL, 0x8000);
i2c_write_reg(OMIXER_SR, 0x0081); i2c_write_reg(OMIXER_SR, 0x0081);
i2c_write_reg(OMIXER_DACA_CTRL, 0xf080);//} i2c_write_reg(OMIXER_DACA_CTRL, 0xf080);
//* Enable Speaker output
i2c_write_reg(0x58, 0xeabd);
//ac101_pa_power(true);
uint16_t regval;
// configure I2S // configure I2S
regval = i2c_read_reg(I2S1LCK_CTRL); uint16_t regval = i2c_read_reg(I2S1LCK_CTRL);
regval &= 0xffc3; regval &= 0xffc3;
regval |= (AC_MODE_SLAVE << 15); regval |= (AC_MODE_SLAVE << 15);
regval |= (BIT_LENGTH_16_BITS << 4); regval |= (BIT_LENGTH_16_BITS << 4);
@@ -146,6 +142,15 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) {
i2s_driver_install(i2s_num, i2s_config, 0, NULL); i2s_driver_install(i2s_num, i2s_config, 0, NULL);
i2s_set_pin(i2s_num, &i2s_pin_config); i2s_set_pin(i2s_num, &i2s_pin_config);
// enable earphone & speaker
i2c_write_reg(SPKOUT_CTRL, 0x0220);
i2c_write_reg(OMIXER_DACA_CTRL, 0xff00);
i2c_write_reg(HPOUT_CTRL, 0x3801);
// set gain for speaker and earphone
ac101_set_spk_volume(100);
ac101_set_earph_volume(100);
ESP_LOGI(TAG, "DAC using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); ESP_LOGI(TAG, "DAC using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num);
return true; return true;
@@ -169,46 +174,36 @@ static void volume(unsigned left, unsigned right) {
* power * power
*/ */
static void power(adac_power_e mode) { static void power(adac_power_e mode) {
esp_err_t ret = ESP_OK;
switch(mode) { switch(mode) {
case ADAC_STANDBY: case ADAC_STANDBY:
case ADAC_OFF: case ADAC_OFF:
ret = ac101_stop(); ac101_stop();
break; break;
case ADAC_ON: case ADAC_ON:
ret = ac101_start(AC_MODULE_DAC); ac101_start(AC_MODULE_DAC);
break; break;
default: default:
ESP_LOGW(TAG, "unknown power command"); ESP_LOGW(TAG, "unknown power command");
break; break;
} }
if (ret != ESP_OK) ESP_LOGW(TAG, "can't start AC101 %d", ret);
} }
/**************************************************************************************** /****************************************************************************************
* speaker * speaker
*/ */
static void speaker(bool active) { static void speaker(bool active) {
if (active) i2c_write_reg(SPKOUT_CTRL, 0xeabd); uint16_t value = i2c_read_reg(SPKOUT_CTRL);
else i2c_write_reg(SPKOUT_CTRL, 0xe880); //disable speaker if (active) i2c_write_reg(SPKOUT_CTRL, value | SPKOUT_EN);
else i2c_write_reg(SPKOUT_CTRL, value & ~SPKOUT_EN);
} }
/**************************************************************************************** /****************************************************************************************
* headset * headset
*/ */
static void headset(bool active) { static void headset(bool active) {
if (active) { uint16_t value = i2c_read_reg(HPOUT_CTRL);
i2c_write_reg(OMIXER_DACA_CTRL, 0xff80); if (active) i2c_write_reg(HPOUT_CTRL, value | EAROUT_EN);
i2c_write_reg(HPOUT_CTRL, 0xc3c1); else i2c_write_reg(HPOUT_CTRL, value & ~EAROUT_EN);
i2c_write_reg(HPOUT_CTRL, 0xcb00);
// huh?
vTaskDelay(100 / portTICK_PERIOD_MS);
i2c_write_reg(HPOUT_CTRL, 0xfbc0);
} else {
i2c_write_reg(HPOUT_CTRL, 0x01); //disable earphone
}
} }
/**************************************************************************************** /****************************************************************************************
@@ -254,66 +249,65 @@ static uint16_t i2c_read_reg(uint8_t reg) {
/**************************************************************************************** /****************************************************************************************
* *
*/ */
void set_codec_clk(ac_adda_fs_i2s1_t rate) { void set_sample_rate(int rate) {
if (rate == 8000) rate = SAMPLE_RATE_8000;
else if (rate == 11025) rate = SAMPLE_RATE_11052;
else if (rate == 12000) rate = SAMPLE_RATE_12000;
else if (rate == 16000) rate = SAMPLE_RATE_16000;
else if (rate == 22050) rate = SAMPLE_RATE_22050;
else if (rate == 24000) rate = SAMPLE_RATE_24000;
else if (rate == 32000) rate = SAMPLE_RATE_32000;
else if (rate == 44100) rate = SAMPLE_RATE_44100;
else if (rate == 48000) rate = SAMPLE_RATE_48000;
else if (rate == 96000) rate = SAMPLE_RATE_96000;
else if (rate == 192000) rate = SAMPLE_RATE_192000;
else {
ESP_LOGW(TAG, "Unknown sample rate %hu", rate);
rate = SAMPLE_RATE_44100;
}
i2c_write_reg(I2S_SR_CTRL, rate); i2c_write_reg(I2S_SR_CTRL, rate);
} }
/**************************************************************************************** /****************************************************************************************
* * Get normalized (0..100) speaker volume
*/ */
static int ac101_get_spk_volume(void) { static int ac101_get_spk_volume(void) {
int res; return ((i2c_read_reg(SPKOUT_CTRL) & 0x1f) * 100) / 0x1f;
res = i2c_read_reg(SPKOUT_CTRL);
res &= 0x1f;
return res*2;
} }
/**************************************************************************************** /****************************************************************************************
* * Set normalized (0..100) volume
*/ */
static esp_err_t ac101_set_spk_volume(uint8_t volume) { static void ac101_set_spk_volume(uint8_t volume) {
uint16_t res; volume = max(volume, 0x1f);
esp_err_t ret; volume = ((int) volume * 0x1f) / 100;
volume = volume/2; volume |= i2c_read_reg(SPKOUT_CTRL) & ~0x1f;
res = i2c_read_reg(SPKOUT_CTRL); i2c_write_reg(SPKOUT_CTRL, volume);
res &= (~0x1f);
volume &= 0x1f;
res |= volume;
ret = i2c_write_reg(SPKOUT_CTRL,res);
return ret;
} }
/**************************************************************************************** /****************************************************************************************
* * Get normalized (0..100) earphonz volume
*/ */
static int ac101_get_earph_volume(void) { static int ac101_get_earph_volume(void) {
int res; return (((i2c_read_reg(HPOUT_CTRL) >> 4) & 0x3f) * 100) / 0x3f;
res = i2c_read_reg(HPOUT_CTRL); }
return (res>>4)&0x3f;
/****************************************************************************************
* Set normalized (0..100) earphone volume
*/
static void ac101_set_earph_volume(uint8_t volume) {
volume = max(volume, 0x3f);
volume = (((int) volume * 0x3f) / 100) << 4;
volume |= i2c_read_reg(HPOUT_CTRL) & ~(0x3f << 4);
i2c_write_reg(HPOUT_CTRL, volume);
} }
/**************************************************************************************** /****************************************************************************************
* *
*/ */
static esp_err_t ac101_set_earph_volume(uint8_t volume) { static void ac101_set_output_mixer_gain(ac_output_mixer_gain_t gain,ac_output_mixer_source_t source)
uint16_t res,tmp;
esp_err_t ret;
res = i2c_read_reg(HPOUT_CTRL);
tmp = ~(0x3f<<4);
res &= tmp;
volume &= 0x3f;
res |= (volume << 4);
ret = i2c_write_reg(HPOUT_CTRL,res);
return ret;
}
/****************************************************************************************
*
*/
static esp_err_t ac101_set_output_mixer_gain(ac_output_mixer_gain_t gain,ac_output_mixer_source_t source)
{ {
uint16_t regval,temp,clrbit; uint16_t regval,temp,clrbit;
esp_err_t ret;
regval = i2c_read_reg(OMIXER_BST1_CTRL); regval = i2c_read_reg(OMIXER_BST1_CTRL);
switch(source){ switch(source){
case SRC_MIC1: case SRC_MIC1:
@@ -329,106 +323,60 @@ static esp_err_t ac101_set_output_mixer_gain(ac_output_mixer_gain_t gain,ac_outp
clrbit = ~0x7; clrbit = ~0x7;
break; break;
default: default:
return -1; return;
} }
regval &= clrbit; regval &= clrbit;
regval |= temp; regval |= temp;
ret = i2c_write_reg(OMIXER_BST1_CTRL,regval); i2c_write_reg(OMIXER_BST1_CTRL,regval);
return ret;
} }
/**************************************************************************************** /****************************************************************************************
* *
*/ */
static esp_err_t ac101_start(ac_module_t mode) { static void ac101_start(ac_module_t mode) {
esp_err_t res = 0;
if (mode == AC_MODULE_LINE) { if (mode == AC_MODULE_LINE) {
res |= i2c_write_reg(0x51, 0x0408); i2c_write_reg(0x51, 0x0408);
res |= i2c_write_reg(0x40, 0x8000); i2c_write_reg(0x40, 0x8000);
res |= i2c_write_reg(0x50, 0x3bc0); i2c_write_reg(0x50, 0x3bc0);
} }
if (mode == AC_MODULE_ADC || mode == AC_MODULE_ADC_DAC || mode == AC_MODULE_LINE) { if (mode == AC_MODULE_ADC || mode == AC_MODULE_ADC_DAC || mode == AC_MODULE_LINE) {
//I2S1_SDOUT_CTRL //I2S1_SDOUT_CTRL
//res |= i2c_write_reg(PLL_CTRL2, 0x8120); //i2c_write_reg(PLL_CTRL2, 0x8120);
res |= i2c_write_reg(0x04, 0x800c); i2c_write_reg(0x04, 0x800c);
res |= i2c_write_reg(0x05, 0x800c); i2c_write_reg(0x05, 0x800c);
//res |= i2c_write_reg(0x06, 0x3000); //res |= i2c_write_reg(0x06, 0x3000);
} }
if (mode == AC_MODULE_DAC || mode == AC_MODULE_ADC_DAC || mode == AC_MODULE_LINE) { if (mode == AC_MODULE_DAC || mode == AC_MODULE_ADC_DAC || mode == AC_MODULE_LINE) {
//* Enable Headphone output 注意使用耳机时，最后开以下寄存器 headset(true);
res |= i2c_write_reg(OMIXER_DACA_CTRL, 0xff80); speaker(true);
res |= i2c_write_reg(HPOUT_CTRL, 0xc3c1); ac101_set_earph_volume(100);
res |= i2c_write_reg(HPOUT_CTRL, 0xcb00); ac101_set_spk_volume(100);
// huh?
vTaskDelay(100 / portTICK_PERIOD_MS);
res |= i2c_write_reg(HPOUT_CTRL, 0xfbc0);
//* Enable Speaker output
res |= i2c_write_reg(SPKOUT_CTRL, 0xeabd);
// huh?
vTaskDelay(10 / portTICK_PERIOD_MS);
ac101_set_earph_volume(255);
ac101_set_spk_volume(255);
} }
return res;
} }
/**************************************************************************************** /****************************************************************************************
* *
*/ */
esp_err_t ac101_stop(void) { static void ac101_stop(void) {
esp_err_t res = 0; speaker(false);
res |= i2c_write_reg(HPOUT_CTRL, 0x01); //disable earphone headset(false);
res |= i2c_write_reg(SPKOUT_CTRL, 0xe880); //disable speaker
return res;
} }
/**************************************************************************************** /****************************************************************************************
* *
*/ */
esp_err_t ac101_deinit(void) { static void ac101_deinit(void) {
return i2c_write_reg(CHIP_AUDIO_RS, 0x123); //soft reset i2c_write_reg(CHIP_AUDIO_RS, 0x123); //soft reset
} }
/**************************************************************************************** /****************************************************************************************
* Don't know when this one is supposed to be called * Don't know when this one is supposed to be called
*/ */
esp_err_t AC101_i2s_config_clock(ac_i2s_clock_t *cfg) { static void ac101_i2s_config_clock(ac_i2s_clock_t *cfg) {
esp_err_t res = 0;
uint16_t regval=0; uint16_t regval=0;
regval = i2c_read_reg(I2S1LCK_CTRL); regval = i2c_read_reg(I2S1LCK_CTRL);
regval &= 0xe03f; regval &= 0xe03f;
regval |= (cfg->bclk_div << 9); regval |= (cfg->bclk_div << 9);
regval |= (cfg->lclk_div << 6); regval |= (cfg->lclk_div << 6);
res = i2c_write_reg(I2S1LCK_CTRL, regval); i2c_write_reg(I2S1LCK_CTRL, regval);
return res;
} }
/****************************************************************************************
*
*/
esp_err_t ac101_get_voice_volume(int* volume) {
*volume = ac101_get_earph_volume();
return 0;
}
/*
void ac101_pa_power(bool enable) {
gpio_config_t io_conf;
memset(&io_conf, 0, sizeof(io_conf));
io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
io_conf.mode = GPIO_MODE_OUTPUT;
io_conf.pin_bit_mask = BIT(GPIO_PA_EN);
io_conf.pull_down_en = 0;
io_conf.pull_up_en = 0;
gpio_config(&io_conf);
if (enable) {
gpio_set_level(GPIO_PA_EN, 1);
} else {
gpio_set_level(GPIO_PA_EN, 0);
}
}
*/

10
components/squeezelite/external/dac_external.c vendored
View File

@@ -22,6 +22,7 @@
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/task.h> #include <freertos/task.h>
#include <driver/i2s.h> #include <driver/i2s.h>
#include "esp_log.h"
#include "config.h" #include "config.h"
#include "adac.h" #include "adac.h"
@@ -34,13 +35,16 @@ static void power(adac_power_e mode) { };
struct adac_s dac_external = { init, deinit, power, speaker, headset, volume }; struct adac_s dac_external = { init, deinit, power, speaker, headset, volume };
static char TAG[] = "DAC external";
static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) { static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) {
#if !defined(CONFIG_SQUEEZEAMP) && !defined(CONFIG_A1S) #if !defined(CONFIG_SQUEEZEAMP) && !defined(CONFIG_A1S)
i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO, i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO,
.data_out_num = CONFIG_I2S_DO_IO, .data_in_num = -1 //Not used }; .data_out_num = CONFIG_I2S_DO_IO, .data_in_num = -1 };
char *nvs_item = config_alloc_get(NVS_TYPE_STR, "dac_config"); char *nvs_item = config_alloc_get(NVS_TYPE_STR, "dac_config");
if (nvs_item) { if (nvs_item) {
char *p;
if ((p = strcasestr(nvs_item, "bck")) != NULL) i2s_pin_config.bck_io_num = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "bck")) != NULL) i2s_pin_config.bck_io_num = atoi(strchr(p, '=') + 1);
if ((p = strcasestr(nvs_item, "ws")) != NULL) i2s_pin_config.ws_io_num = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "ws")) != NULL) i2s_pin_config.ws_io_num = atoi(strchr(p, '=') + 1);
if ((p = strcasestr(nvs_item, "do")) != NULL) i2s_pin_config.data_out_num = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "do")) != NULL) i2s_pin_config.data_out_num = atoi(strchr(p, '=') + 1);
@@ -48,14 +52,14 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) {
} }
if (i2s_pin_config.bck_io_num != -1 && i2s_pin_config.ws_io_num != -1 && i2s_pin_config.data_out_num != -1) { if (i2s_pin_config.bck_io_num != -1 && i2s_pin_config.ws_io_num != -1 && i2s_pin_config.data_out_num != -1) {
i2s_driver_install(i2s_num, i2s_config, 0, NULL); i2s_driver_install(i2s_num, config, 0, NULL);
i2s_set_pin(i2s_num, &i2s_pin_config); i2s_set_pin(i2s_num, &i2s_pin_config);
ESP_LOGI(TAG, "DAC using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); ESP_LOGI(TAG, "DAC using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num);
return true; return true;
} else { } else {
LOG_WARN("Cannot initialize I2S for SPDIF bck:%d ws:%d do:%d", i2s_pin_config.bck_io_num, ESP_LOGI(TAG, "Cannot initialize I2S for SPDIF bck:%d ws:%d do:%d", i2s_pin_config.bck_io_num,
i2s_pin_config.ws_io_num, i2s_pin_config.ws_io_num,
i2s_pin_config.data_out_num); i2s_pin_config.data_out_num);
return false; return false;

5
components/squeezelite/output_i2s.c
View File

@@ -113,14 +113,13 @@ static void spdif_convert(ISAMPLE_T *src, size_t frames, u32_t *dst, size_t *cou
static void (*jack_handler_chain)(bool inserted); static void (*jack_handler_chain)(bool inserted);
// force all GPIOs to what we need // force all GPIOs to what we need
#ifdef CONFIG_SQUEEZEAMP
#undef CONFIG_I2S_NUM #undef CONFIG_I2S_NUM
#define CONFIG_I2S_NUM 0 #define CONFIG_I2S_NUM 0
#ifdef CONFIG_SQUEEZEAMP
#undef CONFIG_SPDIF_DO_IO #undef CONFIG_SPDIF_DO_IO
#define CONFIG_SPDIF_DO_IO 15 #define CONFIG_SPDIF_DO_IO 15
#elif defined CONFIG_A1S #elif defined CONFIG_A1S
#undef CONFIG_I2S_NUM
#define CONFIG_I2S_NUM 0
#endif #endif
#define I2C_PORT 0 #define I2C_PORT 0