diff options
| -rw-r--r-- | Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java | 3 | ||||
| -rw-r--r-- | Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java | 24 | ||||
| -rw-r--r-- | Software/DB/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/Tango_log.ldf | bin | 8388608 -> 8388608 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs | 14 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Stubs/Stubs/BigData.cs | 47 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs | 15 | ||||
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs | 2 |
9 files changed, 85 insertions, 21 deletions
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java index bbec3501a..7f63bc76f 100644 --- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java +++ b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java @@ -165,9 +165,6 @@ public class TcpTransportAdapter extends TransportAdapterBase private void pullThreadMethod() { - - int counter = 0; - try { diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java index 60efe976a..0d8d36060 100644 --- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java +++ b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java @@ -86,7 +86,8 @@ public class UsbTransportAdapter extends TransportAdapterBase break; } } - } catch (Exception ex) + } + catch (Exception ex) { notifyConnectionFailed(ex); } @@ -124,7 +125,8 @@ public class UsbTransportAdapter extends TransportAdapterBase serial.read(this::onUsbReceiveData); notifyConnectionSuccess(); } - } catch (Exception ex) + } + catch (Exception ex) { notifyConnectionFailed(ex); } @@ -135,7 +137,8 @@ public class UsbTransportAdapter extends TransportAdapterBase if (getAdapterMode() == TransportAdapterMode.NO_HEADER) { onDataAvailable(data); - } else + } + else { if (current_buffer == null) { @@ -147,12 +150,14 @@ public class UsbTransportAdapter extends TransportAdapterBase { current_buffer = null; onDataAvailable(rest); - } else + } + else { current_buffer_bar = rest.length; ByteBuffer.wrap(current_buffer).put(rest); } - } else + } + else { int remaining = current_buffer.length - current_buffer_bar; @@ -160,7 +165,8 @@ public class UsbTransportAdapter extends TransportAdapterBase { current_buffer_bar += data.length; ByteBuffer.wrap(current_buffer).put(data); - } else if (data.length > remaining) + } + else if (data.length > remaining) { byte[] end = Arrays.copyOfRange(data, 0, remaining); ByteBuffer.wrap(current_buffer).put(end); @@ -195,7 +201,8 @@ public class UsbTransportAdapter extends TransportAdapterBase setState(TransportComponentState.Disconnected); x.onComplete(); } - } catch (Exception ex) + } + catch (Exception ex) { x.onError(ex); } @@ -222,7 +229,8 @@ public class UsbTransportAdapter extends TransportAdapterBase hasPermission = true; initConnection(device); } - } else + } + else { notifyConnectionFailed(new IllegalAccessException("Permission denied for device " + device.getDeviceName())); } diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 85651841e..f9471f81a 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 602120293..5464292cb 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index a41501f7f..59de23f82 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -13,6 +13,7 @@ using Tango.PMR.Common; using Tango.PMR.Stubs; using Tango.Core.Commands; using Tango.Transport; +using Tango.PMR.Integration; namespace Tango.Emulations.Emulators { @@ -63,7 +64,7 @@ namespace Tango.Emulations.Emulators var r = MessageFactory.ParseMessageFromContainer<ProgressRequest>(container); - Task.Factory.StartNew(() => + Task.Factory.StartNew(() => { for (int i = 0; i < r.Amount; i++) { @@ -76,10 +77,19 @@ namespace Tango.Emulations.Emulators Transporter.SendResponse(res); } }); + break; + case MessageType.DirectSynchronizationRequest: + Task.Factory.StartNew(() => + { + var request = MessageFactory.ParseMessageFromContainer<DirectSynchronizationRequest>(container); + var response = MessageFactory.CreateTangoMessage<DirectSynchronizationResponse>(container.Token); + response.Message.LocalDB = ByteString.CopyFrom(new byte[1024 * 1024 * 10]); + Transporter.SendResponse(response); + }); break; } - } + } #endregion } diff --git a/Software/Visual_Studio/Tango.Stubs/Stubs/BigData.cs b/Software/Visual_Studio/Tango.Stubs/Stubs/BigData.cs new file mode 100644 index 000000000..a0d84558b --- /dev/null +++ b/Software/Visual_Studio/Tango.Stubs/Stubs/BigData.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core; +using Tango.Logging; +using Tango.PMR; +using Tango.PMR.Integration; +using Tango.PMR.Stubs; +using Tango.Transport; + +namespace Tango.Stubs.Stubs +{ + [Stub("Big Data", "Sends a lot of bytes.", StubDirection.Both)] + public class BigData : StubBase + { + public BigData(ITransporter transporter) : base(transporter) + { + } + + [ParameterItem(Minimum = null, Maximum = null)] + public double NumberA { get; set; } + + [ParameterItem(Minimum = null, Maximum = null)] + public double NumberB { get; set; } + + protected async override Task<string> OnRun(Action<String> multiResponseCallback) + { + try + { + var response = await Transporter.SendRequest<DirectSynchronizationRequest, DirectSynchronizationResponse>( + new DirectSynchronizationRequest() + { + + } + ); + + return response.Message.LocalDB.Length.ToString(); + } + catch (Exception ex) + { + return ex.Message; + } + } + } +} diff --git a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj index 541119a44..c21f1d40a 100644 --- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj +++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj @@ -68,6 +68,7 @@ <Compile Include="IStub.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="StubDirection.cs" /> + <Compile Include="Stubs\BigData.cs" /> <Compile Include="Stubs\Progress.cs" /> <Compile Include="Stubs\Calculate.cs" /> <Compile Include="StubAttribute.cs" /> diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs index a97f55ee6..e433d9498 100644 --- a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs +++ b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs @@ -20,7 +20,7 @@ namespace Tango.Transport.Adapters /// <summary> /// Initializes a new instance of the <see cref="UsbTransportAdapter"/> class. /// </summary> - public UsbTransportAdapter() + public UsbTransportAdapter() : base() { Address = "COM1"; } @@ -29,7 +29,7 @@ namespace Tango.Transport.Adapters /// Initializes a new instance of the <see cref="UsbTransportAdapter"/> class. /// </summary> /// <param name="portName">The COM.</param> - public UsbTransportAdapter(String portName) : base() + public UsbTransportAdapter(String portName) : this() { Address = portName; } @@ -139,7 +139,6 @@ namespace Tango.Transport.Adapters try { if (e.EventType == SerialData.Eof) return; - Thread.Sleep(10); if (AdapterMode == TransportAdapterMode.NO_HEADER) { @@ -152,14 +151,17 @@ namespace Tango.Transport.Adapters if (_serialPort.BytesToRead > 4) { byte[] size = new byte[4]; - _serialPort.Read(size, 0, size.Length); + _serialPort.Read(size, 0, size.Length); int expectedSize = BitConverter.ToInt32(size, 0); byte[] data = new byte[expectedSize]; + int read = 0; - while (_serialPort.BytesToRead < expectedSize) + while (read < expectedSize) { - Thread.Sleep(10); + read += _serialPort.Read(data, read, Math.Min(_serialPort.BytesToRead, expectedSize - read)); + + Thread.Sleep(2); if (State != TransportComponentState.Connected) { @@ -167,7 +169,6 @@ namespace Tango.Transport.Adapters } } - _serialPort.Read(data, 0, data.Length); OnDataAvailable(data); } } diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs index fc953a2fa..306da384f 100644 --- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs +++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs @@ -21,7 +21,7 @@ namespace Tango.MobileEM.UI protected override void OnStartup(StartupEventArgs e) { base.OnStartup(e); - Emulator = new MobileEmulator(new ProtoTransporter(new TcpTransportAdapter("127.0.0.1",9999))); + Emulator = new MobileEmulator(new ProtoTransporter(new UsbTransportAdapter("COM2"))); } } } |