Skip to content

fix: fixes behavior with DIO #143

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 2 commits into from
Apr 11, 2025
Merged

fix: fixes behavior with DIO #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c8a92
Fixed the on/off value for digital output. They were flipped.
tylerkron Apr 11, 2025
699ffea
Fixed issue with DIO when using mixed inputs and outputs. The app mad…
tylerkron Apr 11, 2025
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
9 changes: 6 additions & 3 deletions Daqifi.Desktop/Device/AbstractStreamingDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ private void HandleStreamingMessageReceived(object sender, MessageEventArgs e)
}

// Loop through channels for this device
foreach (var channel in DataChannels.Where(c => c.IsActive && c.Direction == ChannelDirection.Input))
foreach (var channel in DataChannels.Where(c => c.IsActive))
{
try
{
Expand All @@ -216,8 +216,11 @@ private void HandleStreamingMessageReceived(object sender, MessageEventArgs e)
bit = (digitalData2 & (1 << digitalCount % 8)) != 0;
}

// Assign the sample for the digital channel
channel.ActiveSample = new DataSample(this, channel, messageTimestamp, Convert.ToInt32(bit));
// Assign the sample for the digital input channel
if (channel.Direction == ChannelDirection.Input)
{
channel.ActiveSample = new DataSample(this, channel, messageTimestamp, Convert.ToInt32(bit));
}
digitalCount++;
}
else if (channel.Type == ChannelType.Analog && hasAnalogData)
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop/View/Flyouts/ChannelsFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Controls:ToggleSwitch Grid.Row="0" IsOn="{Binding SelectedChannel.IsDigitalOn, Mode=TwoWay}" OffContent="On" OnContent="Off" HorizontalAlignment="Center"/>
<Controls:ToggleSwitch Grid.Row="0" IsOn="{Binding SelectedChannel.IsDigitalOn, Mode=TwoWay}" OffContent="Off" OnContent="On" HorizontalAlignment="Center"/>
</Grid>
</GroupBox>
</Grid>
Expand Down