Skip to content

Commit

Permalink
Updated to fx3 API 2.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ajn96 committed Apr 1, 2020
1 parent 6467160 commit 1096ee3
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 4 deletions.
Binary file modified Resources/FX3Api.dll
Binary file not shown.
10 changes: 8 additions & 2 deletions Resources/FX3Api.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Resources/FX3USB.dll
Binary file not shown.
Binary file modified Resources/StreamDataLogger.dll
Binary file not shown.
Binary file modified src/FX3_Firmware.img
Binary file not shown.
2 changes: 1 addition & 1 deletion src/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("2.6.3.0")>
<Assembly: AssemblyFileVersion("2.6.4.0")>
4 changes: 3 additions & 1 deletion src/TopGUI.vb
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Public Class TopGUI
RegMapPath = My.Settings.SelectedRegMap
End If

'Set FX3 connection (defaults to ADcmXL)
'Set FX3 connection (defaults to IMU)
FX3 = New FX3Connection(firmwarePath, blinkFirmwarePath, flashProgrammerPath, FX3Api.DeviceType.IMU)

'Set bulk reg list
Expand Down Expand Up @@ -330,12 +330,14 @@ Public Class TopGUI
End Sub

Private Sub btn_plotData_Click(sender As Object, e As EventArgs) Handles btn_plotData.Click

Dim subGUI As New DataPlotGUI()
subGUI.SetTopGUI(Me)
subGUI.Show()

'disable button
btn_plotData.Enabled = False

End Sub

#End Region
Expand Down

0 comments on commit 1096ee3

Please sign in to comment.