Skip to content

Commit 7f0975f

Browse files
authored
Improve package filtering (#97)
1 parent 351240a commit 7f0975f

File tree

3 files changed

+5
-40
lines changed

3 files changed

+5
-40
lines changed

nanoFirmwareFlasher/FirmwarePackage.cs

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -77,43 +77,8 @@ public static List<CloudSmithPackageDetail> GetTargetList(
7777
SupportedPlatform? platform,
7878
VerbosityLevel verbosity)
7979
{
80-
string queryFilter = string.Empty;
81-
82-
// build query filter according to platform using package name
83-
if (platform != null)
84-
{
85-
List<string> query = new();
86-
87-
switch(platform)
88-
{
89-
case SupportedPlatform.esp32:
90-
query.Add("ESP");
91-
query.Add("M5");
92-
query.Add("FEATHER");
93-
query.Add("KALUGA");
94-
break;
95-
96-
case SupportedPlatform.stm32:
97-
query.Add("ST");
98-
query.Add("ORGPAL");
99-
query.Add("NETDUINO3");
100-
query.Add("QUAIL");
101-
query.Add("GHI");
102-
query.Add("IngenuityMicro");
103-
query.Add("WeAct");
104-
query.Add("Pyb");
105-
break;
106-
107-
case SupportedPlatform.cc13x2:
108-
query.Add("TI");
109-
break;
110-
}
111-
112-
queryFilter = string.Join(" OR ", query.Select(t => $"name:{t}"));
113-
}
114-
11580
string repoName = communityTargets ? _communityTargetsRepo : preview ? _refTargetsDevRepo : _refTargetsStableRepo;
116-
string requestUri = $"{_cloudsmithPackages}/{repoName}/?query={queryFilter}";
81+
string requestUri = $"{_cloudsmithPackages}/{repoName}/?tag={platform}";
11782
List<CloudSmithPackageDetail> targetPackages = new();
11883

11984
if (verbosity > VerbosityLevel.Normal)

nanoFirmwareFlasher/Options.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,6 @@ public enum SupportedPlatform
324324
{
325325
esp32 = 0,
326326
stm32 = 1,
327-
cc13x2 = 2
327+
ti_simplelink = 2
328328
}
329329
}

nanoFirmwareFlasher/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
256256
)
257257
{
258258
// candidates for TI CC13x2
259-
o.Platform = SupportedPlatform.cc13x2;
259+
o.Platform = SupportedPlatform.ti_simplelink;
260260
}
261261
else
262262
{
@@ -302,7 +302,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
302302
// drivers install
303303
else if (o.TIInstallXdsDrivers)
304304
{
305-
o.Platform = SupportedPlatform.cc13x2;
305+
o.Platform = SupportedPlatform.ti_simplelink;
306306
}
307307
else if (
308308
o.InstallDfuDrivers
@@ -905,7 +905,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
905905

906906
#region TI CC13x2 platform options
907907

908-
if (o.Platform == SupportedPlatform.cc13x2)
908+
if (o.Platform == SupportedPlatform.ti_simplelink)
909909
{
910910
if (o.TIInstallXdsDrivers)
911911
{

0 commit comments

Comments
 (0)