merge

1 files changed, 145 insertions, 30 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs
index f69bd91c1..e529784c5 100644
--- a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs
@@ -23,14 +23,15 @@ namespace Tango.PMR.Stubs {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch9TdHViQ2FydHJpZGdlV3JpdGVSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIu",
-            "U3R1YnMaD0NhcnRyaWRnZS5wcm90byJQChlTdHViQ2FydHJpZGdlV3JpdGVS",
-            "ZXF1ZXN0EjMKCUNhcnRyaWRnZRgBIAEoCzIgLlRhbmdvLlBNUi5EaWFnbm9z",
-            "dGljcy5DYXJ0cmlkZ2VCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IG",
-            "cHJvdG8z"));
+            "U3R1YnMikAEKGVN0dWJDYXJ0cmlkZ2VXcml0ZVJlcXVlc3QSEwoLQ2FydHJp",
+            "ZGdlSWQYASABKA0SFgoOQ2FydHJpZGdlQ29sb3IYAiABKA0SGAoQQ2FydHJp",
+            "ZGdlVmVyc2lvbhgDIAEoDRIVCg1DYXJ0cmlkZ2VEYXRhGAQgASgNEhUKDUNh",
+            "cnRyaWRnZVVzZWQYBSABKAhCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVi",
+            "c2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.CartridgeReflection.Descriptor, },
+          new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteRequest), global::Tango.PMR.Stubs.StubCartridgeWriteRequest.Parser, new[]{ "Cartridge" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteRequest), global::Tango.PMR.Stubs.StubCartridgeWriteRequest.Parser, new[]{ "CartridgeId", "CartridgeColor", "CartridgeVersion", "CartridgeData", "CartridgeUsed" }, null, null, null)
           }));
     }
     #endregion
