@@ -60,39 +60,39 @@ def configure_default_packages(self, variables, targets):
60
60
if "buildfs" in targets :
61
61
filesystem = variables .get ("board_build.filesystem" , "littlefs" )
62
62
if filesystem == "littlefs" :
63
- self .packages ["tl-littlefs320" ]["optional" ] = False
64
63
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tl-littlefs320" )
64
+ self .packages ["tl-littlefs320" ]["optional" ] = False
65
65
self .packages ["tl-littlefs320" ]["version" ] = tl_path
66
66
elif filesystem == "fatfs" :
67
- self .packages ["tl-fatfs" ]["optional" ] = False
68
67
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tl-fatfs" )
68
+ self .packages ["tl-fatfs" ]["optional" ] = False
69
69
self .packages ["tl-fatfs" ]["version" ] = tl_path
70
70
else :
71
- self .packages ["tl-spiffs" ]["optional" ] = False
72
71
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tl-spiffs" )
72
+ self .packages ["tl-spiffs" ]["optional" ] = False
73
73
self .packages ["tl-spiffs" ]["version" ] = tl_path
74
74
if variables .get ("upload_protocol" ):
75
- self .packages ["tl-openocd" ]["optional" ] = False
76
75
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tl-openocd" )
76
+ self .packages ["tl-openocd" ]["optional" ] = False
77
77
self .packages ["tl-openocd" ]["version" ] = tl_path
78
78
if os .path .isdir ("ulp" ):
79
- self .packages ["tc-ulp" ]["optional" ] = False
80
79
ulp_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tc-ulp" )
80
+ self .packages ["tc-ulp" ]["optional" ] = False
81
81
self .packages ["tc-ulp" ]["version" ] = ulp_path
82
82
83
83
if "downloadfs" in targets :
84
84
filesystem = variables .get ("board_build.filesystem" , "littlefs" )
85
85
if filesystem == "littlefs" :
86
86
# Use mklittlefs v4.0.0 to unpack, older version is incompatible
87
- self .packages ["tl-littlefs400" ]["optional" ] = False
88
87
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tl-littlefs400" )
88
+ self .packages ["tl-littlefs400" ]["optional" ] = False
89
89
self .packages ["tl-littlefs400" ]["version" ] = tl_path
90
90
del self .packages ["tl-littlefs320" ]
91
91
92
92
# Currently only Arduino Nano ESP32 uses the dfuutil tool as uploader
93
93
if variables .get ("board" ) == "arduino_nano_esp32" :
94
- self .packages ["tl-dfuutil" ]["optional" ] = False
95
94
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tl-dfuutil" )
95
+ self .packages ["tl-dfuutil" ]["optional" ] = False
96
96
self .packages ["tl-dfuutil" ]["version" ] = tl_path
97
97
else :
98
98
del self .packages ["tl-dfuutil" ]
@@ -108,19 +108,19 @@ def configure_default_packages(self, variables, targets):
108
108
109
109
# Common packages for IDF and mixed Arduino+IDF projects
110
110
if "espidf" in frameworks :
111
- self .packages ["tc-ulp" ]["optional" ] = False
112
111
ulp_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tc-ulp" )
112
+ self .packages ["tc-ulp" ]["optional" ] = False
113
113
self .packages ["tc-ulp" ]["version" ] = ulp_path
114
114
for p in self .packages :
115
115
if p in ("tl-cmake" , "tl-ninja" ):
116
- self .packages [p ]["optional" ] = False
117
116
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , p )
117
+ self .packages [p ]["optional" ] = False
118
118
self .packages [p ]["version" ] = tl_path
119
119
120
120
for available_mcu in ("esp32" , "esp32s2" , "esp32s3" ):
121
121
if available_mcu == mcu :
122
- self .packages ["tc-xt-%s" % mcu ]["optional" ] = False
123
122
tc_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tc-xt-%s" % mcu )
123
+ self .packages ["tc-xt-%s" % mcu ]["optional" ] = False
124
124
self .packages ["tc-xt-%s" % mcu ]["version" ] = tc_path
125
125
else :
126
126
self .packages .pop ("tc-xt-%s" % available_mcu , None )
0 commit comments