From f9da2d2d0f6cafd9aeeea289f48efe233394eaa7 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Wed, 5 Feb 2020 18:17:05 -0800 Subject: [PATCH] DAC external instead of null --- components/services/buttons.c | 2 +- components/squeezelite/adac.h | 2 +- components/squeezelite/component.mk | 2 +- .../squeezelite/{null/dac_null.c => external/dac_external.c} | 2 +- components/squeezelite/output_i2s.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename components/squeezelite/{null/dac_null.c => external/dac_external.c} (96%) diff --git a/components/services/buttons.c b/components/services/buttons.c index 0275efc4..93e842fe 100644 --- a/components/services/buttons.c +++ b/components/services/buttons.c @@ -165,7 +165,7 @@ static void buttons_task(void* arg) { // received a rotary event xQueueReceive(rotary.queue, &event, 0); - ESP_LOGI(TAG, "Event: position %d, direction %s", event.state.position, + ESP_LOGD(TAG, "Event: position %d, direction %s", event.state.position, event.state.direction ? (event.state.direction == ROTARY_ENCODER_DIRECTION_CLOCKWISE ? "CW" : "CCW") : "NOT_SET"); rotary.handler(rotary.client, event.state.direction == ROTARY_ENCODER_DIRECTION_CLOCKWISE ? diff --git a/components/squeezelite/adac.h b/components/squeezelite/adac.h index 4a12a7d4..a8251cbc 100644 --- a/components/squeezelite/adac.h +++ b/components/squeezelite/adac.h @@ -35,4 +35,4 @@ struct adac_s { extern struct adac_s dac_tas57xx; extern struct adac_s dac_a1s; -extern struct adac_s dac_null; \ No newline at end of file +extern struct adac_s dac_external; \ No newline at end of file diff --git a/components/squeezelite/component.mk b/components/squeezelite/component.mk index 9b670e61..c30f0ffa 100644 --- a/components/squeezelite/component.mk +++ b/components/squeezelite/component.mk @@ -19,6 +19,6 @@ CFLAGS += -O3 -DLINKALL -DLOOPBACK -DNO_FAAD -DRESAMPLE16 -DEMBEDDED -DTREMOR_ON # -I$(COMPONENT_PATH)/../codecs/inc/faad2 -COMPONENT_SRCDIRS := . tas57xx a1s null +COMPONENT_SRCDIRS := . tas57xx a1s external COMPONENT_ADD_INCLUDEDIRS := . ./tas57xx ./a1s diff --git a/components/squeezelite/null/dac_null.c b/components/squeezelite/external/dac_external.c similarity index 96% rename from components/squeezelite/null/dac_null.c rename to components/squeezelite/external/dac_external.c index 81efcc55..d0d31d29 100644 --- a/components/squeezelite/null/dac_null.c +++ b/components/squeezelite/external/dac_external.c @@ -32,7 +32,7 @@ static void headset(bool active) { } ; static void volume(unsigned left, unsigned right) { }; static void power(adac_power_e mode) { }; -struct adac_s dac_null = { init, deinit, power, speaker, headset, volume }; +struct adac_s dac_external = { init, deinit, power, speaker, headset, volume }; static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) { #if !defined(CONFIG_SQUEEZEAMP) && !defined(CONFIG_A1S) diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c index 3c7d4a33..d69f0315 100644 --- a/components/squeezelite/output_i2s.c +++ b/components/squeezelite/output_i2s.c @@ -86,7 +86,7 @@ extern struct buffer *outputbuf; extern u8_t *silencebuf; // by default no DAC selected -struct adac_s *adac = &dac_null; +struct adac_s *adac = &dac_external; static log_level loglevel;