Skip to content

Ensure WaitUntilDone is called before OnCompleted #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glopesdev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure WaitUntilDone is called before OnCompleted #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Bonsai.DAQmx/AnalogOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,19 @@ public override IObservable<Mat> Process(IObservable<Mat> source)
task.Control(TaskAction.Verify);
task.Timing.ConfigureSampleClock(SignalSource, SampleRate, ActiveEdge, SampleMode, BufferSize);
var analogOutWriter = new AnalogMultiChannelWriter(task.Stream);
void EnsureTaskIsDone()
{
if (task.Timing.SampleQuantityMode == SampleQuantityMode.FiniteSamples)
{
task.WaitUntilDone();
}
}

return Observable.Using(
() => Disposable.Create(() =>
{
if (task.Timing.SampleQuantityMode == SampleQuantityMode.FiniteSamples)
{
task.WaitUntilDone();
}
if (!task.IsDone)
EnsureTaskIsDone();
task.Stop();
task.Dispose();
}),
Expand All @@ -157,7 +163,7 @@ public override IObservable<Mat> Process(IObservable<Mat> source)
analogOutWriter.WriteMultiSample(autoStart: true, data);
}
finally { dataHandle.Free(); }
}));
}, EnsureTaskIsDone));
});
}
}
Expand Down
21 changes: 14 additions & 7 deletions src/Bonsai.DAQmx/DigitalOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,16 @@ IObservable<TSource> ProcessSingleSample<TSource>(IObservable<TSource> source, A
return Observable.Using(
() => Disposable.Create(() =>
{
task.WaitUntilDone();
if (!task.IsDone)
task.WaitUntilDone();
task.Stop();
task.Dispose();
}),
resource => source.Do(input =>
{
try { onNext(digitalOutWriter, input); }
catch { task.Stop(); throw; }
}));
}, task.WaitUntilDone));
});
}

Expand Down Expand Up @@ -271,21 +272,27 @@ IObservable<TSource> ProcessMultiSample<TSource>(IObservable<TSource> source, Ac
var task = CreateTask();
task.Timing.ConfigureSampleClock(SignalSource, SampleRate, ActiveEdge, SampleMode, BufferSize);
var digitalOutWriter = new DigitalMultiChannelWriter(task.Stream);
void EnsureTaskIsDone()
{
if (task.Timing.SampleQuantityMode == SampleQuantityMode.FiniteSamples)
{
task.WaitUntilDone();
}
}

return Observable.Using(
() => Disposable.Create(() =>
{
if (task.Timing.SampleQuantityMode == SampleQuantityMode.FiniteSamples)
{
task.WaitUntilDone();
}
if (!task.IsDone)
EnsureTaskIsDone();
task.Stop();
task.Dispose();
}),
resource => source.Do(input =>
{
try { onNext(digitalOutWriter, input); }
catch { task.Stop(); throw; }
}));
}, EnsureTaskIsDone));
});
}

Expand Down