aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2021-08-10 13:05:25 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2021-08-10 13:05:25 +0300
commit320680598795736dd56423c3b32e55149785cba2 (patch)
tree4d585d4908ed5ecf9f02beaa9e95b30d3169a007
parentdb1f551b162d893441f6b241c0bea4b4bd70a6fc (diff)
downloadTango-320680598795736dd56423c3b32e55149785cba2.tar.gz
Tango-320680598795736dd56423c3b32e55149785cba2.zip
Fixed device information assignment before connection.
-rw-r--r--Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs1
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs4
2 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 9d486c8e0..22fa062a7 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -1230,6 +1230,7 @@ namespace Tango.Emulations.Emulators
FPGA2Version = "2.2",
FPGA3Version = "3.3",
DiagnosticsInterval = (uint)DIAGNOSTICS_INTERVAL,
+ HeadType = HeadType.Arc,
},
IsAfterReset = _isAfterReset,
}, request.Container.Token, new TransportResponseConfig() { ErrorCode = request.Message.Password == "1234" ? ErrorCode.None : ErrorCode.UnauthorizedConnection });
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index d2619ab85..a1d370109 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1468,13 +1468,13 @@ namespace Tango.Integration.Operation
_isPowerDownRequestInProgress = false;
+ DeviceInformation = response.Message.DeviceInformation;
+
if (Status != MachineStatuses.Upgrading)
{
UpdateStatus(MachineStatuses.ReadyToDye);
}
- DeviceInformation = response.Message.DeviceInformation;
-
_diagnosticsSent = false;
_eventsSent = false;
_debugSent = false;