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

amp gpio control with jack - release

Browse Source
This commit is contained in:
Philippe G
2021-11-20 11:08:48 -08:00
parent c0c37bd98a
commit 9588ae9f39
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/services/monitor.c
View File

@@ -145,7 +145,7 @@ static void monitor_callback(TimerHandle_t xTimer) {
* *
*/ */
static void jack_handler_default(void *id, button_event_e event, button_press_e mode, bool long_press) { static void jack_handler_default(void *id, button_event_e event, button_press_e mode, bool long_press) {
ESP_LOGD(TAG, "Jack %s", event == BUTTON_PRESSED ? "inserted" : "removed"); ESP_LOGI(TAG, "Jack %s", event == BUTTON_PRESSED ? "inserted" : "removed");
if (jack_handler_svc) (*jack_handler_svc)(event == BUTTON_PRESSED); if (jack_handler_svc) (*jack_handler_svc)(event == BUTTON_PRESSED);
} }

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

@@ -20,8 +20,8 @@
static const char TAG[] = "DAC external"; static const char TAG[] = "DAC external";
static void speaker(bool active) { } static void speaker(bool active);
static void headset(bool active) { } static void headset(bool active);
static bool volume(unsigned left, unsigned right) { return false; } static bool volume(unsigned left, unsigned right) { return false; }
static void power(adac_power_e mode); static void power(adac_power_e mode);
static bool init(char *config, int i2c_port_num, i2s_config_t *i2s_config); static bool init(char *config, int i2c_port_num, i2s_config_t *i2s_config);
@@ -95,6 +95,22 @@ static void power(adac_power_e mode) {
else i2c_json_execute("poweron"); else i2c_json_execute("poweron");
} }
/****************************************************************************************
* speaker
*/
static void speaker(bool active) {
if (active) i2c_json_execute("speakeron");
else i2c_json_execute("speakeroff");
}
/****************************************************************************************
* headset
*/
static void headset(bool active) {
if (active) i2c_json_execute("headseton");
else i2c_json_execute("headsetoff");
}
/**************************************************************************************** /****************************************************************************************
* *
*/ */

25
components/squeezelite/output_i2s.c
View File

@@ -129,8 +129,13 @@ static bool handler(u8_t *data, int len){
jack_mutes_amp = pkt->config == 0; jack_mutes_amp = pkt->config == 0;
config_set_value(NVS_TYPE_STR, "jack_mutes_amp", jack_mutes_amp ? "y" : "n"); config_set_value(NVS_TYPE_STR, "jack_mutes_amp", jack_mutes_amp ? "y" : "n");
if (jack_mutes_amp && jack_inserted_svc()) adac->speaker(false); if (jack_mutes_amp && jack_inserted_svc()) {
else adac->speaker(true); adac->speaker(false);
if (amp_control.gpio != -1) gpio_set_level(amp_control.gpio, !amp_control.active);
} else {
adac->speaker(true);
if (amp_control.gpio != -1) gpio_set_level(amp_control.gpio, amp_control.active);
}
} }
LOG_INFO("got AUDO %02x", pkt->config); LOG_INFO("got AUDO %02x", pkt->config);
@@ -151,13 +156,12 @@ static void jack_handler(bool inserted) {
// jack detection bounces a bit but that seems fine // jack detection bounces a bit but that seems fine
if (jack_mutes_amp) { if (jack_mutes_amp) {
LOG_INFO("switching amplifier %s", inserted ? "OFF" : "ON"); LOG_INFO("switching amplifier %s", inserted ? "OFF" : "ON");
if (inserted) adac->speaker(false); adac->speaker(!inserted);
else adac->speaker(true); if (amp_control.gpio != -1) gpio_set_level(amp_control.gpio, inserted ? !amp_control.active : amp_control.active);
} }
// activate headset // activate headset
if (inserted) adac->headset(true); adac->headset(inserted);
else adac->headset(false);
// and chain if any // and chain if any
if (jack_handler_chain) (jack_handler_chain)(inserted); if (jack_handler_chain) (jack_handler_chain)(inserted);
@@ -343,12 +347,13 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
jack_handler_chain = jack_handler_svc; jack_handler_chain = jack_handler_svc;
jack_handler_svc = jack_handler; jack_handler_svc = jack_handler;
parse_set_GPIO(set_amp_gpio);
if (jack_mutes_amp && jack_inserted_svc()) adac->speaker(false); if (jack_mutes_amp && jack_inserted_svc()) adac->speaker(false);
else adac->speaker(true); else adac->speaker(true);
adac->headset(jack_inserted_svc()); adac->headset(jack_inserted_svc());
parse_set_GPIO(set_amp_gpio);
// create task as a FreeRTOS task but uses stack in internal RAM // create task as a FreeRTOS task but uses stack in internal RAM
{ {
@@ -455,7 +460,10 @@ static void output_thread_i2s(void *arg) {
adac->speaker(false); adac->speaker(false);
led_blink(LED_GREEN, 200, 1000); led_blink(LED_GREEN, 200, 1000);
} else if (output.state == OUTPUT_RUNNING) { } else if (output.state == OUTPUT_RUNNING) {
if (!jack_mutes_amp || !jack_inserted_svc()) adac->speaker(true); if (!jack_mutes_amp || !jack_inserted_svc()) {
if (amp_control.gpio != -1) gpio_set_level(amp_control.gpio, amp_control.active);
adac->speaker(true);
}
led_on(LED_GREEN); led_on(LED_GREEN);
} }
} }
@@ -513,7 +521,6 @@ static void output_thread_i2s(void *arg) {
i2s_zero_dma_buffer(CONFIG_I2S_NUM); i2s_zero_dma_buffer(CONFIG_I2S_NUM);
i2s_start(CONFIG_I2S_NUM); i2s_start(CONFIG_I2S_NUM);
adac->power(ADAC_ON); adac->power(ADAC_ON);
if (amp_control.gpio != -1) gpio_set_level(amp_control.gpio, amp_control.active);
} }
// this does not work well as set_sample_rates resets the fifos (and it's too early) // this does not work well as set_sample_rates resets the fifos (and it's too early)