diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs')
| -rw-r--r-- | Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index ab007329f..9d486c8e0 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -2147,7 +2147,7 @@ namespace Tango.Emulations.Emulators { DataType = DataType.Proto, BytesValue = new CalculateRequest() { A = 10, B = 15 }.ToByteString(), - ProtoType = MessageType.CalculateRequest, + ProtoType = DataStoreMessageType.CalculateRequest, } }); @@ -2214,7 +2214,7 @@ namespace Tango.Emulations.Emulators { DataType = DataType.Proto, BytesValue = (new CalculateRequest() { A = 10, B = 15 }).ToByteString(), - ProtoType = MessageType.CalculateRequest, + ProtoType = DataStoreMessageType.CalculateRequest, }, }); @@ -2249,7 +2249,25 @@ namespace Tango.Emulations.Emulators try { var response = await Transporter.SendRequest<GetDataStoreItemRequest, GetDataStoreItemResponse>(request); - LogManager.Log($"Received GetDataStoreItemResponse:\n{response.Message.ToJsonString()}"); + + String protoJson = String.Empty; + + try + { + if (response.Message.Item.DataType == DataType.Proto) + { + var type = MessageFactory.GetDataStorePMRTypeFromDataStoreMessageType(response.Message.Item.ProtoType); + var instance = MessageFactory.ParseProtoMessage(response.Message.Item.BytesValue.ToByteArray(), type); + protoJson = instance.ToJsonString(); + } + } + catch (Exception ex) + { + protoJson = ex.Message; + } + + LogManager.Log($"Received GetDataStoreItemResponse:\n{response.Message.ToJsonString()}\nProtobuf Message:\n{protoJson}"); + } catch (Exception ex) { |