merge

10 files changed, 0 insertions, 104 deletions

diff --git a/Software/PMR/Messages/Printing/AbortHeadCleaningRequest.proto b/Software/PMR/Messages/Printing/AbortHeadCleaningRequest.proto
deleted file mode 100644
index 8ef696bc5..000000000
--- a/Software/PMR/Messages/Printing/AbortHeadCleaningRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Printing;
-option java_package = "com.twine.tango.pmr.printing";
-
-message AbortHeadCleaningRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Printing/AbortHeadCleaningResponse.proto b/Software/PMR/Messages/Printing/AbortHeadCleaningResponse.proto
deleted file mode 100644
index f9a285e57..000000000
--- a/Software/PMR/Messages/Printing/AbortHeadCleaningResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Printing;
-option java_package = "com.twine.tango.pmr.printing";
-
-message AbortHeadCleaningResponse
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Printing/DispenserLiquidType.proto b/Software/PMR/Messages/Printing/DispenserLiquidType.proto
index fdc61996e..72970efa3 100644
--- a/Software/PMR/Messages/Printing/DispenserLiquidType.proto
+++ b/Software/PMR/Messages/Printing/DispenserLiquidType.proto
@@ -30,10 +30,4 @@ enum DispenserLiquidType
 
     Cleaner = 6;
 
-    LightCyan = 7;
-
-    LightMagenta = 8;
-
-    LightYellow = 9;
-
 }
diff --git a/Software/PMR/Messages/Printing/HeadCleaningParameters.proto b/Software/PMR/Messages/Printing/HeadCleaningParameters.proto
deleted file mode 100644
index b9ecda142..000000000
--- a/Software/PMR/Messages/Printing/HeadCleaningParameters.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Printing;
-option java_package = "com.twine.tango.pmr.printing";
-
-message HeadCleaningParameters
-{
-    double CleanerFlow = 1;
-    double ArcHeadCleaningMotorSpeed = 2;
-}
diff --git a/Software/PMR/Messages/Printing/JobSpool.proto b/Software/PMR/Messages/Printing/JobSpool.proto
index e9fa8ae5f..a1d6b65ab 100644
--- a/Software/PMR/Messages/Printing/JobSpool.proto
+++ b/Software/PMR/Messages/Printing/JobSpool.proto
@@ -36,6 +36,4 @@ message JobSpool
 
     int32 BottomBackingRate = 9;
 
-    int32 LimitSwitchStartPointOffset = 10;
-
 }
diff --git a/Software/PMR/Messages/Printing/JobTicket.proto b/Software/PMR/Messages/Printing/JobTicket.proto
index 141adff01..9824f6ef0 100644
--- a/Software/PMR/Messages/Printing/JobTicket.proto
+++ b/Software/PMR/Messages/Printing/JobTicket.proto
@@ -5,8 +5,6 @@ import "ProcessParameters.proto";
 import "JobWindingMethod.proto";
 import "JobSpool.proto";
 import "JobUploadStrategy.proto";
-import "ThreadParameters.proto";
-import "HeadCleaningParameters.proto";
 
 package Tango.PMR.Printing;
 option java_package = "com.twine.tango.pmr.printing";
@@ -37,7 +35,4 @@ message JobTicket
 
 	//sample winding winds each segment densely on a small part of the spool, end moves one for the next segment
 	bool SampleWinding = 14;
-
-	ThreadParameters ThreadParameters = 15;
-	HeadCleaningParameters HeadCleaningParameters = 16;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Printing/ProcessParameters.proto b/Software/PMR/Messages/Printing/ProcessParameters.proto
index 0a483d9bb..042f63264 100644
--- a/Software/PMR/Messages/Printing/ProcessParameters.proto
+++ b/Software/PMR/Messages/Printing/ProcessParameters.proto
@@ -56,26 +56,4 @@ message ProcessParameters
 
     int32 TableIndex = 20;
 
-    double HeadZone7Temp = 21;
-
-    double HeadZone8Temp = 22;
-
-    double HeadZone9Temp = 23;
-
-    double HeadZone10Temp = 24;
-
-    double HeadZone11Temp = 25;
-
-    double HeadZone12Temp = 26;
-
-    double RBlowerFlow = 27;
-
-    double RBlowerTemp = 28;
-
-    double LBlowerFlow = 29;
-
-    double LBlowerTemp = 30;
-
-    double PressureBuildUp = 31;
-
 }
diff --git a/Software/PMR/Messages/Printing/StartHeadCleaningRequest.proto b/Software/PMR/Messages/Printing/StartHeadCleaningRequest.proto
deleted file mode 100644
index 802523de0..000000000
--- a/Software/PMR/Messages/Printing/StartHeadCleaningRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Printing;
-option java_package = "com.twine.tango.pmr.printing";
-
-message StartHeadCleaningRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Printing/StartHeadCleaningResponse.proto b/Software/PMR/Messages/Printing/StartHeadCleaningResponse.proto
deleted file mode 100644
index 30e4aaeed..000000000
--- a/Software/PMR/Messages/Printing/StartHeadCleaningResponse.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Printing;
-option java_package = "com.twine.tango.pmr.printing";
-
-message StartHeadCleaningResponse
-{
-	double Progress = 1;
-	double Total = 2;
-	string Status = 3;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Printing/ThreadParameters.proto b/Software/PMR/Messages/Printing/ThreadParameters.proto
deleted file mode 100644
index 19775db32..000000000
--- a/Software/PMR/Messages/Printing/ThreadParameters.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Printing;
-option java_package = "com.twine.tango.pmr.printing";
-
-message ThreadParameters
-{
-    int32 FeederP = 1;
-    int32 FeederI = 2;
-    int32 FeederD = 3;
-
-    int32 PullerP = 4;
-    int32 PullerI = 5;
-    int32 PullerD = 6;
-
-    int32 WinderP = 7;
-    int32 WinderI = 8;
-    int32 WinderD = 9;
-
-    bool BypassRockers = 10;
-}