Use new webusb tools for installing app, use new version of components

This commit is contained in:
Renze Nicolai 2023-04-22 19:30:31 +02:00
parent c88b7fa18f
commit 34c14243bf
12 changed files with 32 additions and 20 deletions

2
.gitignore vendored
View file

@ -4,3 +4,5 @@ sdkconfig.old
*.bak *.bak
*.old *.old
.vscode .vscode
dependencies.lock
esp-idf

View file

@ -24,7 +24,7 @@ build:
source "$(IDF_PATH)/export.sh" && idf.py build source "$(IDF_PATH)/export.sh" && idf.py build
install: build install: build
python3 tools/webusb_push.py "Template App" build/main.bin --run python3 tools/app_push.py build/main.bin "template_app" "Template App" 1 --run
monitor: monitor:
source "$(IDF_PATH)/export.sh" && idf.py monitor -p $(PORT) source "$(IDF_PATH)/export.sh" && idf.py monitor -p $(PORT)

@ -1 +1 @@
Subproject commit b20b1d8f4d88b3af9b9065998824dae8414f1492 Subproject commit 599174e610f8d3745e3e0e41816aceec3e68430f

@ -1 +1 @@
Subproject commit 4804a783940d8df3d39c2dd30e8907ad308a2570 Subproject commit 584112a1d5c85365cf483f5c15395b0d4424ef97

@ -1 +1 @@
Subproject commit dc77a8b0189d0b230502ce4b12099030a1ff7f29 Subproject commit 45fce00c790a2918bf506dd8af0c0b68db05d031

@ -1 +1 @@
Subproject commit d8a9ad72536ac758c8421d52ffa347c89503fbd1 Subproject commit c47c86258a012b0e86d560bdf079d7bae91fdc22

@ -1 +1 @@
Subproject commit 030755a7429a2f8f9590cd1222dc3675e5c631dc Subproject commit 61664fad9884750d484c4011b01f713ab77a1cab

@ -1 +1 @@
Subproject commit 2b6630e85e3e44b7e939be17341942b2dbb0ff9a Subproject commit a7d6292b7defcff6a9c4445003a5764e884cf434

@ -1 +1 @@
Subproject commit 7e2bdc0f1d80ad66f4cb0e561976de624507029f Subproject commit f14c753be232ab2a0593f41a4ef59ca0f2d8745c

@ -1 +1 @@
Subproject commit 4236aa600dc9bc21e75c6e60bb9fbdec196906f9 Subproject commit 2dbb14e488d9f309fd1d3cc050f4472c3ba48108

View file

