diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-10-04 14:56:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-10-04 14:56:36 +0300 |
| commit | 632378c43fea445b5ce0808eabc8d02a97a7a387 (patch) | |
| tree | 0f71a85552f944875da567d0dc391ed981138305 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views | |
| parent | 5461fa6ed66e087ea3cc582af39a733e1a1202c2 (diff) | |
| parent | 141b450771f7e98b93eca9492e0cbe800da13e1f (diff) | |
| download | Tango-632378c43fea445b5ce0808eabc8d02a97a7a387.tar.gz Tango-632378c43fea445b5ce0808eabc8d02a97a7a387.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml index 26790c67d..4e3de9e60 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml @@ -110,6 +110,12 @@ <TextBlock Text="{Binding Machine.Organization.Name}" /> <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" /> <TextBlock Text="{Binding DeviceInformation.Version}" /> + <TextBlock FontWeight="SemiBold" Text="FPGA Version:" /> + <TextBlock> + <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> • + <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> • + <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run> + </TextBlock> <TextBlock FontWeight="SemiBold" Text="COM Port:" /> <TextBlock Text="{Binding ComPort}" /> <TextBlock FontWeight="SemiBold" Text="Device:" /> @@ -147,6 +153,14 @@ <TextBlock Text="{Binding Machine.Name}" /> <TextBlock FontWeight="SemiBold" Text="Organization:" /> <TextBlock Text="{Binding Machine.Organization.Name}" /> + <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" /> + <TextBlock Text="{Binding DeviceInformation.Version}" /> + <TextBlock FontWeight="SemiBold" Text="FPGA Version:" /> + <TextBlock> + <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> • + <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> • + <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run> + </TextBlock> <TextBlock FontWeight="SemiBold" Text="Total Bytes Sent:" /> <TextBlock Text="{Binding Adapter.TotalBytesSent,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}" /> <TextBlock FontWeight="SemiBold" Text="Total Bytes Received:" /> |