mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rm AutodetectUploadPort (#17442)

This commit is contained in:
Jason2866 2022-12-19 15:51:57 +01:00 committed by GitHub
parent 29705c15af
commit 3a98fbbe38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pio-tools/download_fs.py
View File

@ -13,8 +13,6 @@ import re
import sys import sys
from os.path import isfile, join from os.path import isfile, join
from enum import Enum from enum import Enum
import typing
from platformio.builder.tools.pioupload import AutodetectUploadPort
import os import os
import subprocess import subprocess
import shutil import shutil
@ -28,8 +26,6 @@ if env["PIOPLATFORM"] == "espressif32":
#print("Replace MKSPIFFSTOOL with mklittlefs") #print("Replace MKSPIFFSTOOL with mklittlefs")
env.Replace( MKSPIFFSTOOL=platform.get_package_dir("tool-mklittlefs") + '/mklittlefs' ) env.Replace( MKSPIFFSTOOL=platform.get_package_dir("tool-mklittlefs") + '/mklittlefs' )
# needed for later
AutodetectUploadPort(env)
class FSType(Enum): class FSType(Enum):
SPIFFS="spiffs" SPIFFS="spiffs"
@ -232,7 +228,7 @@ def esp8266_get_esptoolpy_reset_flags(resetmethod):
def get_fs_type_start_and_length(): def get_fs_type_start_and_length():
platform = env["PIOPLATFORM"] platform = env["PIOPLATFORM"]
if platform == "espressif32": if platform == "espressif32":
print("Retrieving filesystem info for ESP32. Assuming SPIFFS.") print("Retrieving filesystem info for ESP32.")
print("Partition file: " + str(env.subst("$PARTITIONS_TABLE_CSV"))) print("Partition file: " + str(env.subst("$PARTITIONS_TABLE_CSV")))
esp32_fetch_spiffs_size(env) esp32_fetch_spiffs_size(env)
return SPIFFSInfo(env["SPIFFS_START"], env["SPIFFS_SIZE"], env["SPIFFS_PAGE"], env["SPIFFS_BLOCK"]) return SPIFFSInfo(env["SPIFFS_START"], env["SPIFFS_SIZE"], env["SPIFFS_PAGE"], env["SPIFFS_BLOCK"])
@ -263,7 +259,6 @@ def download_fs(fs_info: FSInfo):
fs_file = join(env["PROJECT_DIR"], f"downloaded_fs_{hex(fs_info.start)}_{hex(fs_info.length)}.bin") fs_file = join(env["PROJECT_DIR"], f"downloaded_fs_{hex(fs_info.start)}_{hex(fs_info.length)}.bin")
esptoolpy_flags = [ esptoolpy_flags = [
"--chip", mcu, "--chip", mcu,
"--port", env.subst("$UPLOAD_PORT"),
"--baud", env.subst("$UPLOAD_SPEED"), "--baud", env.subst("$UPLOAD_SPEED"),
"--before", "default_reset", "--before", "default_reset",
"--after", "hard_reset", "--after", "hard_reset",