fix build error if ethernet is enabled

remove unnecessary init code from main

Signed-off-by: Karl Osterseher <karli_o@gmx.at>
This commit is contained in:
Karl Osterseher
2024-06-13 21:05:05 +02:00
Unverified
parent c1c3246238
commit e4a7e6249b
7 changed files with 10 additions and 3857 deletions

2
.gitignore vendored
View File

@@ -1,6 +1,8 @@
build
libopus
managed_components
sdkconfig
sdkconfig.old
# Created by https://www.toptal.com/developers/gitignore/api/c,c++,eclipse
# Edit at https://www.toptal.com/developers/gitignore?templates=c,c++,eclipse

View File

@@ -262,25 +262,24 @@
<name>build/ide/esp_idf_components/esp_partition/partition_target.c</name>
<type>1</type>
<location>/home/karl/espressif/esp-idf-v5.1.1/components/esp_partition/partition_target.c</location>
</link>
<link>
<name>build/ide/esp_idf_components/esp_psram/mmu_psram_flash.c</name>
<name>build/ide/esp_idf_components/esp_pm/pm_impl.c</name>
<type>1</type>
<location>/home/karl/espressif/esp-idf-v5.1.1/components/esp_pm/pm_impl.c</location>
</link>
<link>
<name>build/ide/esp_idf_components/esp_ringbuf/ringbuf.c</name>
<name>build/ide/esp_idf_components/esp_pm/pm_locks.c</name>
<type>1</type>
<location>/home/karl/espressif/esp-idf-v5.1.1/components/esp_pm/pm_locks.c</location>
</link>
<link>
<name>build/ide/esp_idf_components/esp_system/crosscore_int.c</name>
<name>build/ide/esp_idf_components/esp_pm/pm_trace.c</name>
<type>1</type>
<location>/home/karl/espressif/esp-idf-v5.1.1/components/esp_pm/pm_trace.c</location>
</link>
<link>
<name>build/ide/esp_idf_components/esp_system/debug_stubs.c</name>
<name>build/ide/esp_idf_components/esp_ringbuf/ringbuf.c</name>
<type>1</type>
<location>/home/karl/espressif/esp-idf-v5.1.1/components/esp_ringbuf/ringbuf.c</location>
</link>
@@ -313,7 +312,6 @@
<name>build/ide/esp_idf_components/esp_system/freertos_hooks.c</name>
<type>1</type>
<location>/home/karl/espressif/esp-idf-v5.1.1/components/esp_system/freertos_hooks.c</location>
</link>
<link>
<name>build/ide/esp_idf_components/esp_system/int_wdt.c</name>

View File

@@ -1588,8 +1588,8 @@ static void player_task(void *pvParameters) {
msec = usec / 1000;
usec = usec % 1000;
// ESP_LOGI(TAG, "%d, %lldus, q %d", dir, avg,
// uxQueueMessagesWaiting(pcmChkQHdl));
// ESP_LOGI(TAG, "%d, %lldus, q %d", dir, avg,
// uxQueueMessagesWaiting(pcmChkQHdl));
// ESP_LOGI(TAG, "%d, %lldus, %lldus %llds, %lld.%lldms", dir, age,
// avg,

View File

@@ -1,5 +1,5 @@
idf_component_register(SRCS "main.c"
INCLUDE_DIRS "."
PRIV_REQUIRES esp_timer esp_wifi nvs_flash wifi_interface audio_board audio_hal audio_sal net_functions opus flac ota_server
ui_http_server improv_wifi
ui_http_server improv_wifi eth_interface
)

View File

@@ -2862,7 +2862,7 @@ void app_main(void) {
ESP_LOGI(TAG, "init player");
init_player();
// ensure there is no noise from DAC
{
board_i2s_pin_t pin_config0;
@@ -2889,29 +2889,6 @@ void app_main(void) {
gpio_config(&gpioCfg);
}
// ensure there is no noise from DAC
{
board_i2s_pin_t pin_config0;
get_i2s_pins(I2S_NUM_0, &pin_config0);
gpio_config_t gpioCfg = {
.pin_bit_mask =
BIT64(pin_config0.mck_io_num) | BIT64(pin_config0.data_out_num) |
BIT64(pin_config0.bck_io_num) | BIT64(pin_config0.ws_io_num) |
BIT64(pin_config0.data_in_num),
.mode = GPIO_MODE_OUTPUT,
.pull_up_en = GPIO_PULLUP_DISABLE,
.pull_down_en = GPIO_PULLDOWN_DISABLE,
.intr_type = GPIO_INTR_DISABLE,
};
gpio_config(&gpioCfg);
gpio_set_level(pin_config0.mck_io_num, 0);
gpio_set_level(pin_config0.data_out_num, 0);
gpio_set_level(pin_config0.data_in_num, 0);
gpio_set_level(pin_config0.bck_io_num, 0);
gpio_set_level(pin_config0.ws_io_num, 0);
}
#if CONFIG_SNAPCLIENT_USE_INTERNAL_ETHERNET || \
CONFIG_SNAPCLIENT_USE_SPI_ETHERNET
eth_init();

1912
sdkconfig

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff