@@ -164,28 +164,28 @@ def install_tool(TOOL):
164
164
for package in CHECK_PACKAGES :
165
165
for check_tool in variables .get ("check_tool" , "" ):
166
166
if check_tool in package :
167
- self . packages [ package ][ "optional" ] = False
167
+ install_tool ( package )
168
168
169
169
if "buildfs" in targets :
170
170
filesystem = variables .get ("board_build.filesystem" , "littlefs" )
171
171
if filesystem == "littlefs" :
172
- self . packages [ "tool-mklittlefs" ][ "optional" ] = False
172
+ install_tool ( "tool-mklittlefs" )
173
173
elif filesystem == "fatfs" :
174
- self . packages [ "tool-mkfatfs" ][ "optional" ] = False
174
+ install_tool ( "tool-mkfatfs" )
175
175
else :
176
- self . packages [ "tool-mkspiffs" ][ "optional" ] = False
176
+ install_tool ( "tool-mkspiffs" )
177
177
178
178
if "downloadfs" in targets :
179
179
filesystem = variables .get ("board_build.filesystem" , "littlefs" )
180
180
if filesystem == "littlefs" :
181
181
# Use Tasmota mklittlefs v4.0.0 to unpack, older version is incompatible
182
- self .packages ["tool-mklittlefs" ]["version" ] = "~4.0.0"
182
+ self .packages ["tool-mklittlefs" ]["version" ] = "https://github.com/pioarduino/registry/releases/download/0.0.1/mklittlefs-4.0.0.zip"
183
+ self .packages ["tool-mklittlefs" ]["optional" ] = False
184
+ install_tool ("tool-mklittlefs" )
183
185
184
186
# Currently only Arduino Nano ESP32 uses the dfuutil tool as uploader
185
187
if variables .get ("board" ) == "arduino_nano_esp32" :
186
- self .packages ["tool-dfuutil-arduino" ]["optional" ] = False
187
- else :
188
- del self .packages ["tool-dfuutil-arduino" ]
188
+ install_tool ("tool-dfuutil-arduino" )
189
189
190
190
return super ().configure_default_packages (variables , targets )
191
191
0 commit comments