Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-06 19:47:02 +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-05 21:20:16 -05:00
parent 58a2d0bea7 f9da2d2d0f
commit 74f99e9ee7
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/services/buttons.c
View File

@@ -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 ?

2
components/squeezelite/adac.h
View File

@@ -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;
extern struct adac_s dac_external;

2
components/squeezelite/component.mk
View File

@@ -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

2
components/squeezelite/null/dac_null.c → components/squeezelite/external/dac_external.c vendored
View File

@@ -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)

2
components/squeezelite/output_i2s.c
View File

@@ -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;