merge

2 files changed, 36 insertions, 64 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/ActivateVersionResponse.cs b/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/ActivateVersionResponse.cs
index 884b904e8..0774d0083 100644
--- a/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/ActivateVersionResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/ActivateVersionResponse.cs
@@ -23,13 +23,12 @@ namespace Tango.PMR.FirmwareUpgrade {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch1BY3RpdmF0ZVZlcnNpb25SZXNwb25zZS5wcm90bxIZVGFuZ28uUE1SLkZp",
-            "cm13YXJlVXBncmFkZSI6ChdBY3RpdmF0ZVZlcnNpb25SZXNwb25zZRIQCghQ",
-            "cm9ncmVzcxgBIAEoARINCgVUb3RhbBgCIAEoAUIlCiNjb20udHdpbmUudGFu",
-            "Z28ucG1yLmZpcm13YXJldXBncmFkZWIGcHJvdG8z"));
+            "cm13YXJlVXBncmFkZSIZChdBY3RpdmF0ZVZlcnNpb25SZXNwb25zZUIlCiNj",
+            "b20udHdpbmUudGFuZ28ucG1yLmZpcm13YXJldXBncmFkZWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.FirmwareUpgrade.ActivateVersionResponse), global::Tango.PMR.FirmwareUpgrade.ActivateVersionResponse.Parser, new[]{ "Progress", "Total" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.FirmwareUpgrade.ActivateVersionResponse), global::Tango.PMR.FirmwareUpgrade.ActivateVersionResponse.Parser, null, null, null, null)
           }));
     }
     #endregion
