diff --git a/Laerdal.Dfu/Laerdal.Dfu.csproj b/Laerdal.Dfu/Laerdal.Dfu.csproj index 6a8becf..def5edf 100644 --- a/Laerdal.Dfu/Laerdal.Dfu.csproj +++ b/Laerdal.Dfu/Laerdal.Dfu.csproj @@ -44,27 +44,27 @@ 14.2 - 17.0 - 13.1 - 13.1 + 17.0 + 13.1 + 13.1 - + - - + + - - + + - - + + diff --git a/Laerdal.Dfu/Laerdal.targets b/Laerdal.Dfu/Laerdal.targets index 72ccb0c..ef8911b 100644 --- a/Laerdal.Dfu/Laerdal.targets +++ b/Laerdal.Dfu/Laerdal.targets @@ -76,16 +76,23 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Laerdal.Dfu/Platforms.NetX/DfuInstallation.cs b/Laerdal.Dfu/Platforms.NetX/DfuInstallation.cs index 63f107e..c1be179 100644 --- a/Laerdal.Dfu/Platforms.NetX/DfuInstallation.cs +++ b/Laerdal.Dfu/Platforms.NetX/DfuInstallation.cs @@ -8,30 +8,37 @@ public partial class DfuInstallation { public DfuInstallation(string deviceId, string fileUrl) : base(deviceId, fileUrl) { + throw new NotImplementedException(); } public DfuInstallation() : base() { + throw new NotImplementedException(); } - + public override void Start() { + throw new NotImplementedException(); } public override void Pause() { + throw new NotImplementedException(); } public override void Resume() { + throw new NotImplementedException(); } public override void Abort() { + throw new NotImplementedException(); } protected override void Dispose(bool disposing) { + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/Laerdal.Dfu/Platforms.iOSandMacCatalyst/DfuInstallation.cs b/Laerdal.Dfu/Platforms.iOSandMacCatalyst/DfuInstallation.cs index f81820d..56518d1 100644 --- a/Laerdal.Dfu/Platforms.iOSandMacCatalyst/DfuInstallation.cs +++ b/Laerdal.Dfu/Platforms.iOSandMacCatalyst/DfuInstallation.cs @@ -1,7 +1,5 @@ using CoreFoundation; - using Foundation; - using Laerdal.Dfu.Specific; namespace Laerdal.Dfu @@ -14,7 +12,7 @@ public partial class DfuInstallation public static Func LoggerQueue { get; set; } = () => DispatchQueue.GetGlobalQueue(DispatchQueuePriority.Default); public Func CustomDfuServiceInitiatorConfiguration { get; set; } = (dfuInitiator) => dfuInitiator; - + private void SetInitiator() { DfuProgressDelegate = new DfuProgressDelegate(this); @@ -22,12 +20,14 @@ private void SetInitiator() DfuPeripheralSelectorDelegate = new DfuPeripheralSelectorDelegate(this); Firmware = new Laerdal.Dfu.Bindings.iOS.DFUFirmware(new NSUrl(FileUrl, false), out NSError error); - - Initiator = new Laerdal.Dfu.Bindings.iOS.DFUServiceInitiator(Queue.Invoke(), - DelegateQueue.Invoke(), - ProgressQueue.Invoke(), - LoggerQueue.Invoke(), - null) + + Initiator = new Laerdal.Dfu.Bindings.iOS.DFUServiceInitiator( + queue: Queue.Invoke(), + loggerQueue: LoggerQueue.Invoke(), + delegateQueue: DelegateQueue.Invoke(), + progressQueue: ProgressQueue.Invoke(), + centralManagerOptions: null + ) { Logger = new DfuLogger(), WeakProgressDelegate = DfuProgressDelegate, @@ -38,7 +38,7 @@ private void SetInitiator() // PacketsReceiptNotifications if (PacketReceiptNotificationParameter.HasValue) Initiator.PacketReceiptNotificationParameter = PacketReceiptNotificationParameter.Value; - + // DataObjectPreparationDelay if (DataObjectPreparationDelay.HasValue) Initiator.DataObjectPreparationDelay = DataObjectPreparationDelay.Value; @@ -50,15 +50,15 @@ private void SetInitiator() // AlternativeAdvertisingName Initiator.AlternativeAdvertisingNameEnabled = !string.IsNullOrEmpty(AlternativeAdvertisingName); Initiator.AlternativeAdvertisingName = AlternativeAdvertisingName; - + // ForceScanningForNewAddressInLegacyDfu if (ForceScanningForNewAddressInLegacyDfu.HasValue) Initiator.ForceScanningForNewAddressInLegacyDfu = ForceScanningForNewAddressInLegacyDfu.Value; - + // EnableUnsafeExperimentalButtonlessServiceInSecureDfu if (EnableUnsafeExperimentalButtonlessServiceInSecureDfu.HasValue) Initiator.ForceScanningForNewAddressInLegacyDfu = EnableUnsafeExperimentalButtonlessServiceInSecureDfu.Value; - + // ForceDfu if (ForceDfu.HasValue) Initiator.ForceDfu = ForceDfu.Value; @@ -72,18 +72,18 @@ private void SetInitiator() // public DFUUuidHelper UuidHelper {get; set;} } - public Laerdal.Dfu.Bindings.iOS.DFUServiceInitiator Initiator { get; private set; } + public Laerdal.Dfu.Bindings.iOS.DFUServiceInitiator Initiator { get; private set; } public Laerdal.Dfu.Bindings.iOS.DFUServiceController Controller { get; private set; } - public Laerdal.Dfu.Bindings.iOS.DFUFirmware Firmware { get; private set;} - - private DfuProgressDelegate DfuProgressDelegate { get; set;} + public Laerdal.Dfu.Bindings.iOS.DFUFirmware Firmware { get; private set; } + + private DfuProgressDelegate DfuProgressDelegate { get; set; } - private DfuServiceDelegate DfuServiceDelegate { get; set;} + private DfuServiceDelegate DfuServiceDelegate { get; set; } + + private DfuPeripheralSelectorDelegate DfuPeripheralSelectorDelegate { get; set; } - private DfuPeripheralSelectorDelegate DfuPeripheralSelectorDelegate { get; set;} - public DfuInstallation(string deviceId, string fileUrl) : base(deviceId, fileUrl) { } @@ -98,6 +98,7 @@ public override void Start() { throw new System.Exception("Controller is already set."); } + SetInitiator(); Controller = Initiator.StartWithTargetWithIdentifier(new NSUuid(DeviceId)); }