@@ -52,29 +52,54 @@ def configure_default_packages(self, variables, targets):
52
52
else :
53
53
shutil .copytree (join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-packages" ), join (IDF_TOOLS_PATH_DEFAULT , "tools" ), symlinks = False , ignore = None , ignore_dangling_symlinks = False , dirs_exist_ok = True )
54
54
55
+ tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mklittlefs" )
56
+ self .packages ["tool-mklittlefs" ]["optional" ] = False
57
+ self .packages ["tool-mklittlefs" ]["version" ] = tl_path
58
+ tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mkfatfs" )
59
+ self .packages ["tool-mkfatfs" ]["optional" ] = False
60
+ self .packages ["tool-mkfatfs" ]["version" ] = tl_path
61
+ tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mkspiffs" )
62
+ self .packages ["tool-mkspiffs" ]["optional" ] = False
63
+ self .packages ["tool-mkspiffs" ]["version" ] = tl_path
64
+ tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-dfuutil" )
65
+ self .packages ["tool-dfuutil" ]["optional" ] = False
66
+ self .packages ["tool-dfuutil" ]["version" ] = tl_path
67
+ tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-openocd" )
68
+ self .packages ["tool-openocd" ]["optional" ] = False
69
+ self .packages ["tool-openocd" ]["version" ] = tl_path
70
+
55
71
56
72
if "arduino" in frameworks :
57
73
self .packages ["framework-arduinoespressif32" ]["optional" ] = False
58
74
self .packages ["framework-arduinoespressif32-libs" ]["optional" ] = False
59
75
60
- if "buildfs" in targets :
76
+ if "" . join ( targets ) in ( "upload" , "buildfs" , "uploadfs" ) :
61
77
filesystem = variables .get ("board_build.filesystem" , "littlefs" )
62
78
if filesystem == "littlefs" :
79
+ # Use mklittlefs v3.2.0 to generate FS
63
80
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mklittlefs" )
64
81
self .packages ["tool-mklittlefs" ]["optional" ] = False
65
82
self .packages ["tool-mklittlefs" ]["version" ] = tl_path
83
+ del self .packages ["tool-mkfatfs" ]
84
+ del self .packages ["tool-mkspiffs" ]
66
85
elif filesystem == "fatfs" :
67
- tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mkfatfs" )
68
86
self .packages ["tool-mkfatfs" ]["optional" ] = False
69
- self .packages ["tool-mkfatfs" ]["version" ] = tl_path
70
- tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mkspiffs" )
71
- self .packages ["tool-mkspiffs" ]["optional" ] = False
72
- self .packages ["tool-mkspiffs" ]["version" ] = tl_path
87
+ del self .packages ["tool-mklittlefs" ]
88
+ del self .packages ["tool-mkspiffs" ]
89
+ elif filesystem == "spiffs" :
90
+ self .packages ["tool-mkspiffs" ]["optional" ] = False
91
+ del self .packages ["tool-mkfatfs" ]
92
+ del self .packages ["tool-mklittlefs" ]
93
+ else :
94
+ del self .packages ["tool-mklittlefs" ]
95
+ del self .packages ["tool-mkfatfs" ]
96
+ del self .packages ["tool-mkspiffs" ]
73
97
74
98
if variables .get ("upload_protocol" ):
75
- tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-openocd" )
76
99
self .packages ["tool-openocd" ]["optional" ] = False
77
- self .packages ["tool-openocd" ]["version" ] = tl_path
100
+ else :
101
+ del self .packages ["tool-openocd" ]
102
+
78
103
79
104
if os .path .isdir ("ulp" ) and os .path .exists (IDF_TOOLS ):
80
105
ulp_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tc-ulp" )
@@ -88,7 +113,6 @@ def configure_default_packages(self, variables, targets):
88
113
tl_path = "file://" + join (IDF_TOOLS_PATH_DEFAULT , "tools" , "tool-mklittlefs400" )
89
114
self .packages ["tool-mklittlefs" ]["optional" ] = False
90
115
self .packages ["tool-mklittlefs" ]["version" ] = tl_path
91
- #del self.packages["tool-mklittlefs"]
92
116
93
117
# Currently only Arduino Nano ESP32 uses the dfuutil tool as uploader
94
118
if variables .get ("board" ) == "arduino_nano_esp32" :
0 commit comments