diff --git a/components/lightsnapcast/player.c b/components/lightsnapcast/player.c index b141b9d..3bbe25e 100644 --- a/components/lightsnapcast/player.c +++ b/components/lightsnapcast/player.c @@ -2408,37 +2408,43 @@ player_task (void *pvParameters) adjust_apll (dir); } - int64_t t; - get_diff_to_server (&t); - - // struct timeval now; - // // get current time - // if (gettimeofday (&now, NULL)) - // { - // ESP_LOGE (TAG, "Failed to get time of day"); - // } + // int64_t t; + // get_diff_to_server (&t); // - // // for getting rssi value - // wifi_ap_record_t ap; - // esp_wifi_sta_get_ap_info(&ap); - //// - // ESP_LOGI (TAG, "%ld.%ld, rssi: %d, %d, - // %lldus, %lldus %lldus, %d, %d, %d, %d, %d", - // now.tv_sec, now.tv_usec, ap.rssi, - // dir, age, avg, t, - // heap_caps_get_free_size (MALLOC_CAP_8BIT), - // heap_caps_get_largest_free_block - // (MALLOC_CAP_8BIT), uxQueueMessagesWaiting - // (pcmChkQHdl), - // heap_caps_get_free_size - //(MALLOC_CAP_32BIT | MALLOC_CAP_EXEC), - // heap_caps_get_largest_free_block (MALLOC_CAP_32BIT | - // MALLOC_CAP_EXEC)); + // struct timeval now; + // // get current time + // if (gettimeofday (&now, NULL)) + // { + // ESP_LOGE (TAG, "Failed to get + // time of day"); + // } + // + // // for getting rssi value + // wifi_ap_record_t ap; + // esp_wifi_sta_get_ap_info(&ap); + // + // ESP_LOGI (TAG, "%ld.%ld, rssi: + // %d, %d, %lldus, %lldus %lldus, + // %d, %d, %d, %d, %d", + // now.tv_sec, now.tv_usec, + // ap.rssi, + // dir, age, avg, t, + // heap_caps_get_free_size + // (MALLOC_CAP_8BIT), + // heap_caps_get_largest_free_block + // (MALLOC_CAP_8BIT), + // uxQueueMessagesWaiting + // (pcmChkQHdl), + // heap_caps_get_free_size + // (MALLOC_CAP_32BIT | MALLOC_CAP_EXEC), + // heap_caps_get_largest_free_block + // (MALLOC_CAP_32BIT | MALLOC_CAP_EXEC)); // ESP_LOGI (TAG, "%d, %lldus, %lldus %lldus", dir, age, avg, t); - // ESP_LOGI (TAG, "%d %lldus, %d", dir, avg, - // uxQueueMessagesWaiting (pcmChkQHdl)); + // ESP_LOGI (TAG, "%d %lldus, %d", + // dir, avg, uxQueueMessagesWaiting + // (pcmChkQHdl)); fragment = chnk->fragment; p_payload = fragment->payload; diff --git a/components/wifi_interface/wifi_interface.c b/components/wifi_interface/wifi_interface.c index 055cd8d..57c6f38 100644 --- a/components/wifi_interface/wifi_interface.c +++ b/components/wifi_interface/wifi_interface.c @@ -160,8 +160,15 @@ wifi_init (void) wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT (); ESP_ERROR_CHECK (esp_wifi_init (&cfg)); + esp_wifi_set_bandwidth (WIFI_IF_STA, WIFI_BW_HT20); + + esp_wifi_set_protocol (WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G + | WIFI_PROTOCOL_11N); + // esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G); + // esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B); + // esp_wifi_set_ps(WIFI_PS_MIN_MODEM); - // esp_wifi_set_ps(WIFI_PS_NONE); + // esp_wifi_set_ps(WIFI_PS_NONE); #if ENABLE_WIFI_PROVISIONING // Configuration for the provisioning manager @@ -241,6 +248,12 @@ wifi_init (void) /* Start Wi-Fi station */ ESP_ERROR_CHECK (esp_wifi_set_mode (WIFI_MODE_STA)); + + wifi_config_t wifi_config; + ESP_ERROR_CHECK (esp_wifi_get_config (WIFI_IF_STA, &wifi_config)); + wifi_config.sta.sort_method = WIFI_CONNECT_AP_BY_SIGNAL; + ESP_ERROR_CHECK (esp_wifi_set_config (WIFI_IF_STA, &wifi_config)); + ESP_ERROR_CHECK (esp_wifi_start ()); ESP_LOGI (TAG, "wifi_init_sta finished."); diff --git a/components/wifi_logger b/components/wifi_logger deleted file mode 160000 index 23bf246..0000000 --- a/components/wifi_logger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 23bf246c863c15d118c46cce47dd3f1657809ab7 diff --git a/main/main.c b/main/main.c index f40ef84..4f8640c 100644 --- a/main/main.c +++ b/main/main.c @@ -82,7 +82,7 @@ const char *VERSION_STRING = "0.0.2"; #define OTA_TASK_PRIORITY 6 #define OTA_TASK_CORE_ID 1 // tskNO_AFFINITY -#define FLAC_TASK_PRIORITY HTTP_TASK_PRIORITY +#define FLAC_TASK_PRIORITY 6 #define FLAC_TASK_CORE_ID 1 // tskNO_AFFINITY xTaskHandle t_ota_task = NULL; @@ -247,24 +247,20 @@ write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, for (i = 0; i < frame->header.blocksize; i++) { // write little endian - // flacData->outData-[4 * i] = (uint8_t)buffer[0][i]; - // flacData->outData[4 * i + 1] = (uint8_t) (buffer[0][i] - //>> 8); flacData->outData[4 * i + 2] = - // (uint8_t)buffer[1][i]; flacData->outData[4 * i + 3] = - // (uint8_t) - //(buffer[1][i] >> 8); + // flacData->outData[4 * i] = (uint8_t)buffer[0][i]; + // flacData->outData[4 * i + 1] = (uint8_t) (buffer[0][i] >> 8); + // flacData->outData[4 * i + 2] = (uint8_t)buffer[1][i]; + // flacData->outData[4 * i + 3] = (uint8_t)(buffer[1][i] >> 8); // TODO: for now fragmented payload is not supported and the whole // chunk is expected to be in the first fragment - tmpData = ((uint32_t) ((buffer[1][i] >> 8) & 0xFF) << 24) - | ((uint32_t) ((buffer[1][i] >> 0) & 0xFF) << 16) - | ((uint32_t) ((buffer[0][i] >> 8) & 0xFF) << 8) - | ((uint32_t) ((buffer[0][i] >> 0) & 0xFF) << 0); + tmpData = ((uint32_t) ((buffer[0][i] >> 8) & 0xFF) << 24) + | ((uint32_t) ((buffer[0][i] >> 0) & 0xFF) << 16) + | ((uint32_t) ((buffer[1][i] >> 8) & 0xFF) << 8) + | ((uint32_t) ((buffer[1][i] >> 0) & 0xFF) << 0); uint32_t *test = &(flacData->outData->fragment->payload[4 * i]); *test = tmpData; - // memcpy((uint32_t *)&(flacData->outData->fragment->payload[4 * i]), - // &tmpData, sizeof(tmpData)); } } else @@ -3693,54 +3689,14 @@ app_main (void) set_time_from_sntp (); #endif - xTaskCreatePinnedToCore (&ota_server_task, "ota", 14 * 256, NULL, - OTA_TASK_PRIORITY, t_ota_task, OTA_TASK_CORE_ID); + // xTaskCreatePinnedToCore (&ota_server_task, "ota", 14 * 256, NULL, + // OTA_TASK_PRIORITY, t_ota_task, + // OTA_TASK_CORE_ID); // xTaskCreatePinnedToCore (&http_get_task, "http", 10 * 256, NULL, // HTTP_TASK_PRIORITY, &t_http_get_task, // HTTP_TASK_CORE_ID); - /* - -// struct netconn *lwipNetconn; - struct ip_addr local_ip; - struct ip_addr remote_ip; - uint16_t remotePort = 1704; - int rc1, rc2; -// -// while(1) { - lwipNetconn = netconn_new(NETCONN_TCP); - if ( lwipNetconn == NULL ) { - ESP_LOGE (TAG, "can't create netconn"); - -// continue; - } -// - local_ip.u_addr.ip4.addr = get_current_ip4().addr; - rc1 = netconn_bind ( lwipNetconn, &local_ip, 0 ); - if (rc1 != ERR_OK) { - ESP_LOGE (TAG, "can't bind local IP"); - } - remote_ip.u_addr.ip4.addr = ipaddr_addr("192.168.1.54"); - rc2 = netconn_connect ( lwipNetconn, &remote_ip, remotePort ); - if (rc2 != ERR_OK) { - ESP_LOGE (TAG, "can't connect to remote"); - } - if ( rc1 != ERR_OK || rc2 != ERR_OK ) - { - netconn_delete ( lwipNetconn ); -// continue; - } - - ESP_LOGI (TAG, "netconn connected"); -// -// while (1) { -// vTaskDelay(10); -// } -// } - - */ - xTaskCreatePinnedToCore (&http_get_task, "http", 3 * 1024, NULL, HTTP_TASK_PRIORITY, &t_http_get_task, HTTP_TASK_CORE_ID); diff --git a/sdkconfig b/sdkconfig index d92ae5e..3af7b3c 100644 --- a/sdkconfig +++ b/sdkconfig @@ -535,7 +535,7 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # # Wi-Fi # -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=25 +CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=128 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y @@ -545,7 +545,7 @@ CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP32_WIFI_TX_BA_WIN=16 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP32_WIFI_RX_BA_WIN=25 +CONFIG_ESP32_WIFI_RX_BA_WIN=16 CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set diff --git a/sdkconfig.old b/sdkconfig.old index d03b292..e4f79e4 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -535,7 +535,7 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # # Wi-Fi # -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=25 +CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=128 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y @@ -543,9 +543,9 @@ CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y -CONFIG_ESP32_WIFI_TX_BA_WIN=16 +CONFIG_ESP32_WIFI_TX_BA_WIN=4 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP32_WIFI_RX_BA_WIN=25 +CONFIG_ESP32_WIFI_RX_BA_WIN=16 CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set @@ -745,7 +745,7 @@ CONFIG_LWIP_IP6_FRAG=y # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64 +CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set @@ -777,7 +777,7 @@ CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_MSL=60000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534 CONFIG_LWIP_TCP_WND_DEFAULT=65534 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=64 +CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y CONFIG_LWIP_TCP_SACK_OUT=y # CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set @@ -1332,14 +1332,14 @@ CONFIG_TIMER_QUEUE_LENGTH=5 # CONFIG_USE_ONLY_LWIP_SELECT is not set CONFIG_ESP_GRATUITOUS_ARP=y CONFIG_GARP_TMR_INTERVAL=60 -CONFIG_TCPIP_RECVMBOX_SIZE=64 +CONFIG_TCPIP_RECVMBOX_SIZE=32 CONFIG_TCP_MAXRTX=12 CONFIG_TCP_SYNMAXRTX=12 CONFIG_TCP_MSS=1460 CONFIG_TCP_MSL=60000 CONFIG_TCP_SND_BUF_DEFAULT=65534 CONFIG_TCP_WND_DEFAULT=65534 -CONFIG_TCP_RECVMBOX_SIZE=64 +CONFIG_TCP_RECVMBOX_SIZE=6 CONFIG_TCP_QUEUE_OOSEQ=y # CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set CONFIG_TCP_OVERSIZE_MSS=y