Skip to content

Commit 6332868

Browse files
authored
Fix checks for ESP32 26MHz (#132)
1 parent 11b00e5 commit 6332868

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

nanoFirmwareFlasher/Esp32Operations.cs

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -132,35 +132,21 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
132132
revisionSuffix = "REV3";
133133
}
134134

135+
if (esp32Device.PSRamAvailable == PSRamAvailability.Yes)
136+
{
137+
psRamSegment = "_PSRAM";
138+
}
139+
135140
if (esp32Device.Crystal.StartsWith("26"))
136141
{
137142
// this one requires the 26MHz version
138-
// and we only have a PSRAM version for this
139-
140-
// check that
141-
if (esp32Device.PSRamAvailable != PSRamAvailability.Yes)
142-
{
143-
Console.ForegroundColor = ConsoleColor.Red;
144-
145-
Console.WriteLine("");
146-
Console.WriteLine("The connected ESP32 device has a 26MHz crystal and no PSRAM.");
147-
Console.WriteLine("We currently don't have a firmware image for that combination. Please report this to the project team.");
148-
Console.WriteLine("");
149-
150-
Console.ForegroundColor = ConsoleColor.White;
151-
152-
return ExitCodes.E9000;
153-
}
154-
155-
// OK to force rev0 even if that's higher
156-
revisionSuffix = "REV0";
157-
158143
otherSegment = "_XTAL26";
159-
}
160144

161-
if (esp32Device.PSRamAvailable == PSRamAvailability.Yes)
162-
{
145+
// and we only have a version with PSRAM support, so force that
163146
psRamSegment = "_PSRAM";
147+
148+
// also need to force rev0 even if that's higher
149+
revisionSuffix = "REV0";
164150
}
165151

166152
// compose target name

0 commit comments

Comments
 (0)