@ -55,6 +55,7 @@ CONFIG_BOOTLOADER_SPI_WP_PIN=7
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
# CONFIG_BOOTLOADER_FACTORY_RESET is not set # CONFIG_BOOTLOADER_FACTORY_RESET is not set
# CONFIG_BOOTLOADER_APP_TEST is not set # CONFIG_BOOTLOADER_APP_TEST is not set
CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE=y
CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_ENABLE=y
# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set # CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
CONFIG_BOOTLOADER_WDT_TIME_MS=9000 CONFIG_BOOTLOADER_WDT_TIME_MS=9000
@ -97,6 +98,9 @@ CONFIG_ESPTOOLPY_FLASHFREQ="80m"
# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
CONFIG_ESPTOOLPY_FLASHSIZE="16MB" CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
CONFIG_ESPTOOLPY_BEFORE_RESET=y CONFIG_ESPTOOLPY_BEFORE_RESET=y
@ -266,8 +270,8 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
# #
CONFIG_ESP_TLS_USING_MBEDTLS=y CONFIG_ESP_TLS_USING_MBEDTLS=y
# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set # CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set
# CONFIG_ESP_TLS_SERVER is not set
# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
# CONFIG_ESP_TLS_SERVER is not set
# CONFIG_ESP_TLS_PSK_VERIFICATION is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set
# CONFIG_ESP_TLS_INSECURE is not set # CONFIG_ESP_TLS_INSECURE is not set
# end of ESP-TLS # end of ESP-TLS
@ -525,6 +529,13 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
# CONFIG_PM_ENABLE is not set # CONFIG_PM_ENABLE is not set
# end of Power Management # end of Power Management
#
# ESP Ringbuf
#
# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set
# CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH is not set
# end of ESP Ringbuf
# #
# ESP System Settings # ESP System Settings
# #
@ -609,6 +620,8 @@ CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
# CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
# end of Wi-Fi # end of Wi-Fi
# #
@ -687,11 +700,7 @@ CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
# CONFIG_FMB_TIMER_PORT_ENABLED is not set # CONFIG_FMB_TIMER_PORT_ENABLED is not set
CONFIG_FMB_TIMER_GROUP=0 # CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD is not set
CONFIG_FMB_TIMER_INDEX=0
CONFIG_FMB_MASTER_TIMER_GROUP=0
CONFIG_FMB_MASTER_TIMER_INDEX=0
# CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
# end of Modbus configuration # end of Modbus configuration
# #
@ -850,6 +859,7 @@ CONFIG_LWIP_TCP_SYNMAXRTX=12
CONFIG_LWIP_TCP_MSS=1440 CONFIG_LWIP_TCP_MSS=1440
CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_TMR_INTERVAL=250
CONFIG_LWIP_TCP_MSL=60000 CONFIG_LWIP_TCP_MSL=60000
CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
CONFIG_LWIP_TCP_WND_DEFAULT=5744 CONFIG_LWIP_TCP_WND_DEFAULT=5744
CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
@ -1104,6 +1114,7 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
# #
# NVS # NVS
# #
# CONFIG_NVS_ASSERT_ERROR_CHECK is not set
# end of NVS # end of NVS
# #
@ -1241,7 +1252,6 @@ CONFIG_VFS_SUPPORT_TERMIOS=y
# Host File System I/O (Semihosting) # Host File System I/O (Semihosting)
# #
CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1 CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
# end of Host File System I/O (Semihosting) # end of Host File System I/O (Semihosting)
# end of Virtual file system # end of Virtual file system
@ -1258,6 +1268,7 @@ CONFIG_WL_SECTOR_SIZE=4096
# #
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
# CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION is not set
# end of Wi-Fi Provisioning Manager # end of Wi-Fi Provisioning Manager
# #
@ -1270,6 +1281,8 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
# CONFIG_WPA_TESTING_OPTIONS is not set # CONFIG_WPA_TESTING_OPTIONS is not set
# CONFIG_WPA_WPS_STRICT is not set # CONFIG_WPA_WPS_STRICT is not set
# CONFIG_WPA_11KV_SUPPORT is not set # CONFIG_WPA_11KV_SUPPORT is not set
# CONFIG_WPA_MBO_SUPPORT is not set
# CONFIG_WPA_DPP_SUPPORT is not set
# end of Supplicant # end of Supplicant
# end of Component config # end of Component config
@ -1396,8 +1409,6 @@ CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
CONFIG_MB_CONTROLLER_STACK_SIZE=4096 CONFIG_MB_CONTROLLER_STACK_SIZE=4096
CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
# CONFIG_MB_TIMER_PORT_ENABLED is not set # CONFIG_MB_TIMER_PORT_ENABLED is not set
CONFIG_MB_TIMER_GROUP=0
CONFIG_MB_TIMER_INDEX=0
# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
CONFIG_TIMER_TASK_PRIORITY=1 CONFIG_TIMER_TASK_PRIORITY=1
CONFIG_TIMER_TASK_STACK_DEPTH=2048 CONFIG_TIMER_TASK_STACK_DEPTH=2048
@ -1440,5 +1451,4 @@ CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=y
CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
CONFIG_SUPPORT_TERMIOS=y CONFIG_SUPPORT_TERMIOS=y
CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
# End of deprecated options # End of deprecated options

2
tools

@ -1 +1 @@
Subproject commit bef7edfe709f89d9d601de7dde61b31fe5317854 Subproject commit cd74b177303d7172b7755b58dba03faf423686a5