@@ -61,7 +62,11 @@ namespace Tango.PMR.Stubs {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public StubCartridgeWriteRequest(StubCartridgeWriteRequest other) : this() {
-      Cartridge = other.cartridge_ != null ? other.Cartridge.Clone() : null;
+      cartridgeId_ = other.cartridgeId_;
+      cartridgeColor_ = other.cartridgeColor_;
+      cartridgeVersion_ = other.cartridgeVersion_;
+      cartridgeData_ = other.cartridgeData_;
+      cartridgeUsed_ = other.cartridgeUsed_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -69,14 +74,66 @@ namespace Tango.PMR.Stubs {
       return new StubCartridgeWriteRequest(this);
     }
 
-    /// <summary>Field number for the "Cartridge" field.</summary>
-    public const int CartridgeFieldNumber = 1;
-    private global::Tango.PMR.Diagnostics.Cartridge cartridge_;
+    /// <summary>Field number for the "CartridgeId" field.</summary>
+    public const int CartridgeIdFieldNumber = 1;
+    private uint cartridgeId_;
+    /// <summary>
+    ///0..7
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Diagnostics.Cartridge Cartridge {
-      get { return cartridge_; }
+    public uint CartridgeId {
+      get { return cartridgeId_; }
       set {
-        cartridge_ = value;
+        cartridgeId_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CartridgeColor" field.</summary>
+    public const int CartridgeColorFieldNumber = 2;
+    private uint cartridgeColor_;
+    /// <summary>
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public uint CartridgeColor {
+      get { return cartridgeColor_; }
+      set {
+        cartridgeColor_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CartridgeVersion" field.</summary>
+    public const int CartridgeVersionFieldNumber = 3;
+    private uint cartridgeVersion_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public uint CartridgeVersion {
+      get { return cartridgeVersion_; }
+      set {
+        cartridgeVersion_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CartridgeData" field.</summary>
+    public const int CartridgeDataFieldNumber = 4;
+    private uint cartridgeData_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public uint CartridgeData {
+      get { return cartridgeData_; }
+      set {
+        cartridgeData_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CartridgeUsed" field.</summary>
+    public const int CartridgeUsedFieldNumber = 5;
+    private bool cartridgeUsed_;
+    /// <summary>
+    /// 0 - new 1- used
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool CartridgeUsed {
+      get { return cartridgeUsed_; }
+      set {
+        cartridgeUsed_ = value;
       }
     }
 
@@ -93,14 +150,22 @@ namespace Tango.PMR.Stubs {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!object.Equals(Cartridge, other.Cartridge)) return false;
+      if (CartridgeId != other.CartridgeId) return false;
+      if (CartridgeColor != other.CartridgeColor) return false;
+      if (CartridgeVersion != other.CartridgeVersion) return false;
+      if (CartridgeData != other.CartridgeData) return false;
+      if (CartridgeUsed != other.CartridgeUsed) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (cartridge_ != null) hash ^= Cartridge.GetHashCode();
+      if (CartridgeId != 0) hash ^= CartridgeId.GetHashCode();
+      if (CartridgeColor != 0) hash ^= CartridgeColor.GetHashCode();
+      if (CartridgeVersion != 0) hash ^= CartridgeVersion.GetHashCode();
+      if (CartridgeData != 0) hash ^= CartridgeData.GetHashCode();
+      if (CartridgeUsed != false) hash ^= CartridgeUsed.GetHashCode();
       return hash;
     }
 
@@ -111,17 +176,45 @@ namespace Tango.PMR.Stubs {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (cartridge_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Cartridge);
+      if (CartridgeId != 0) {
+        output.WriteRawTag(8);
+        output.WriteUInt32(CartridgeId);
+      }
+      if (CartridgeColor != 0) {
+        output.WriteRawTag(16);
+        output.WriteUInt32(CartridgeColor);
+      }
+      if (CartridgeVersion != 0) {
+        output.WriteRawTag(24);
+        output.WriteUInt32(CartridgeVersion);
+      }
+      if (CartridgeData != 0) {
+        output.WriteRawTag(32);
+        output.WriteUInt32(CartridgeData);
+      }
+      if (CartridgeUsed != false) {
+        output.WriteRawTag(40);
+        output.WriteBool(CartridgeUsed);
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (cartridge_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Cartridge);
+      if (CartridgeId != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeId);
+      }
+      if (CartridgeColor != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeColor);
+      }
+      if (CartridgeVersion != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeVersion);
+      }
+      if (CartridgeData != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeData);
+      }
+      if (CartridgeUsed != false) {
+        size += 1 + 1;
       }
       return size;
     }
@@ -131,11 +224,20 @@ namespace Tango.PMR.Stubs {
       if (other == null) {
         return;
       }
-      if (other.cartridge_ != null) {
-        if (cartridge_ == null) {
-          cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge();
-        }
-        Cartridge.MergeFrom(other.Cartridge);
+      if (other.CartridgeId != 0) {
+        CartridgeId = other.CartridgeId;
+      }
+      if (other.CartridgeColor != 0) {
+        CartridgeColor = other.CartridgeColor;
+      }
+      if (other.CartridgeVersion != 0) {
+        CartridgeVersion = other.CartridgeVersion;
+      }
+      if (other.CartridgeData != 0) {
+        CartridgeData = other.CartridgeData;
+      }
+      if (other.CartridgeUsed != false) {
+        CartridgeUsed = other.CartridgeUsed;
       }
     }
 
@@ -147,11 +249,24 @@ namespace Tango.PMR.Stubs {
           default:
             input.SkipLastField();
             break;
-          case 10: {
-            if (cartridge_ == null) {
-              cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge();
-            }
-            input.ReadMessage(cartridge_);
+          case 8: {
+            CartridgeId = input.ReadUInt32();
+            break;
+          }
+          case 16: {
+            CartridgeColor = input.ReadUInt32();
+            break;
+          }
+          case 24: {
+            CartridgeVersion = input.ReadUInt32();
+            break;
+          }
+          case 32: {
+            CartridgeData = input.ReadUInt32();
+            break;
+          }
+          case 40: {
+            CartridgeUsed = input.ReadBool();
             break;
           }
         }