diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-08-19 01:45:02 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-08-19 01:45:02 +0300 |
| commit | 4e216a0ca8ad3608b845fa445b73034e1a67b8af (patch) | |
| tree | 67e0ea698cfe5a8320aa81d8c13579e8ae6a6860 /Software/Visual_Studio/Tango.PMR | |
| parent | f4c418cced4c6fb25ec5d4cb2bcb4ce0f766efd0 (diff) | |
| download | Tango-4e216a0ca8ad3608b845fa445b73034e1a67b8af.tar.gz Tango-4e216a0ca8ad3608b845fa445b73034e1a67b8af.zip | |
DB: Changed TechMonitors HeadZone5_6HeaterCurrent => HeadZone56HeaterCurrent
Working on insights and insights annotations.
Added insights events.
Added insights settings to PPC advanced settings.
Added compression support for transport adapters.
Implemented compression support on TCP/SignalR/WebRTC.
Added Compression flag to ExternalBridge discovery packet.
Added compression setting to PPC advanced settings.
Refactored transport layer to use Bson instead of Json for Generic Messages.
Added all SciChart referenced assemblies.
Registered EF Extensions license for FSE.
Added support for FSE PushTask notification cancel button.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR')
3 files changed, 79 insertions, 50 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs index 1dbec9290..cc3115da1 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v", - "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIvAVChNEaWFnbm9zdGljc01vbml0", + "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIu8VChNEaWFnbm9zdGljc01vbml0", "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD", "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl", "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY", @@ -65,28 +65,28 @@ namespace Tango.PMR.Diagnostics { "GDkgAygBEh4KFkhlYWRab25lMUhlYXRlckN1cnJlbnQYOiADKAESHgoWSGVh", "ZFpvbmUySGVhdGVyQ3VycmVudBg7IAMoARIeChZIZWFkWm9uZTNIZWF0ZXJD", "dXJyZW50GDwgAygBEh4KFkhlYWRab25lNEhlYXRlckN1cnJlbnQYPSADKAES", - "IAoYSGVhZFpvbmU1XzZIZWF0ZXJDdXJyZW50GD4gAygBEhsKE01peGVyMUhl", - "YXRlckN1cnJlbnQYPyADKAESPgoSRGlzcGVuc2Vyc0lua0xldmVsGEAgAygL", - "MiIuVGFuZ28uUE1SLkRpYWdub3N0aWNzLkRvdWJsZUFycmF5EjwKEE1pZFRh", - "bmtzSW5rTGV2ZWwYQSADKAsyIi5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91", - "YmxlQXJyYXkSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGEIgAygBEh4KFkhlYWRa", - "b25lN0hlYXRlckN1cnJlbnQYQyADKAESHAoUSGVhZFpvbmU3VGVtcGVyYXR1", - "cmUYRCADKAESHgoWSGVhZFpvbmU4SGVhdGVyQ3VycmVudBhFIAMoARIcChRI", - "ZWFkWm9uZThUZW1wZXJhdHVyZRhGIAMoARIeChZIZWFkWm9uZTlIZWF0ZXJD", - "dXJyZW50GEcgAygBEhwKFEhlYWRab25lOVRlbXBlcmF0dXJlGEggAygBEh8K", - "F0hlYWRab25lMTBIZWF0ZXJDdXJyZW50GEkgAygBEh0KFUhlYWRab25lMTBU", - "ZW1wZXJhdHVyZRhKIAMoARIfChdIZWFkWm9uZTExSGVhdGVyQ3VycmVudBhL", - "IAMoARIdChVIZWFkWm9uZTExVGVtcGVyYXR1cmUYTCADKAESHwoXSGVhZFpv", - "bmUxMkhlYXRlckN1cnJlbnQYTSADKAESHQoVSGVhZFpvbmUxMlRlbXBlcmF0", - "dXJlGE4gAygBEhoKEkhlYWRCbG93ZXJWb2x0YWdlMRhPIAMoARIaChJIZWFk", - "Qmxvd2VyVm9sdGFnZTIYUCADKAESHwoXSGVhZENvdmVySGVhdGVyMUN1cnJl", - "bnQYUSADKAESIwobSGVhZENvdmVySGVhdGVyMVRlbXBlcmF0dXJlGFIgAygB", - "Eh8KF0hlYWRDb3ZlckhlYXRlcjJDdXJyZW50GFMgAygBEiMKG0hlYWRDb3Zl", - "ckhlYXRlcjJUZW1wZXJhdHVyZRhUIAMoARIZChFXSFNCbG93ZXIyVm9sdGFn", - "ZRhVIAMoARIRCglHYXNTZW5zb3IYViADKAESFwoPSW5jb21pbmdWb2x0YWdl", - "GFcgAygBEhIKCldhc3RlTGV2ZWwYWCADKAESGgoSSGVhZEJsb3dlcjFBaXJG", - "bG93GFkgAygBEhoKEkhlYWRCbG93ZXIyQWlyRmxvdxhaIAMoAUIhCh9jb20u", - "dHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM=")); + "HwoXSGVhZFpvbmU1NkhlYXRlckN1cnJlbnQYPiADKAESGwoTTWl4ZXIxSGVh", + "dGVyQ3VycmVudBg/IAMoARI+ChJEaXNwZW5zZXJzSW5rTGV2ZWwYQCADKAsy", + "Ii5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSPAoQTWlkVGFu", + "a3NJbmtMZXZlbBhBIAMoCzIiLlRhbmdvLlBNUi5EaWFnbm9zdGljcy5Eb3Vi", + "bGVBcnJheRIaChJPdmVyYWxsVGVtcGVyYXR1cmUYQiADKAESHgoWSGVhZFpv", + "bmU3SGVhdGVyQ3VycmVudBhDIAMoARIcChRIZWFkWm9uZTdUZW1wZXJhdHVy", + "ZRhEIAMoARIeChZIZWFkWm9uZThIZWF0ZXJDdXJyZW50GEUgAygBEhwKFEhl", + "YWRab25lOFRlbXBlcmF0dXJlGEYgAygBEh4KFkhlYWRab25lOUhlYXRlckN1", + "cnJlbnQYRyADKAESHAoUSGVhZFpvbmU5VGVtcGVyYXR1cmUYSCADKAESHwoX", + "SGVhZFpvbmUxMEhlYXRlckN1cnJlbnQYSSADKAESHQoVSGVhZFpvbmUxMFRl", + "bXBlcmF0dXJlGEogAygBEh8KF0hlYWRab25lMTFIZWF0ZXJDdXJyZW50GEsg", + "AygBEh0KFUhlYWRab25lMTFUZW1wZXJhdHVyZRhMIAMoARIfChdIZWFkWm9u", + "ZTEySGVhdGVyQ3VycmVudBhNIAMoARIdChVIZWFkWm9uZTEyVGVtcGVyYXR1", + "cmUYTiADKAESGgoSSGVhZEJsb3dlclZvbHRhZ2UxGE8gAygBEhoKEkhlYWRC", + "bG93ZXJWb2x0YWdlMhhQIAMoARIfChdIZWFkQ292ZXJIZWF0ZXIxQ3VycmVu", + "dBhRIAMoARIjChtIZWFkQ292ZXJIZWF0ZXIxVGVtcGVyYXR1cmUYUiADKAES", + "HwoXSGVhZENvdmVySGVhdGVyMkN1cnJlbnQYUyADKAESIwobSGVhZENvdmVy", + "SGVhdGVyMlRlbXBlcmF0dXJlGFQgAygBEhkKEVdIU0Jsb3dlcjJWb2x0YWdl", + "GFUgAygBEhEKCUdhc1NlbnNvchhWIAMoARIXCg9JbmNvbWluZ1ZvbHRhZ2UY", + "VyADKAESEgoKV2FzdGVMZXZlbBhYIAMoARIaChJIZWFkQmxvd2VyMUFpckZs", + "b3cYWSADKAESGgoSSGVhZEJsb3dlcjJBaXJGbG93GFogAygBQiEKH2NvbS50", + "d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { @@ -1011,7 +1011,7 @@ namespace Tango.PMR.Diagnostics { get { return headZone4HeaterCurrent_; } } - /// <summary>Field number for the "HeadZone5_6HeaterCurrent" field.</summary> + /// <summary>Field number for the "HeadZone56HeaterCurrent" field.</summary> public const int HeadZone56HeaterCurrentFieldNumber = 62; private static readonly pb::FieldCodec<double> _repeated_headZone56HeaterCurrent_codec = pb::FieldCodec.ForDouble(498); diff --git a/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs index e5faefcc4..f59be38e7 100644 --- a/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Insights { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChZJbnNpZ2h0c01vbml0b3JzLnByb3RvEhJUYW5nby5QTVIuSW5zaWdodHMi", - "lRQKEEluc2lnaHRzTW9uaXRvcnMSFAoMRGFuY2VyMUFuZ2xlGAEgASgBEhQK", + "lBQKEEluc2lnaHRzTW9uaXRvcnMSFAoMRGFuY2VyMUFuZ2xlGAEgASgBEhQK", "DERhbmNlcjJBbmdsZRgCIAEoARIUCgxEYW5jZXIzQW5nbGUYAyABKAESHAoU", "RmVlZGVyTW90b3JGcmVxdWVuY3kYBCABKAESEgoKRHJ5ZXJNb3RvchgFIAEo", "ARITCgtQb2xsZXJNb3RvchgGIAEoARITCgtXaW5kZXJNb3RvchgHIAEoARIS", @@ -61,27 +61,27 @@ namespace Tango.PMR.Insights { "ckN1cnJlbnQYOSABKAESHgoWSGVhZFpvbmUxSGVhdGVyQ3VycmVudBg6IAEo", "ARIeChZIZWFkWm9uZTJIZWF0ZXJDdXJyZW50GDsgASgBEh4KFkhlYWRab25l", "M0hlYXRlckN1cnJlbnQYPCABKAESHgoWSGVhZFpvbmU0SGVhdGVyQ3VycmVu", - "dBg9IAEoARIgChhIZWFkWm9uZTVfNkhlYXRlckN1cnJlbnQYPiABKAESGwoT", - "TWl4ZXIxSGVhdGVyQ3VycmVudBg/IAEoARIaChJEaXNwZW5zZXJzSW5rTGV2", - "ZWwYQCADKAESGAoQTWlkVGFua3NJbmtMZXZlbBhBIAMoARIaChJPdmVyYWxs", - "VGVtcGVyYXR1cmUYQiABKAESHgoWSGVhZFpvbmU3SGVhdGVyQ3VycmVudBhD", - "IAEoARIcChRIZWFkWm9uZTdUZW1wZXJhdHVyZRhEIAEoARIeChZIZWFkWm9u", - "ZThIZWF0ZXJDdXJyZW50GEUgASgBEhwKFEhlYWRab25lOFRlbXBlcmF0dXJl", - "GEYgASgBEh4KFkhlYWRab25lOUhlYXRlckN1cnJlbnQYRyABKAESHAoUSGVh", - "ZFpvbmU5VGVtcGVyYXR1cmUYSCABKAESHwoXSGVhZFpvbmUxMEhlYXRlckN1", - "cnJlbnQYSSABKAESHQoVSGVhZFpvbmUxMFRlbXBlcmF0dXJlGEogASgBEh8K", - "F0hlYWRab25lMTFIZWF0ZXJDdXJyZW50GEsgASgBEh0KFUhlYWRab25lMTFU", - "ZW1wZXJhdHVyZRhMIAEoARIfChdIZWFkWm9uZTEySGVhdGVyQ3VycmVudBhN", - "IAEoARIdChVIZWFkWm9uZTEyVGVtcGVyYXR1cmUYTiABKAESGgoSSGVhZEJs", - "b3dlclZvbHRhZ2UxGE8gASgBEhoKEkhlYWRCbG93ZXJWb2x0YWdlMhhQIAEo", - "ARIfChdIZWFkQ292ZXJIZWF0ZXIxQ3VycmVudBhRIAEoARIjChtIZWFkQ292", - "ZXJIZWF0ZXIxVGVtcGVyYXR1cmUYUiABKAESHwoXSGVhZENvdmVySGVhdGVy", - "MkN1cnJlbnQYUyABKAESIwobSGVhZENvdmVySGVhdGVyMlRlbXBlcmF0dXJl", - "GFQgASgBEhkKEVdIU0Jsb3dlcjJWb2x0YWdlGFUgASgBEhEKCUdhc1NlbnNv", - "chhWIAEoARIXCg9JbmNvbWluZ1ZvbHRhZ2UYVyABKAESEgoKV2FzdGVMZXZl", - "bBhYIAEoARIaChJIZWFkQmxvd2VyMUFpckZsb3cYWSABKAESGgoSSGVhZEJs", - "b3dlcjJBaXJGbG93GFogASgBQh4KHGNvbS50d2luZS50YW5nby5wbXIuaW5z", - "aWdodHNiBnByb3RvMw==")); + "dBg9IAEoARIfChdIZWFkWm9uZTU2SGVhdGVyQ3VycmVudBg+IAEoARIbChNN", + "aXhlcjFIZWF0ZXJDdXJyZW50GD8gASgBEhoKEkRpc3BlbnNlcnNJbmtMZXZl", + "bBhAIAMoARIYChBNaWRUYW5rc0lua0xldmVsGEEgAygBEhoKEk92ZXJhbGxU", + "ZW1wZXJhdHVyZRhCIAEoARIeChZIZWFkWm9uZTdIZWF0ZXJDdXJyZW50GEMg", + "ASgBEhwKFEhlYWRab25lN1RlbXBlcmF0dXJlGEQgASgBEh4KFkhlYWRab25l", + "OEhlYXRlckN1cnJlbnQYRSABKAESHAoUSGVhZFpvbmU4VGVtcGVyYXR1cmUY", + "RiABKAESHgoWSGVhZFpvbmU5SGVhdGVyQ3VycmVudBhHIAEoARIcChRIZWFk", + "Wm9uZTlUZW1wZXJhdHVyZRhIIAEoARIfChdIZWFkWm9uZTEwSGVhdGVyQ3Vy", + "cmVudBhJIAEoARIdChVIZWFkWm9uZTEwVGVtcGVyYXR1cmUYSiABKAESHwoX", + "SGVhZFpvbmUxMUhlYXRlckN1cnJlbnQYSyABKAESHQoVSGVhZFpvbmUxMVRl", + "bXBlcmF0dXJlGEwgASgBEh8KF0hlYWRab25lMTJIZWF0ZXJDdXJyZW50GE0g", + "ASgBEh0KFUhlYWRab25lMTJUZW1wZXJhdHVyZRhOIAEoARIaChJIZWFkQmxv", + "d2VyVm9sdGFnZTEYTyABKAESGgoSSGVhZEJsb3dlclZvbHRhZ2UyGFAgASgB", + "Eh8KF0hlYWRDb3ZlckhlYXRlcjFDdXJyZW50GFEgASgBEiMKG0hlYWRDb3Zl", + "ckhlYXRlcjFUZW1wZXJhdHVyZRhSIAEoARIfChdIZWFkQ292ZXJIZWF0ZXIy", + "Q3VycmVudBhTIAEoARIjChtIZWFkQ292ZXJIZWF0ZXIyVGVtcGVyYXR1cmUY", + "VCABKAESGQoRV0hTQmxvd2VyMlZvbHRhZ2UYVSABKAESEQoJR2FzU2Vuc29y", + "GFYgASgBEhcKD0luY29taW5nVm9sdGFnZRhXIAEoARISCgpXYXN0ZUxldmVs", + "GFggASgBEhoKEkhlYWRCbG93ZXIxQWlyRmxvdxhZIAEoARIaChJIZWFkQmxv", + "d2VyMkFpckZsb3cYWiABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5pbnNp", + "Z2h0c2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { @@ -1063,7 +1063,7 @@ namespace Tango.PMR.Insights { } } - /// <summary>Field number for the "HeadZone5_6HeaterCurrent" field.</summary> + /// <summary>Field number for the "HeadZone56HeaterCurrent" field.</summary> public const int HeadZone56HeaterCurrentFieldNumber = 62; private double headZone56HeaterCurrent_; /// <summary> diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs index df584d5c6..69d835521 100644 --- a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs +++ b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs @@ -23,13 +23,14 @@ namespace Tango.PMR.Integration { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiZFeHRlcm5hbEJyaWRnZVVkcERpc2NvdmVyeVBhY2tldC5wcm90bxIVVGFu", - "Z28uUE1SLkludGVncmF0aW9uIkYKIEV4dGVybmFsQnJpZGdlVWRwRGlzY292", + "Z28uUE1SLkludGVncmF0aW9uImIKIEV4dGVybmFsQnJpZGdlVWRwRGlzY292", "ZXJ5UGFja2V0EgwKBFRpbWUYASABKAkSFAoMU2VyaWFsTnVtYmVyGAIgASgJ", - "QiEKH2NvbS50d2luZS50YW5nby5wbXIuaW50ZWdyYXRpb25iBnByb3RvMw==")); + "EhoKEkNvbXByZXNzaW9uRW5hYmxlZBgDIAEoCEIhCh9jb20udHdpbmUudGFu", + "Z28ucG1yLmludGVncmF0aW9uYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket), global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket.Parser, new[]{ "Time", "SerialNumber" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket), global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket.Parser, new[]{ "Time", "SerialNumber", "CompressionEnabled" }, null, null, null) })); } #endregion @@ -62,6 +63,7 @@ namespace Tango.PMR.Integration { public ExternalBridgeUdpDiscoveryPacket(ExternalBridgeUdpDiscoveryPacket other) : this() { time_ = other.time_; serialNumber_ = other.serialNumber_; + compressionEnabled_ = other.compressionEnabled_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -91,6 +93,17 @@ namespace Tango.PMR.Integration { } } + /// <summary>Field number for the "CompressionEnabled" field.</summary> + public const int CompressionEnabledFieldNumber = 3; + private bool compressionEnabled_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool CompressionEnabled { + get { return compressionEnabled_; } + set { + compressionEnabled_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ExternalBridgeUdpDiscoveryPacket); @@ -106,6 +119,7 @@ namespace Tango.PMR.Integration { } if (Time != other.Time) return false; if (SerialNumber != other.SerialNumber) return false; + if (CompressionEnabled != other.CompressionEnabled) return false; return true; } @@ -114,6 +128,7 @@ namespace Tango.PMR.Integration { int hash = 1; if (Time.Length != 0) hash ^= Time.GetHashCode(); if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode(); + if (CompressionEnabled != false) hash ^= CompressionEnabled.GetHashCode(); return hash; } @@ -132,6 +147,10 @@ namespace Tango.PMR.Integration { output.WriteRawTag(18); output.WriteString(SerialNumber); } + if (CompressionEnabled != false) { + output.WriteRawTag(24); + output.WriteBool(CompressionEnabled); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -143,6 +162,9 @@ namespace Tango.PMR.Integration { if (SerialNumber.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber); } + if (CompressionEnabled != false) { + size += 1 + 1; + } return size; } @@ -157,6 +179,9 @@ namespace Tango.PMR.Integration { if (other.SerialNumber.Length != 0) { SerialNumber = other.SerialNumber; } + if (other.CompressionEnabled != false) { + CompressionEnabled = other.CompressionEnabled; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -175,6 +200,10 @@ namespace Tango.PMR.Integration { SerialNumber = input.ReadString(); break; } + case 24: { + CompressionEnabled = input.ReadBool(); + break; + } } } } |
