aboutsummaryrefslogtreecommitdiffstats
path: root/Software/PMR/Messages/MachineStatus
diff options
context:
space:
mode:
Diffstat (limited to 'Software/PMR/Messages/MachineStatus')
-rw-r--r--Software/PMR/Messages/MachineStatus/IDSPackLevel.proto2
-rw-r--r--Software/PMR/Messages/MachineStatus/MachineState.proto2
-rw-r--r--Software/PMR/Messages/MachineStatus/MachineStatus.proto3
-rw-r--r--Software/PMR/Messages/MachineStatus/SpoolState.proto10
4 files changed, 2 insertions, 15 deletions
diff --git a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
index d4bda8f95..1ebed9a51 100644
--- a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
+++ b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
@@ -7,5 +7,5 @@ message IDSPackLevel
{
int32 Index = 1;
int32 DispenserLevel = 2;
- double MidTankLevel = 3;
+ int32 MidTankLevel = 3;
} \ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/MachineState.proto b/Software/PMR/Messages/MachineStatus/MachineState.proto
index 14d71ee48..0e84b8aaf 100644
--- a/Software/PMR/Messages/MachineStatus/MachineState.proto
+++ b/Software/PMR/Messages/MachineStatus/MachineState.proto
@@ -5,7 +5,7 @@ option java_package = "com.twine.tango.pmr.machinestatus";
enum MachineState
{
- PowerUp = 0;
+ Initializing = 0;
Ready = 1;
Sleep = 2;
Error = 3;
diff --git a/Software/PMR/Messages/MachineStatus/MachineStatus.proto b/Software/PMR/Messages/MachineStatus/MachineStatus.proto
index 312e26e01..dde725ee2 100644
--- a/Software/PMR/Messages/MachineStatus/MachineStatus.proto
+++ b/Software/PMR/Messages/MachineStatus/MachineStatus.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
import "MachineState.proto";
import "IDSPackLevel.proto";
-import "SpoolState.proto";
package Tango.PMR.MachineStatus;
option java_package = "com.twine.tango.pmr.machinestatus";
@@ -11,6 +10,4 @@ message MachineStatus
{
MachineState State = 1;
repeated IDSPackLevel IDSPacksLevels = 2;
- double OverallTemperature = 3;
- SpoolState SpoolState = 4;
} \ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/SpoolState.proto b/Software/PMR/Messages/MachineStatus/SpoolState.proto
deleted file mode 100644
index dbc92f172..000000000
--- a/Software/PMR/Messages/MachineStatus/SpoolState.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.MachineStatus;
-option java_package = "com.twine.tango.pmr.machinestatus";
-
-enum SpoolState
-{
- Absent = 0;
- Present = 1;
-}