Skip to content

fix: send decimal channel mask for SD card logging instead of binary #446

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

Merged
tylerkron merged 3 commits into from
Apr 4, 2026
Merged

fix: send decimal channel mask for SD card logging instead of binary #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed9b320
fix: send decimal channel mask for SD card logging instead of binary
tylerkron Mar 29, 2026
4d66b31
fix: use InvariantCulture for SD card channel mask string
tylerkron Mar 30, 2026
d96f287
Merge branch 'main' into fix/sd-card-channel-mask-binary-to-decimal
tylerkron Apr 4, 2026
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
4 changes: 2 additions & 2 deletions Daqifi.Desktop.Test/Device/AbstractStreamingDeviceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,8 @@ public void StartSdCardLogging_UsesCombinedAnalogMaskAndConfiguresDigitalPortsOn
"Core handles this via the channelMask parameter.");
CollectionAssert.Contains(
device.SentCommands,
$"core:{ScpiMessageProducer.EnableAdcChannels("10101").Data}",
"Core should receive a single combined binary analog mask for the active SD logging channels.");
$"core:{ScpiMessageProducer.EnableAdcChannels("21").Data}",
"Core should receive a decimal channel mask for the active SD logging channels.");
}

[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop/Device/AbstractStreamingDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ public void StartSdCardLogging()

// The Core package resumes StartSdCardLoggingAsync continuations on the caller's
// synchronization context. Running it on the thread pool prevents UI deadlocks.
var channelMaskString = Convert.ToString((long)analogChannelMask, 2);
var channelMaskString = analogChannelMask.ToString(CultureInfo.InvariantCulture);
Task.Run(() => coreDevice.StartSdCardLoggingAsync(channelMask: channelMaskString, format: SdCardLogFormat)).GetAwaiter().GetResult();

IsLoggingToSdCard = coreDevice.IsLoggingToSdCard;
Expand Down
Loading