Redundant.

2 files changed, 96 insertions, 37 deletions

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index 6da2ed87d..5a8b25763 100644
--- a/Software/Android_Studio/ColorCapture/app/build.gradle
+++ b/Software/Android_Studio/ColorCapture/app/build.gradle
@@ -23,7 +23,7 @@ android {
     buildTypes {
 
         debug {
-            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.215:45457/api/\""
+            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.229:45455/api/\""
             buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\""
         }
 
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java
index 47eea883d..f02aa2498 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java
@@ -680,6 +680,30 @@ public final class MessageTypeOuterClass {
      */
     SetValveStateResponse(2039),
     /**
+     * <code>StartCartridgesUpdateRequest = 2040;</code>
+     */
+    StartCartridgesUpdateRequest(2040),
+    /**
+     * <code>StartCartridgesUpdateResponse = 2041;</code>
+     */
+    StartCartridgesUpdateResponse(2041),
+    /**
+     * <code>StopCartridgesUpdateRequest = 2042;</code>
+     */
+    StopCartridgesUpdateRequest(2042),
+    /**
+     * <code>StopCartridgesUpdateResponse = 2043;</code>
+     */
+    StopCartridgesUpdateResponse(2043),
+    /**
+     * <code>CartridgeValidationRequest = 2044;</code>
+     */
+    CartridgeValidationRequest(2044),
+    /**
+     * <code>CartridgeValidationResponse = 2045;</code>
+     */
+    CartridgeValidationResponse(2045),
+    /**
      * <pre>
      *Printing
      * </pre>
@@ -1567,6 +1591,30 @@ public final class MessageTypeOuterClass {
      */
     public static final int SetValveStateResponse_VALUE = 2039;
     /**
+     * <code>StartCartridgesUpdateRequest = 2040;</code>
+     */
+    public static final int StartCartridgesUpdateRequest_VALUE = 2040;
+    /**
+     * <code>StartCartridgesUpdateResponse = 2041;</code>
+     */
+    public static final int StartCartridgesUpdateResponse_VALUE = 2041;
+    /**
+     * <code>StopCartridgesUpdateRequest = 2042;</code>
+     */
+    public static final int StopCartridgesUpdateRequest_VALUE = 2042;
+    /**
+     * <code>StopCartridgesUpdateResponse = 2043;</code>
+     */
+    public static final int StopCartridgesUpdateResponse_VALUE = 2043;
+    /**
+     * <code>CartridgeValidationRequest = 2044;</code>
+     */
+    public static final int CartridgeValidationRequest_VALUE = 2044;
+    /**
+     * <code>CartridgeValidationResponse = 2045;</code>
+     */
+    public static final int CartridgeValidationResponse_VALUE = 2045;
+    /**
      * <pre>
      *Printing
      * </pre>
@@ -1969,6 +2017,12 @@ public final class MessageTypeOuterClass {
         case 2037: return SetBlowerStateResponse;
         case 2038: return SetValveStateRequest;
         case 2039: return SetValveStateResponse;
+        case 2040: return StartCartridgesUpdateRequest;
+        case 2041: return StartCartridgesUpdateResponse;
+        case 2042: return StopCartridgesUpdateRequest;
+        case 2043: return StopCartridgesUpdateResponse;
+        case 2044: return CartridgeValidationRequest;
+        case 2045: return CartridgeValidationResponse;
         case 3000: return JobRequest;
         case 3001: return JobResponse;
         case 3002: return AbortJobRequest;
@@ -2080,7 +2134,7 @@ public final class MessageTypeOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021MessageType.proto\022\020Tango.PMR.Common*\212/" +
+      "\n\021MessageType.proto\022\020Tango.PMR.Common*\3310" +
       "\n\013MessageType\022\010\n\004None\020\000\022\021\n\rErrorResponse" +
       "\020\001\022\024\n\020CalculateRequest\020\003\022\025\n\021CalculateRes" +
       "ponse\020\004\022\023\n\017ProgressRequest\020\005\022\024\n\020Progress" +
@@ -2198,41 +2252,46 @@ public final class MessageTypeOuterClass {
       "terStateResponse\020\363\017\022\032\n\025SetBlowerStateReq" +
       "uest\020\364\017\022\033\n\026SetBlowerStateResponse\020\365\017\022\031\n\024" +
       "SetValveStateRequest\020\366\017\022\032\n\025SetValveState" +
-      "Response\020\367\017\022\017\n\nJobRequest\020\270\027\022\020\n\013JobRespo" +
-      "nse\020\271\027\022\024\n\017AbortJobRequest\020\272\027\022\025\n\020AbortJob",
-      "Response\020\273\027\022#\n\036UploadProcessParametersRe" +
-      "quest\020\274\027\022$\n\037UploadProcessParametersRespo" +
-      "nse\020\275\027\022\026\n\021CurrentJobRequest\020\276\027\022\027\n\022Curren" +
-      "tJobResponse\020\277\027\022\034\n\027ResumeCurrentJobReque" +
-      "st\020\300\027\022\035\n\030ResumeCurrentJobResponse\020\301\027\022\031\n\024" +
-      "StartDebugLogRequest\020\240\037\022\032\n\025StartDebugLog" +
-      "Response\020\241\037\022\030\n\023StopDebugLogRequest\020\242\037\022\031\n" +
-      "\024StopDebugLogResponse\020\243\037\022\'\n\"UploadHardwa" +
-      "reConfigurationRequest\020\210\'\022(\n#UploadHardw" +
-      "areConfigurationResponse\020\211\'\022\027\n\022SystemRes",
-      "etRequest\020\212\'\022\030\n\023SystemResetResponse\020\213\'\022\025" +
-      "\n\020KeepAliveRequest\020\360.\022\026\n\021KeepAliveRespon" +
-      "se\020\361.\022\023\n\016ConnectRequest\020\362.\022\024\n\017ConnectRes" +
-      "ponse\020\363.\022\026\n\021DisconnectRequest\020\364.\022\027\n\022Disc" +
-      "onnectResponse\020\365.\022\026\n\021FileUploadRequest\020\330" +
-      "6\022\027\n\022FileUploadResponse\020\3316\022\033\n\026FileChunkU" +
-      "ploadRequest\020\3326\022\034\n\027FileChunkUploadRespon" +
-      "se\020\3336\022\032\n\025ExecuteProcessRequest\020\3346\022\033\n\026Exe" +
-      "cuteProcessResponse\020\3356\022\027\n\022KillProcessReq" +
-      "uest\020\3366\022\030\n\023KillProcessResponse\020\3376\022\022\n\rCre",
-      "ateRequest\020\3406\022\023\n\016CreateResponse\020\3416\022\022\n\rDe" +
-      "leteRequest\020\3426\022\023\n\016DeleteResponse\020\3436\022\032\n\025G" +
-      "etStorageInfoRequest\020\3446\022\033\n\026GetStorageInf" +
-      "oResponse\020\3456\022\024\n\017GetFilesRequest\020\3466\022\025\n\020Ge" +
-      "tFilesResponse\020\3476\022\030\n\023FileDownloadRequest" +
-      "\020\3506\022\031\n\024FileDownloadResponse\020\3516\022\035\n\030FileCh" +
-      "unkDownloadRequest\020\3526\022\036\n\031FileChunkDownlo" +
-      "adResponse\020\3536\022\033\n\026ValidateVersionRequest\020" +
-      "\3546\022\034\n\027ValidateVersionResponse\020\3556\022\033\n\026Acti" +
-      "vateVersionRequest\020\3566\022\034\n\027ActivateVersion",
-      "Response\020\3576\022\031\n\024DispenserDataRequest\020\300>\022\032" +
-      "\n\025DispenserDataResponse\020\301>B\034\n\032com.twine." +
-      "tango.pmr.commonb\006proto3"
+      "Response\020\367\017\022!\n\034StartCartridgesUpdateRequ" +
+      "est\020\370\017\022\"\n\035StartCartridgesUpdateResponse\020",
+      "\371\017\022 \n\033StopCartridgesUpdateRequest\020\372\017\022!\n\034" +
+      "StopCartridgesUpdateResponse\020\373\017\022\037\n\032Cartr" +
+      "idgeValidationRequest\020\374\017\022 \n\033CartridgeVal" +
+      "idationResponse\020\375\017\022\017\n\nJobRequest\020\270\027\022\020\n\013J" +
+      "obResponse\020\271\027\022\024\n\017AbortJobRequest\020\272\027\022\025\n\020A" +
+      "bortJobResponse\020\273\027\022#\n\036UploadProcessParam" +
+      "etersRequest\020\274\027\022$\n\037UploadProcessParamete" +
+      "rsResponse\020\275\027\022\026\n\021CurrentJobRequest\020\276\027\022\027\n" +
+      "\022CurrentJobResponse\020\277\027\022\034\n\027ResumeCurrentJ" +
+      "obRequest\020\300\027\022\035\n\030ResumeCurrentJobResponse",
+      "\020\301\027\022\031\n\024StartDebugLogRequest\020\240\037\022\032\n\025StartD" +
+      "ebugLogResponse\020\241\037\022\030\n\023StopDebugLogReques" +
+      "t\020\242\037\022\031\n\024StopDebugLogResponse\020\243\037\022\'\n\"Uploa" +
+      "dHardwareConfigurationRequest\020\210\'\022(\n#Uplo" +
+      "adHardwareConfigurationResponse\020\211\'\022\027\n\022Sy" +
+      "stemResetRequest\020\212\'\022\030\n\023SystemResetRespon" +
+      "se\020\213\'\022\025\n\020KeepAliveRequest\020\360.\022\026\n\021KeepAliv" +
+      "eResponse\020\361.\022\023\n\016ConnectRequest\020\362.\022\024\n\017Con" +
+      "nectResponse\020\363.\022\026\n\021DisconnectRequest\020\364.\022" +
+      "\027\n\022DisconnectResponse\020\365.\022\026\n\021FileUploadRe",
+      "quest\020\3306\022\027\n\022FileUploadResponse\020\3316\022\033\n\026Fil" +
+      "eChunkUploadRequest\020\3326\022\034\n\027FileChunkUploa" +
+      "dResponse\020\3336\022\032\n\025ExecuteProcessRequest\020\3346" +
+      "\022\033\n\026ExecuteProcessResponse\020\3356\022\027\n\022KillPro" +
+      "cessRequest\020\3366\022\030\n\023KillProcessResponse\020\3376" +
+      "\022\022\n\rCreateRequest\020\3406\022\023\n\016CreateResponse\020\341" +
+      "6\022\022\n\rDeleteRequest\020\3426\022\023\n\016DeleteResponse\020" +
+      "\3436\022\032\n\025GetStorageInfoRequest\020\3446\022\033\n\026GetSto" +
+      "rageInfoResponse\020\3456\022\024\n\017GetFilesRequest\020\346" +
+      "6\022\025\n\020GetFilesResponse\020\3476\022\030\n\023FileDownload",
+      "Request\020\3506\022\031\n\024FileDownloadResponse\020\3516\022\035\n" +
+      "\030FileChunkDownloadRequest\020\3526\022\036\n\031FileChun" +
+      "kDownloadResponse\020\3536\022\033\n\026ValidateVersionR" +
+      "equest\020\3546\022\034\n\027ValidateVersionResponse\020\3556\022" +
+      "\033\n\026ActivateVersionRequest\020\3566\022\034\n\027Activate" +
+      "VersionResponse\020\3576\022\031\n\024DispenserDataReque" +
+      "st\020\300>\022\032\n\025DispenserDataResponse\020\301>B\034\n\032com" +
+      ".twine.tango.pmr.commonb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {