merge

12 files changed, 0 insertions, 144 deletions

diff --git a/Software/PMR/Messages/Power/AbortPowerDownRequest.proto b/Software/PMR/Messages/Power/AbortPowerDownRequest.proto
deleted file mode 100644
index 1f4340577..000000000
--- a/Software/PMR/Messages/Power/AbortPowerDownRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message AbortPowerDownRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/AbortPowerDownResponse.proto b/Software/PMR/Messages/Power/AbortPowerDownResponse.proto
deleted file mode 100644
index 2a939a4ef..000000000
--- a/Software/PMR/Messages/Power/AbortPowerDownResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message AbortPowerDownResponse
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/AbortPowerUpRequest.proto b/Software/PMR/Messages/Power/AbortPowerUpRequest.proto
deleted file mode 100644
index e18df87ba..000000000
--- a/Software/PMR/Messages/Power/AbortPowerUpRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message AbortPowerUpRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/AbortPowerUpResponse.proto b/Software/PMR/Messages/Power/AbortPowerUpResponse.proto
deleted file mode 100644
index 5ef64299b..000000000
--- a/Software/PMR/Messages/Power/AbortPowerUpResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message AbortPowerUpResponse
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/PowerDownState.proto b/Software/PMR/Messages/Power/PowerDownState.proto
deleted file mode 100644
index a6e7afa42..000000000
--- a/Software/PMR/Messages/Power/PowerDownState.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-enum PowerDownState
-{
-	//Fill the states.
-	None = 0;
-	Init = 1;
-	StopRunningJob = 2;
-	HeadClean = 3;
-	MixerFlush = 4;
-	HeatersOff = 5;
-	StoreData = 6;
-	SetValvePosition = 7;
-	WaitForTemperature = 8;
-	WaitForProcesses = 9;
-	TurnOffDryerFan = 10;
-	TurnOffCooler = 11;
-	TurnOffBlower = 12;
-	PowerOffCompleted = 13;
-	Error = 14;
-	Cancelled = 15;
-}
diff --git a/Software/PMR/Messages/Power/PowerUpState.proto b/Software/PMR/Messages/Power/PowerUpState.proto
deleted file mode 100644
index 1cbb80fd2..000000000
--- a/Software/PMR/Messages/Power/PowerUpState.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-enum PowerUpState
-{
-	//Fill the states.
-	None = 0;
-	Init = 1;
-	HwConfig = 2;
-	BuiltInTest = 3;
-	InitialBlowerActivation = 4;
-	WaitForCooler = 5;
-	DispenserPressureBuildupTest = 6;
-	ThreadDetection = 7;
-	HeatingStarted = 8;
-	MachineReadyToDye = 9;
-	Error = 10;
-	Cancelled = 11;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/StandByRequest.proto b/Software/PMR/Messages/Power/StandByRequest.proto
deleted file mode 100644
index d87c0b9ff..000000000
--- a/Software/PMR/Messages/Power/StandByRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message StandByRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/StandByResponse.proto b/Software/PMR/Messages/Power/StandByResponse.proto
deleted file mode 100644
index dec061f1f..000000000
--- a/Software/PMR/Messages/Power/StandByResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message StandByResponse
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/StartPowerDownRequest.proto b/Software/PMR/Messages/Power/StartPowerDownRequest.proto
deleted file mode 100644
index 7efa5d1a0..000000000
--- a/Software/PMR/Messages/Power/StartPowerDownRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message StartPowerDownRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/StartPowerDownResponse.proto b/Software/PMR/Messages/Power/StartPowerDownResponse.proto
deleted file mode 100644
index cb0fe015b..000000000
--- a/Software/PMR/Messages/Power/StartPowerDownResponse.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-import "PowerDownState.proto";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message StartPowerDownResponse
-{
-	PowerDownState State = 1;
-	double ProgressPercentage = 2;
-	string Message = 3;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/StartPowerUpRequest.proto b/Software/PMR/Messages/Power/StartPowerUpRequest.proto
deleted file mode 100644
index 492ac45af..000000000
--- a/Software/PMR/Messages/Power/StartPowerUpRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message StartPowerUpRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Power/StartPowerUpResponse.proto b/Software/PMR/Messages/Power/StartPowerUpResponse.proto
deleted file mode 100644
index cc34a529b..000000000
--- a/Software/PMR/Messages/Power/StartPowerUpResponse.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-import "PowerUpState.proto";
-
-package Tango.PMR.Power;
-option java_package = "com.twine.tango.pmr.power";
-
-message StartPowerUpResponse
-{
-	PowerUpState State = 1;
-	double ProgressPercentage = 2;
-	string Message = 3;
-}
\ No newline at end of file