Skip to content

Commit

Permalink
Implement More Commands
Browse files Browse the repository at this point in the history
  • Loading branch information
@gus33000
gus33000 committed Nov 17, 2024
1 parent dd381e2 commit 2a9824d
Show file tree
Hide file tree
Showing 4 changed files with 287 additions and 8 deletions.
22 changes: 18 additions & 4 deletions UFPTool/FlashDevice.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Img2Ffu.Reader.Data;
using MadWizard.WinUSBNet;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using UnifiedFlashingPlatform;
Expand Down Expand Up @@ -108,8 +109,6 @@ internal static void Execute(string[] args)
DevicePath = details[0].DevicePath;
}

Console.WriteLine($"Flashing {Path.GetFileName(FFUPath)} to device");

FlashFlags flashFlags = FlashFlags.Normal;

if (VerifyWrite)
Expand Down Expand Up @@ -148,12 +147,19 @@ internal static void Execute(string[] args)

int previousPercentage = -1;

long length = FFUStream.Length;

Stopwatch stopwatch = new();
stopwatch.Start();

Console.WriteLine($"Flashing {DevicePath}");

ufp.FlashFFU(FFUStream, new ProgressUpdater(totalChunkCount, (int percentage, TimeSpan? eta) =>
{
string NewText = null;
if (percentage != null)
{
NewText = $"Progress: {percentage}%";
NewText = $"\rFlash: {percentage:d}% completed...";
}

if (eta != null)
Expand All @@ -173,9 +179,17 @@ internal static void Execute(string[] args)
if (NewText != null && previousPercentage != percentage)
{
previousPercentage = percentage;
Console.WriteLine(NewText);
Console.Write(NewText);
}
}), ResetAfterwards: Reboot, Options: (byte)flashFlags);

stopwatch.Stop();

TimeSpan elapsed = stopwatch.Elapsed;
double num = length / 1048576L / elapsed.TotalSeconds;

Console.WriteLine();
Console.WriteLine($"Device flashed successfully at {num:F3} MB/s in {elapsed.TotalSeconds:F3} seconds");
}

static void PrintFlashDeviceHelp()
Expand Down
8 changes: 4 additions & 4 deletions UFPTool/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ static void ParseArgs(string[] args)
Environment.Exit(1);
break;
case "rambootdevice":
Console.WriteLine("Not yet implemented.");
Environment.Exit(1);
RambootDevice.Execute(args);
Environment.Exit(0);
break;
case "rebootdevice":
RebootDevice.Execute(args);
Environment.Exit(0);
break;
case "relockdevice":
Console.WriteLine("Not yet implemented.");
Environment.Exit(1);
RelockDevice.Execute(args);
Environment.Exit(0);
break;
case "setuefivariable":
Console.WriteLine("Not yet implemented.");
Expand Down
184 changes: 184 additions & 0 deletions UFPTool/RambootDevice.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
using Img2Ffu.Reader.Data;
using MadWizard.WinUSBNet;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnifiedFlashingPlatform;

