Once again

2020-05-30 14:19:46 +03:00
parent f2e1016ea5
commit 76637cbd5b
71 changed files with 22 additions and 7 deletions
--- a/tools/sdk/esp32s2/include/config/sdkconfig.h
+++ b/tools/sdk/esp32s2/include/config/sdkconfig.h
@ -353,13 +353,22 @@
 #define CONFIG_SPIFFS_META_LENGTH 4
 #define CONFIG_SPIFFS_USE_MTIME 1
 #define CONFIG_USB_ENABLED 1
-#define CONFIG_USB_MAX_POWER_USAGE 250
+#define CONFIG_USB_MAX_POWER_USAGE 100
 #define CONFIG_USB_CDC_ENABLED 1
 #define CONFIG_USB_CDC_RX_BUFSIZE 64
 #define CONFIG_USB_CDC_TX_BUFSIZE 64
 #define CONFIG_USB_MSC_ENABLED 1
 #define CONFIG_USB_MSC_BUFSIZE 512
 #define CONFIG_USB_VENDOR_ENABLED 1
 #define CONFIG_USB_DESC_USE_ESPRESSIF_VID 1
 #define CONFIG_USB_DESC_USE_DEFAULT_PID 1
 #define CONFIG_USB_DESC_BCDDEVICE 0x0100
 #define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif Systems"
 #define CONFIG_USB_DESC_PRODUCT_STRING "Espressif Device"
 #define CONFIG_USB_DESC_SERIAL_STRING "123456"
 #define CONFIG_USB_DESC_CDC_STRING "Espressif CDC Device"
 #define CONFIG_USB_DESC_MSC_STRING "Espressif MSC Device"
 #define CONFIG_USB_DESC_VENDOR_STRING "Espressif VENDOR Device"
 #define CONFIG_UNITY_ENABLE_FLOAT 1
 #define CONFIG_UNITY_ENABLE_DOUBLE 1
 #define CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER 1
