浏览代码

DAC external instead of null

philippe44 5 年之前
父节点
当前提交
f9da2d2d0f

+ 1 - 1
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 ? 

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

+ 1 - 1
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
 

+ 1 - 1
components/squeezelite/null/dac_null.c → 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)

+ 1 - 1
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;