namespace UFPTool
{
internal static class RambootDevice
{
internal static void Execute(string[] args)
{
if (args.Contains("-?"))
{
//PrintRambootDeviceHelp();
Environment.Exit(0);
}

if (!args.ToList().Any(x => x.Equals("-Path", StringComparison.InvariantCultureIgnoreCase)))
{
Console.WriteLine("Insufficient number of arguments");
Console.WriteLine();
//PrintRambootDeviceHelp();
Environment.Exit(1);
}

string FFUPath = "";
string DevicePath = "";
bool VerifyWrite = false;
bool SkipPlatformIDCheck = false;
bool SkipSignatureCheck = false;
bool SkipHash = false;

for (int i = 1; i < args.Length; i++)
{
string arg = args[i];
if (arg.Equals("-Path", StringComparison.InvariantCultureIgnoreCase))
{
if (i + 1 >= args.Length)
{
Console.WriteLine("Insufficient number of arguments");
Console.WriteLine();
//PrintRambootDeviceHelp();
Environment.Exit(1);
}

i++;
FFUPath = args[i];
}
else if (arg.Equals("-DevicePath", StringComparison.InvariantCultureIgnoreCase))
{
if (i + 1 >= args.Length)
{
Console.WriteLine("Insufficient number of arguments");
Console.WriteLine();
//PrintRambootDeviceHelp();
Environment.Exit(1);
}

i++;
DevicePath = args[i];
}
else if (arg.Equals("-VerifyWrite", StringComparison.InvariantCultureIgnoreCase))
{
VerifyWrite = true;
}
else
{
Console.WriteLine($"Unknown argument: {arg}");
Console.WriteLine();
//PrintRambootDeviceHelp();
Environment.Exit(1);
}
}

if (string.IsNullOrEmpty(DevicePath))
{
USBDeviceInfo[] details = USBDevice.GetDevices("{9E3BD5F7-9690-4FCC-8810-3E2650CD6ECC}");
if (details.Length == 0)
{
Console.WriteLine("No UFP devices found");
Environment.Exit(1);
}

if (details.Length > 1)
{
Console.WriteLine("Multiple UFP devices found. Please specify the device path");
Console.WriteLine();
Console.WriteLine("Available devices:");
for (int i = 0; i < details.Length; i++)
{
Console.WriteLine($" {i + 1}. {details[i].DevicePath} {details[i].DeviceDescription} ({details[i].Manufacturer})");
}
Environment.Exit(1);
}

DevicePath = details[0].DevicePath;
}

FlashFlags flashFlags = FlashFlags.FlashToRAM;

if (VerifyWrite)
{
flashFlags |= FlashFlags.VerifyWrite;
}

if (SkipPlatformIDCheck)
{
flashFlags |= FlashFlags.SkipPlatformIDCheck;
}

if (SkipSignatureCheck)
{
flashFlags |= FlashFlags.SkipSignatureCheck;
}

if (SkipHash)
{
flashFlags |= FlashFlags.SkipHash;
}

using FileStream FFUStream = new(FFUPath, FileMode.Open, FileAccess.Read, FileShare.Read);
SignedImage signedImage = new(FFUStream);
int chunkSize = signedImage.ChunkSize;
ulong totalChunkCount = (ulong)FFUStream.Length / (ulong)chunkSize;

FFUStream.Seek(0, SeekOrigin.Begin);

using UnifiedFlashingPlatformTransport ufp = new(DevicePath);

int previousPercentage = -1;

long length = FFUStream.Length;

Stopwatch stopwatch = new();
stopwatch.Start();

Console.WriteLine($"Flashing {DevicePath}");

ufp.FlashFFU(FFUStream, new ProgressUpdater(totalChunkCount, (int percentage, TimeSpan? eta) =>
{
string NewText = null;
if (percentage != null)
{
NewText = $"\rFlash: {percentage:d}% completed...";
}

if (eta != null)
{
if (NewText == null)
{
NewText = "";
}
else
{
NewText += " - ";
}

NewText += $"Estimated time remaining: {eta:h\\:mm\\:ss}";
}

if (NewText != null && previousPercentage != percentage)
{
previousPercentage = percentage;
Console.Write(NewText);
}
}), ResetAfterwards: false, Options: (byte)flashFlags);

stopwatch.Stop();

TimeSpan elapsed = stopwatch.Elapsed;
double num = length / 1048576L / elapsed.TotalSeconds;

Console.WriteLine();
Console.WriteLine($"Device flashed successfully at {num:F3} MB/s in {elapsed.TotalSeconds:F3} seconds");
Console.WriteLine("Device is RAM booting");
}
}
}
81 changes: 81 additions & 0 deletions UFPTool/RelockDevice.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
using MadWizard.WinUSBNet;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnifiedFlashingPlatform;

namespace UFPTool
{
internal static class RelockDevice
{
internal static void Execute(string[] args)
{
if (args.Contains("-?"))
{
//PrintRelockDeviceHelp();
Environment.Exit(0);
}

string DevicePath = "";

for (int i = 1; i < args.Length; i++)
{
string arg = args[i];
if (arg.Equals("-DevicePath", StringComparison.InvariantCultureIgnoreCase))
{
if (i + 1 >= args.Length)
{
Console.WriteLine("Insufficient number of arguments");
Console.WriteLine();
//PrintRelockDeviceHelp();
Environment.Exit(1);
}

i++;
DevicePath = args[i];
}
else
{
Console.WriteLine($"Unknown argument: {arg}");
Console.WriteLine();
//PrintRelockDeviceHelp();
Environment.Exit(1);
}
}

if (string.IsNullOrEmpty(DevicePath))
{
USBDeviceInfo[] details = USBDevice.GetDevices("{9E3BD5F7-9690-4FCC-8810-3E2650CD6ECC}");
if (details.Length == 0)
{
Console.WriteLine("No UFP devices found");
Environment.Exit(1);
}

if (details.Length > 1)
{
Console.WriteLine("Multiple UFP devices found. Please specify the device path");
Console.WriteLine();
Console.WriteLine("Available devices:");
for (int i = 0; i < details.Length; i++)
{
Console.WriteLine($"[Device {i}]");
Console.WriteLine($"Device Path: {details[i].DevicePath}");
Console.WriteLine($"Can Flash: True");
Console.WriteLine();
}
Environment.Exit(1);
}

DevicePath = details[0].DevicePath;
}

using UnifiedFlashingPlatformTransport ufp = new(DevicePath);
ufp.Relock();

Console.WriteLine("Device relocked successfully");
}
}
}

0 comments on commit 2a9824d

Please sign in to comment.