--- a/tools/sdk/esp32s2/ld/esp32s2.project.ld
+++ b/tools/sdk/esp32s2/ld/esp32s2.project.ld
--- a/tools/sdk/esp32s2/lib/libapp_trace.a
+++ b/tools/sdk/esp32s2/lib/libapp_trace.a
--- a/tools/sdk/esp32s2/lib/libapp_update.a
+++ b/tools/sdk/esp32s2/lib/libapp_update.a
--- a/tools/sdk/esp32s2/lib/libasio.a
+++ b/tools/sdk/esp32s2/lib/libasio.a
--- a/tools/sdk/esp32s2/lib/libbootloader_support.a
+++ b/tools/sdk/esp32s2/lib/libbootloader_support.a
--- a/tools/sdk/esp32s2/lib/libcbor.a
+++ b/tools/sdk/esp32s2/lib/libcbor.a
--- a/tools/sdk/esp32s2/lib/libcoap.a
+++ b/tools/sdk/esp32s2/lib/libcoap.a
--- a/tools/sdk/esp32s2/lib/libconsole.a
+++ b/tools/sdk/esp32s2/lib/libconsole.a
--- a/tools/sdk/esp32s2/lib/libcxx.a
+++ b/tools/sdk/esp32s2/lib/libcxx.a
--- a/tools/sdk/esp32s2/lib/libdriver.a
+++ b/tools/sdk/esp32s2/lib/libdriver.a
--- a/tools/sdk/esp32s2/lib/libefuse.a
+++ b/tools/sdk/esp32s2/lib/libefuse.a
--- a/tools/sdk/esp32s2/lib/libesp-tls.a
+++ b/tools/sdk/esp32s2/lib/libesp-tls.a
--- a/tools/sdk/esp32s2/lib/libesp32s2.a
+++ b/tools/sdk/esp32s2/lib/libesp32s2.a
--- a/tools/sdk/esp32s2/lib/libesp_common.a
+++ b/tools/sdk/esp32s2/lib/libesp_common.a
--- a/tools/sdk/esp32s2/lib/libesp_eth.a
+++ b/tools/sdk/esp32s2/lib/libesp_eth.a
--- a/tools/sdk/esp32s2/lib/libesp_event.a
+++ b/tools/sdk/esp32s2/lib/libesp_event.a
--- a/tools/sdk/esp32s2/lib/libesp_gdbstub.a
+++ b/tools/sdk/esp32s2/lib/libesp_gdbstub.a
--- a/tools/sdk/esp32s2/lib/libesp_hid.a
+++ b/tools/sdk/esp32s2/lib/libesp_hid.a
--- a/tools/sdk/esp32s2/lib/libesp_http_client.a
+++ b/tools/sdk/esp32s2/lib/libesp_http_client.a
--- a/tools/sdk/esp32s2/lib/libesp_http_server.a
+++ b/tools/sdk/esp32s2/lib/libesp_http_server.a
--- a/tools/sdk/esp32s2/lib/libesp_https_ota.a
+++ b/tools/sdk/esp32s2/lib/libesp_https_ota.a
--- a/tools/sdk/esp32s2/lib/libesp_https_server.a
+++ b/tools/sdk/esp32s2/lib/libesp_https_server.a
--- a/tools/sdk/esp32s2/lib/libesp_local_ctrl.a
+++ b/tools/sdk/esp32s2/lib/libesp_local_ctrl.a
--- a/tools/sdk/esp32s2/lib/libesp_netif.a
+++ b/tools/sdk/esp32s2/lib/libesp_netif.a
--- a/tools/sdk/esp32s2/lib/libesp_ringbuf.a
+++ b/tools/sdk/esp32s2/lib/libesp_ringbuf.a
--- a/tools/sdk/esp32s2/lib/libesp_serial_slave_link.a
+++ b/tools/sdk/esp32s2/lib/libesp_serial_slave_link.a
--- a/tools/sdk/esp32s2/lib/libesp_system.a
+++ b/tools/sdk/esp32s2/lib/libesp_system.a
--- a/tools/sdk/esp32s2/lib/libesp_timer.a
+++ b/tools/sdk/esp32s2/lib/libesp_timer.a
--- a/tools/sdk/esp32s2/lib/libesp_websocket_client.a
+++ b/tools/sdk/esp32s2/lib/libesp_websocket_client.a
--- a/tools/sdk/esp32s2/lib/libesp_wifi.a
+++ b/tools/sdk/esp32s2/lib/libesp_wifi.a
--- a/tools/sdk/esp32s2/lib/libespcoredump.a
+++ b/tools/sdk/esp32s2/lib/libespcoredump.a
--- a/tools/sdk/esp32s2/lib/libexpat.a
+++ b/tools/sdk/esp32s2/lib/libexpat.a
--- a/tools/sdk/esp32s2/lib/libfatfs.a
+++ b/tools/sdk/esp32s2/lib/libfatfs.a
--- a/tools/sdk/esp32s2/lib/libfb_gfx.a
+++ b/tools/sdk/esp32s2/lib/libfb_gfx.a
--- a/tools/sdk/esp32s2/lib/libfreemodbus.a
+++ b/tools/sdk/esp32s2/lib/libfreemodbus.a
--- a/tools/sdk/esp32s2/lib/libfreertos.a
+++ b/tools/sdk/esp32s2/lib/libfreertos.a
--- a/tools/sdk/esp32s2/lib/libheap.a
+++ b/tools/sdk/esp32s2/lib/libheap.a
--- a/tools/sdk/esp32s2/lib/libjsmn.a
+++ b/tools/sdk/esp32s2/lib/libjsmn.a
--- a/tools/sdk/esp32s2/lib/libjson.a
+++ b/tools/sdk/esp32s2/lib/libjson.a
--- a/tools/sdk/esp32s2/lib/liblibsodium.a
+++ b/tools/sdk/esp32s2/lib/liblibsodium.a
--- a/tools/sdk/esp32s2/lib/liblog.a
+++ b/tools/sdk/esp32s2/lib/liblog.a
--- a/tools/sdk/esp32s2/lib/liblwip.a
+++ b/tools/sdk/esp32s2/lib/liblwip.a
--- a/tools/sdk/esp32s2/lib/libmbedcrypto.a
+++ b/tools/sdk/esp32s2/lib/libmbedcrypto.a
--- a/tools/sdk/esp32s2/lib/libmbedtls.a
+++ b/tools/sdk/esp32s2/lib/libmbedtls.a
--- a/tools/sdk/esp32s2/lib/libmbedx509.a
+++ b/tools/sdk/esp32s2/lib/libmbedx509.a
--- a/tools/sdk/esp32s2/lib/libmdns.a
+++ b/tools/sdk/esp32s2/lib/libmdns.a
--- a/tools/sdk/esp32s2/lib/libmqtt.a
+++ b/tools/sdk/esp32s2/lib/libmqtt.a
--- a/tools/sdk/esp32s2/lib/libnewlib.a
+++ b/tools/sdk/esp32s2/lib/libnewlib.a
--- a/tools/sdk/esp32s2/lib/libnghttp.a
+++ b/tools/sdk/esp32s2/lib/libnghttp.a
--- a/tools/sdk/esp32s2/lib/libnvs_flash.a
+++ b/tools/sdk/esp32s2/lib/libnvs_flash.a
--- a/tools/sdk/esp32s2/lib/libopenssl.a
+++ b/tools/sdk/esp32s2/lib/libopenssl.a
--- a/tools/sdk/esp32s2/lib/libperfmon.a
+++ b/tools/sdk/esp32s2/lib/libperfmon.a
--- a/tools/sdk/esp32s2/lib/libprotobuf-c.a
+++ b/tools/sdk/esp32s2/lib/libprotobuf-c.a
--- a/tools/sdk/esp32s2/lib/libprotocomm.a
+++ b/tools/sdk/esp32s2/lib/libprotocomm.a
--- a/tools/sdk/esp32s2/lib/libpthread.a
+++ b/tools/sdk/esp32s2/lib/libpthread.a
--- a/tools/sdk/esp32s2/lib/libsdmmc.a
+++ b/tools/sdk/esp32s2/lib/libsdmmc.a
--- a/tools/sdk/esp32s2/lib/libsoc.a
+++ b/tools/sdk/esp32s2/lib/libsoc.a
--- a/tools/sdk/esp32s2/lib/libsoc_esp32s2.a
+++ b/tools/sdk/esp32s2/lib/libsoc_esp32s2.a
--- a/tools/sdk/esp32s2/lib/libspi_flash.a
+++ b/tools/sdk/esp32s2/lib/libspi_flash.a
--- a/tools/sdk/esp32s2/lib/libspiffs.a
+++ b/tools/sdk/esp32s2/lib/libspiffs.a
--- a/tools/sdk/esp32s2/lib/libtcp_transport.a
+++ b/tools/sdk/esp32s2/lib/libtcp_transport.a
--- a/tools/sdk/esp32s2/lib/libtcpip_adapter.a
+++ b/tools/sdk/esp32s2/lib/libtcpip_adapter.a
--- a/tools/sdk/esp32s2/lib/libulp.a
+++ b/tools/sdk/esp32s2/lib/libulp.a
--- a/tools/sdk/esp32s2/lib/libunity.a
+++ b/tools/sdk/esp32s2/lib/libunity.a
--- a/tools/sdk/esp32s2/lib/libvfs.a
+++ b/tools/sdk/esp32s2/lib/libvfs.a
--- a/tools/sdk/esp32s2/lib/libwear_levelling.a
+++ b/tools/sdk/esp32s2/lib/libwear_levelling.a
--- a/tools/sdk/esp32s2/lib/libwifi_provisioning.a
+++ b/tools/sdk/esp32s2/lib/libwifi_provisioning.a
--- a/tools/sdk/esp32s2/lib/libwpa_supplicant.a
+++ b/tools/sdk/esp32s2/lib/libwpa_supplicant.a
--- a/tools/sdk/esp32s2/lib/libxtensa.a
+++ b/tools/sdk/esp32s2/lib/libxtensa.a
--- a/tools/sdk/esp32s2/sdkconfig
+++ b/tools/sdk/esp32s2/sdkconfig
@ -987,12 +987,15 @@ CONFIG_SPIFFS_USE_MTIME=y
 # TinyUSB
 #
 CONFIG_USB_ENABLED=y
