merge

1 files changed, 0 insertions, 102 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs b/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs
deleted file mode 100644
index 6b2daa8f7..000000000
--- a/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: CartridgeState.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.IFS {
-
-  /// <summary>Holder for reflection information generated from CartridgeState.proto</summary>
-  public static partial class CartridgeStateReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for CartridgeState.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static CartridgeStateReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChRDYXJ0cmlkZ2VTdGF0ZS5wcm90bxINVGFuZ28uUE1SLklGUyrPAQoOQ2Fy",
-            "dHJpZGdlU3RhdGUSCAoETm9uZRAAEgoKBkFic2VudBABEgsKB1ByZXNlbnQQ",
-            "AhIMCghJbnNlcnRlZBADEgkKBUVtcHR5EAQSCAoERnVsbBAFEgkKBUVycm9y",
-            "EAYSCwoHRmlsbGluZxAKEhQKEEZpbGxpbmdDb21wbGV0ZWQQCxIRCg1GaWxs",
-            "aW5nRmFpbGVkEAwSDAoIRW1wdHlpbmcQFBIVChFFbXB0eWluZ0NvbXBsZXRl",
-            "ZBAVEhEKDUVtcHlpbmdGYWlsZWQQFkIZChdjb20udHdpbmUudGFuZ28ucG1y",
-            "Lmlmc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.IFS.CartridgeState), }, null));
-    }
-    #endregion
-
-  }
-  #region Enums
-  /// <summary>
-  ///OT = One Trigger, meaning, the state should be sent once, then return to a none OT state.
-  /// </summary>
-  public enum CartridgeState {
-    /// <summary>
-    ///Unspecified.
-    /// </summary>
-    [pbr::OriginalName("None")] None = 0,
-    /// <summary>
-    ///Waste or ink cartridge not found.
-    /// </summary>
-    [pbr::OriginalName("Absent")] Absent = 1,
-    /// <summary>
-    ///Waste or ink cartridge present.
-    /// </summary>
-    [pbr::OriginalName("Present")] Present = 2,
-    /// <summary>
-    ///Waste or ink cartridge inserted. | OT
-    /// </summary>
-    [pbr::OriginalName("Inserted")] Inserted = 3,
-    /// <summary>
-    ///Waste or ink cartridge is empty.
-    /// </summary>
-    [pbr::OriginalName("Empty")] Empty = 4,
-    /// <summary>
-    ///Waste or ink cartridge is full.
-    /// </summary>
-    [pbr::OriginalName("Full")] Full = 5,
-    /// <summary>
-    ///Waste or ink is in an error state. (unrelated to filling or emptying)
-    /// </summary>
-    [pbr::OriginalName("Error")] Error = 6,
-    /// <summary>
-    ///Ink cartridge is now filling...
-    /// </summary>
-    [pbr::OriginalName("Filling")] Filling = 10,
-    /// <summary>
-    ///Ink cartridge filing completed. | OT
-    /// </summary>
-    [pbr::OriginalName("FillingCompleted")] FillingCompleted = 11,
-    /// <summary>
-    ///Error occurred while ink filling. | OT
-    /// </summary>
-    [pbr::OriginalName("FillingFailed")] FillingFailed = 12,
-    /// <summary>
-    ///Waste cartridge is emptying...
-    /// </summary>
-    [pbr::OriginalName("Emptying")] Emptying = 20,
-    /// <summary>
-    ///Waste cartridge emptying completed. | OT
-    /// </summary>
-    [pbr::OriginalName("EmptyingCompleted")] EmptyingCompleted = 21,
-    /// <summary>
-    ///Error occurred while waste emptying. | OT
-    /// </summary>
-    [pbr::OriginalName("EmpyingFailed")] EmpyingFailed = 22,
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code