@@ -60,8 +59,6 @@ namespace Tango.PMR.FirmwareUpgrade {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public ActivateVersionResponse(ActivateVersionResponse other) : this() {
-      progress_ = other.progress_;
-      total_ = other.total_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -69,28 +66,6 @@ namespace Tango.PMR.FirmwareUpgrade {
       return new ActivateVersionResponse(this);
     }
 
-    /// <summary>Field number for the "Progress" field.</summary>
-    public const int ProgressFieldNumber = 1;
-    private double progress_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double Progress {
-      get { return progress_; }
-      set {
-        progress_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Total" field.</summary>
-    public const int TotalFieldNumber = 2;
-    private double total_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double Total {
-      get { return total_; }
-      set {
-        total_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ActivateVersionResponse);
@@ -104,16 +79,12 @@ namespace Tango.PMR.FirmwareUpgrade {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (Progress != other.Progress) return false;
-      if (Total != other.Total) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (Progress != 0D) hash ^= Progress.GetHashCode();
-      if (Total != 0D) hash ^= Total.GetHashCode();
       return hash;
     }
 
@@ -124,25 +95,11 @@ namespace Tango.PMR.FirmwareUpgrade {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (Progress != 0D) {
-        output.WriteRawTag(9);
-        output.WriteDouble(Progress);
-      }
-      if (Total != 0D) {
-        output.WriteRawTag(17);
-        output.WriteDouble(Total);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (Progress != 0D) {
-        size += 1 + 8;
-      }
-      if (Total != 0D) {
-        size += 1 + 8;
-      }
       return size;
     }
 
@@ -151,12 +108,6 @@ namespace Tango.PMR.FirmwareUpgrade {
       if (other == null) {
         return;
       }
-      if (other.Progress != 0D) {
-        Progress = other.Progress;
-      }
-      if (other.Total != 0D) {
-        Total = other.Total;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -167,14 +118,6 @@ namespace Tango.PMR.FirmwareUpgrade {
           default:
             input.SkipLastField();
             break;
-          case 9: {
-            Progress = input.ReadDouble();
-            break;
-          }
-          case 17: {
-            Total = input.ReadDouble();
-            break;
-          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/VersionFileDescriptor.cs b/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/VersionFileDescriptor.cs
index 96b0a8525..98a6c2efc 100644
--- a/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/VersionFileDescriptor.cs
+++ b/Software/Visual_Studio/Tango.PMR/FirmwareUpgrade/VersionFileDescriptor.cs
@@ -23,15 +23,16 @@ namespace Tango.PMR.FirmwareUpgrade {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChtWZXJzaW9uRmlsZURlc2NyaXB0b3IucHJvdG8SGVRhbmdvLlBNUi5GaXJt",
-            "d2FyZVVwZ3JhZGUaHFZlcnNpb25GaWxlRGVzdGluYXRpb24ucHJvdG8iggEK",
+            "d2FyZVVwZ3JhZGUaHFZlcnNpb25GaWxlRGVzdGluYXRpb24ucHJvdG8ilAEK",
             "FVZlcnNpb25GaWxlRGVzY3JpcHRvchIQCghGaWxlTmFtZRgBIAEoCRIPCgdW",
             "ZXJzaW9uGAIgASgJEkYKC0Rlc3RpbmF0aW9uGAMgASgOMjEuVGFuZ28uUE1S",
-            "LkZpcm13YXJlVXBncmFkZS5WZXJzaW9uRmlsZURlc3RpbmF0aW9uQiUKI2Nv",
-            "bS50d2luZS50YW5nby5wbXIuZmlybXdhcmV1cGdyYWRlYgZwcm90bzM="));
+            "LkZpcm13YXJlVXBncmFkZS5WZXJzaW9uRmlsZURlc3RpbmF0aW9uEhAKCENo",
+            "ZWNrU3VtGAQgASgMQiUKI2NvbS50d2luZS50YW5nby5wbXIuZmlybXdhcmV1",
+            "cGdyYWRlYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.FirmwareUpgrade.VersionFileDestinationReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.FirmwareUpgrade.VersionFileDescriptor), global::Tango.PMR.FirmwareUpgrade.VersionFileDescriptor.Parser, new[]{ "FileName", "Version", "Destination" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.FirmwareUpgrade.VersionFileDescriptor), global::Tango.PMR.FirmwareUpgrade.VersionFileDescriptor.Parser, new[]{ "FileName", "Version", "Destination", "CheckSum" }, null, null, null)
           }));
     }
     #endregion
@@ -65,6 +66,7 @@ namespace Tango.PMR.FirmwareUpgrade {
       fileName_ = other.fileName_;
       version_ = other.version_;
       destination_ = other.destination_;
+      checkSum_ = other.checkSum_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -105,6 +107,17 @@ namespace Tango.PMR.FirmwareUpgrade {
       }
     }
 
+    /// <summary>Field number for the "CheckSum" field.</summary>
+    public const int CheckSumFieldNumber = 4;
+    private pb::ByteString checkSum_ = pb::ByteString.Empty;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pb::ByteString CheckSum {
+      get { return checkSum_; }
+      set {
+        checkSum_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as VersionFileDescriptor);
@@ -121,6 +134,7 @@ namespace Tango.PMR.FirmwareUpgrade {
       if (FileName != other.FileName) return false;
       if (Version != other.Version) return false;
       if (Destination != other.Destination) return false;
+      if (CheckSum != other.CheckSum) return false;
       return true;
     }
 
@@ -130,6 +144,7 @@ namespace Tango.PMR.FirmwareUpgrade {
       if (FileName.Length != 0) hash ^= FileName.GetHashCode();
       if (Version.Length != 0) hash ^= Version.GetHashCode();
       if (Destination != 0) hash ^= Destination.GetHashCode();
+      if (CheckSum.Length != 0) hash ^= CheckSum.GetHashCode();
       return hash;
     }
 
@@ -152,6 +167,10 @@ namespace Tango.PMR.FirmwareUpgrade {
         output.WriteRawTag(24);
         output.WriteEnum((int) Destination);
       }
+      if (CheckSum.Length != 0) {
+        output.WriteRawTag(34);
+        output.WriteBytes(CheckSum);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -166,6 +185,9 @@ namespace Tango.PMR.FirmwareUpgrade {
       if (Destination != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Destination);
       }
+      if (CheckSum.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeBytesSize(CheckSum);
+      }
       return size;
     }
 
@@ -183,6 +205,9 @@ namespace Tango.PMR.FirmwareUpgrade {
       if (other.Destination != 0) {
         Destination = other.Destination;
       }
+      if (other.CheckSum.Length != 0) {
+        CheckSum = other.CheckSum;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -205,6 +230,10 @@ namespace Tango.PMR.FirmwareUpgrade {
             destination_ = (global::Tango.PMR.FirmwareUpgrade.VersionFileDestination) input.ReadEnum();
             break;
           }
+          case 34: {
+            CheckSum = input.ReadBytes();
+            break;
+          }
         }
       }
     }