-CONFIG_USB_MAX_POWER_USAGE=250
+CONFIG_USB_MAX_POWER_USAGE=100
-# CONFIG_USB_CDC_ENABLED is not set
+CONFIG_USB_CDC_ENABLED=y
-# CONFIG_USB_MSC_ENABLED is not set
+CONFIG_USB_CDC_RX_BUFSIZE=64
 CONFIG_USB_CDC_TX_BUFSIZE=64
 CONFIG_USB_MSC_ENABLED=y
 CONFIG_USB_MSC_BUFSIZE=512
 # CONFIG_USB_HID_ENABLED is not set
 # CONFIG_USB_MIDI_ENABLED is not set
-# CONFIG_USB_VENDOR_ENABLED is not set
+CONFIG_USB_VENDOR_ENABLED=y
 # CONFIG_USB_CUSTOM_CLASS_ENABLED is not set
 # CONFIG_USB_DEBUG is not set
@ -1005,6 +1008,9 @@ CONFIG_USB_DESC_BCDDEVICE=0x0100
 CONFIG_USB_DESC_MANUFACTURER_STRING="Espressif Systems"
 CONFIG_USB_DESC_PRODUCT_STRING="Espressif Device"
 CONFIG_USB_DESC_SERIAL_STRING="123456"
 CONFIG_USB_DESC_CDC_STRING="Espressif CDC Device"
 CONFIG_USB_DESC_MSC_STRING="Espressif MSC Device"
 CONFIG_USB_DESC_VENDOR_STRING="Espressif VENDOR Device"
 # end of Descriptor configuration
 # end of TinyUSB