BIT DB, BL, PMR, OverrideData.xml, Emulator Handling, BitTypeGenerator.

5 files changed, 609 insertions, 0 deletions

diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto
index 9475c9681..bf9520689 100644
--- a/Software/PMR/Messages/Common/MessageType.proto
+++ b/Software/PMR/Messages/Common/MessageType.proto
@@ -198,6 +198,8 @@ enum MessageType
 	SetValveStateResponse = 2039;
 	CartridgeValidationRequest = 2044;
 	CartridgeValidationResponse = 2045;
+	BitResultsRequest = 2046;
+	BitResultsResponse = 2047;
 
 	//Printing
 	JobRequest = 3000;
diff --git a/Software/PMR/Messages/Diagnostics/BitResult.proto b/Software/PMR/Messages/Diagnostics/BitResult.proto
new file mode 100644
index 000000000..06d81ee4d
--- /dev/null
+++ b/Software/PMR/Messages/Diagnostics/BitResult.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+import "BitType.proto";
+
+package Tango.PMR.Diagnostics;
+option java_package = "com.twine.tango.pmr.diagnostics";
+
+message BitResult
+{
+	BitType BitType = 1;
+	bool Passed = 2;
+	string Description = 3;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/BitResultsRequest.proto b/Software/PMR/Messages/Diagnostics/BitResultsRequest.proto
new file mode 100644
index 000000000..a053fa093
--- /dev/null
+++ b/Software/PMR/Messages/Diagnostics/BitResultsRequest.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package Tango.PMR.Diagnostics;
+option java_package = "com.twine.tango.pmr.diagnostics";
+
+message BitResultsRequest
+{
+
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/BitResultsResponse.proto b/Software/PMR/Messages/Diagnostics/BitResultsResponse.proto
new file mode 100644
index 000000000..b309f62ed
--- /dev/null
+++ b/Software/PMR/Messages/Diagnostics/BitResultsResponse.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "BitResult.proto";
+
+package Tango.PMR.Diagnostics;
+option java_package = "com.twine.tango.pmr.diagnostics";
+
+message BitResultsResponse
+{
+	repeated BitResult Results = 1;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/BitType.proto b/Software/PMR/Messages/Diagnostics/BitType.proto
new file mode 100644
index 000000000..0a3652751
--- /dev/null
+++ b/Software/PMR/Messages/Diagnostics/BitType.proto
@@ -0,0 +1,574 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango PMR Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+syntax = "proto3";
+
+package Tango.PMR.Diagnostics;
+option java_package = "com.twine.tango.pmr.diagnostics";
+
+enum BitType
+{
+
+    //Must contain a 0 value
+    Unspecified_Bit = 0;
+
+    //Incoming voltage too high
+    Incomingvoltagetoohigh = 1000;
+
+    //Incoming voltage too low
+    Incomingvoltagetoolow = 1001;
+
+    //RFID Reader 1
+    RFIDReader1 = 2000;
+
+    //RFID Reader 2
+    RFIDReader2 = 2001;
+
+    //RFID Reader 3
+    RFIDReader3 = 2002;
+
+    //Dispenser I2C Comm 1
+    DispenserI2CComm1 = 3000;
+
+    //Dispenser I2C Comm 2
+    DispenserI2CComm2 = 3001;
+
+    //Dispenser I2C Comm 3
+    DispenserI2CComm3 = 3002;
+
+    //Dispenser I2C Comm 4
+    DispenserI2CComm4 = 3003;
+
+    //Dispenser I2C Comm 5
+    DispenserI2CComm5 = 3004;
+
+    //Dispenser I2C Comm 6
+    DispenserI2CComm6 = 3005;
+
+    //Dispenser I2C Comm 7
+    DispenserI2CComm7 = 3006;
+
+    //Dispenser I2C Comm 8
+    DispenserI2CComm8 = 3007;
+
+    //Head Type Identified
+    HeadTypeIdentified = 3008;
+
+    //WHS Type Identified
+    WHSTypeIdentified = 3009;
+
+    //Communication with Shinko
+    CommunicationwithShinko = 4000;
+
+    //Communication with BTSR
+    CommunicationwithBTSR = 4001;
+
+    //USB Communication
+    USBCommunication = 5000;
+
+    //Drawer BIG fan 
+    DrawerBIGfan = 6000;
+
+    //Drawer small 1 fan
+    Drawersmall1fan = 6001;
+
+    //Drawer small 2 fan
+    Drawersmall2fan = 6002;
+
+    //Drawer small 3 fan
+    Drawersmall3fan = 6003;
+
+    //Drawer small 4 fan
+    Drawersmall4fan = 6004;
+
+    //System fan 1
+    Systemfan1 = 6005;
+
+    //System fan 2
+    Systemfan2 = 6006;
+
+    //System fan 3
+    Systemfan3 = 6007;
+
+    //Dancer status read 1
+    Dancerstatusread1 = 7000;
+
+    //Dancer status read 2
+    Dancerstatusread2 = 7001;
+
+    //Dancer status read 3
+    Dancerstatusread3 = 7002;
+
+    //Dryer Encoder status read
+    DryerEncoderstatusread = 7003;
+
+    //PT100 read Head 1
+    PT100readHead1 = 8000;
+
+    //PT100 read Head 2
+    PT100readHead2 = 8001;
+
+    //PT100 read Head 3
+    PT100readHead3 = 8002;
+
+    //PT100 read Head 4
+    PT100readHead4 = 8003;
+
+    //PT100 read Head 5
+    PT100readHead5 = 8004;
+
+    //PT100 read Head 6
+    PT100readHead6 = 8005;
+
+    //PT100 read Head 7
+    PT100readHead7 = 8006;
+
+    //PT100 read Head 8
+    PT100readHead8 = 8007;
+
+    //PT100 read Head 9
+    PT100readHead9 = 8008;
+
+    //PT100 read Head 10
+    PT100readHead10 = 8009;
+
+    //PT100 read Head 11
+    PT100readHead11 = 8010;
+
+    //PT100 read Head 12
+    PT100readHead12 = 8011;
+
+    //PT100 read Dryer 1
+    PT100readDryer1 = 8012;
+
+    //PT100 read Dryer 2
+    PT100readDryer2 = 8013;
+
+    //PT100 read Head Blower In
+    PT100readHeadBlowerIn = 8014;
+
+    //PT100 read Head Blower Out
+    PT100readHeadBlowerOut = 8015;
+
+    //PT100 read Dryer Air
+    PT100readDryerAir = 8016;
+
+    //PT100 read WHS
+    PT100readWHS = 8017;
+
+    //PT100 read EC
+    PT100readEC = 8018;
+
+    //PT100 read Machine
+    PT100readMachine = 8019;
+
+    //Current break  Head 1
+    CurrentbreakHead1 = 8020;
+
+    //Current break  Head 2
+    CurrentbreakHead2 = 8021;
+
+    //Current break  Head 3
+    CurrentbreakHead3 = 8022;
+
+    //Current break  Head 4
+    CurrentbreakHead4 = 8023;
+
+    //Current break  Head 5
+    CurrentbreakHead5 = 8024;
+
+    //Current break  Head 6
+    CurrentbreakHead6 = 8025;
+
+    //Current break  Head 7
+    CurrentbreakHead7 = 8026;
+
+    //Current break  Head 8
+    CurrentbreakHead8 = 8027;
+
+    //Current break  Head 9
+    CurrentbreakHead9 = 8028;
+
+    //Current break  Head 10
+    CurrentbreakHead10 = 8029;
+
+    //Current break  Head 11
+    CurrentbreakHead11 = 8030;
+
+    //Current break  Head 12
+    CurrentbreakHead12 = 8031;
+
+    //Current break  Dryer 1
+    CurrentbreakDryer1 = 8032;
+
+    //Current break  Dryer 2
+    CurrentbreakDryer2 = 8033;
+
+    //Current break  Head Blower In
+    CurrentbreakHeadBlowerIn = 8034;
+
+    //Current break  Head Blower Out
+    CurrentbreakHeadBlowerOut = 8035;
+
+    //Current Head 1
+    CurrentHead1 = 8036;
+
+    //Current Head 2
+    CurrentHead2 = 8037;
+
+    //Current Head 3
+    CurrentHead3 = 8038;
+
+    //Current Head 4
+    CurrentHead4 = 8039;
+
+    //Current Head 5
+    CurrentHead5 = 8040;
+
+    //Current Head 6
+    CurrentHead6 = 8041;
+
+    //Current Head 7
+    CurrentHead7 = 8042;
+
+    //Current Head 8
+    CurrentHead8 = 8043;
+
+    //Current Head 9
+    CurrentHead9 = 8044;
+
+    //Current Head 10
+    CurrentHead10 = 8045;
+
+    //Current Head 11
+    CurrentHead11 = 8046;
+
+    //Current Head 12
+    CurrentHead12 = 8047;
+
+    //Current Dryer 1
+    CurrentDryer1 = 8048;
+
+    //Current Dryer 2
+    CurrentDryer2 = 8049;
+
+    //Current Head Blower In
+    CurrentHeadBlowerIn = 8050;
+
+    //Current Head Blower Out
+    CurrentHeadBlowerOut = 8051;
+
+    //Heater Head 1
+    HeaterHead1 = 8052;
+
+    //Heater Head 2
+    HeaterHead2 = 8053;
+
+    //Heater Head 3
+    HeaterHead3 = 8054;
+
+    //Heater Head 4
+    HeaterHead4 = 8055;
+
+    //Heater Head 5
+    HeaterHead5 = 8056;
+
+    //Heater Head 6
+    HeaterHead6 = 8057;
+
+    //Heater Head 7
+    HeaterHead7 = 8058;
+
+    //Heater Head 8
+    HeaterHead8 = 8059;
+
+    //Heater Head 9
+    HeaterHead9 = 8060;
+
+    //Heater Head 10
+    HeaterHead10 = 8061;
+
+    //Heater Head 11
+    HeaterHead11 = 8062;
+
+    //Heater Head 12
+    HeaterHead12 = 8063;
+
+    //Heater Dryer 1
+    HeaterDryer1 = 8064;
+
+    //Heater Dryer 2
+    HeaterDryer2 = 8065;
+
+    //Heater Head Blower In
+    HeaterHeadBlowerIn = 8066;
+
+    //Heater Head Blower Out
+    HeaterHeadBlowerOut = 8067;
+
+    //PowerStep DH Clean Head
+    PowerStepDHCleanHead = 9000;
+
+    //PowerStep DH Clean Mech
+    PowerStepDHCleanMech = 9001;
+
+    //PowerStep Dyeing Head Lid 
+    PowerStepDyeingHeadLid = 9002;
+
+    //PowerStep Dryer Driving
+    PowerStepDryerDriving = 9003;
+
+    //PowerStep Dryer Lid 
+    PowerStepDryerLid = 9004;
+
+    //PowerStep Dryer Loadarm
+    PowerStepDryerLoadarm = 9005;
+
+    //PowerStep Dispenser 1
+    PowerStepDispenser1 = 9006;
+
+    //PowerStep Dispenser 2
+    PowerStepDispenser2 = 9007;
+
+    //PowerStep Dispenser 3
+    PowerStepDispenser3 = 9008;
+
+    //PowerStep Dispenser 4
+    PowerStepDispenser4 = 9009;
+
+    //PowerStep Dispenser 5
+    PowerStepDispenser5 = 9010;
+
+    //PowerStep Dispenser 6
+    PowerStepDispenser6 = 9011;
+
+    //PowerStep Dispenser 7
+    PowerStepDispenser7 = 9012;
+
+    //PowerStep Dispenser 8
+    PowerStepDispenser8 = 9013;
+
+    //PowerStep Screw 
+    PowerStepScrew = 9014;
+
+    //PowerStep Winder 
+    PowerStepWinder = 9015;
+
+    //PowerStep Left Dancer 
+    PowerStepLeftDancer = 9016;
+
+    //PowerStep Middle Dancer
+    PowerStepMiddleDancer = 9017;
+
+    //PowerStep Left Driving 
+    PowerStepLeftDriving = 9018;
+
+    //PowerStep Left Rockers 
+    PowerStepLeftRockers = 9019;
+
+    //PowerStep Left pivot 
+    PowerStepLeftpivot = 9020;
+
+    //PowerStep Right Dancer 
+    PowerStepRightDancer = 9021;
+
+    //PowerStep Right Driving
+    PowerStepRightDriving = 9022;
+
+    //PowerStep Right Loadarm
+    PowerStepRightLoadarm = 9023;
+
+    //PowerStep Right Rockers
+    PowerStepRightRockers = 9024;
+
+    //PowerStep Spare1_1
+    PowerStepSpare1_1 = 9025;
+
+    //PowerStep Spare1_2
+    PowerStepSpare1_2 = 9026;
+
+    //PowerStep Spare2_1
+    PowerStepSpare2_1 = 9027;
+
+    //PowerStep Spare2_2
+    PowerStepSpare2_2 = 9028;
+
+    //PowerStep Spare3_1
+    PowerStepSpare3_1 = 9029;
+
+    //Motor Wire read DH Clean Head
+    MotorWirereadDHCleanHead = 9030;
+
+    //Motor Wire read DH Clean Mech
+    MotorWirereadDHCleanMech = 9031;
+
+    //Motor Wire read Dyeing Head Lid 
+    MotorWirereadDyeingHeadLid = 9032;
+
+    //Motor Wire read Dryer Driving
+    MotorWirereadDryerDriving = 9033;
+
+    //Motor Wire read Dryer Lid 
+    MotorWirereadDryerLid = 9034;
+
+    //Motor Wire read Dryer Loadarm
+    MotorWirereadDryerLoadarm = 9035;
+
+    //Motor Wire read Dispenser 1
+    MotorWirereadDispenser1 = 9036;
+
+    //Motor Wire read Dispenser 2
+    MotorWirereadDispenser2 = 9037;
+
+    //Motor Wire read Dispenser 3
+    MotorWirereadDispenser3 = 9038;
+
+    //Motor Wire read Dispenser 4
+    MotorWirereadDispenser4 = 9039;
+
+    //Motor Wire read Dispenser 5
+    MotorWirereadDispenser5 = 9040;
+
+    //Motor Wire read Dispenser 6
+    MotorWirereadDispenser6 = 9041;
+
+    //Motor Wire read Dispenser 7
+    MotorWirereadDispenser7 = 9042;
+
+    //Motor Wire read Dispenser 8
+    MotorWirereadDispenser8 = 9043;
+
+    //Motor Wire read Screw 
+    MotorWirereadScrew = 9044;
+
+    //Motor Wire read Winder 
+    MotorWirereadWinder = 9045;
+
+    //Motor Wire read Left Dancer 
+    MotorWirereadLeftDancer = 9046;
+
+    //Motor Wire read Middle Dancer
+    MotorWirereadMiddleDancer = 9047;
+
+    //Motor Wire read Left Driving 
+    MotorWirereadLeftDriving = 9048;
+
+    //Motor Wire read Left Rockers 
+    MotorWirereadLeftRockers = 9049;
+
+    //Motor Wire read Left pivot 
+    MotorWirereadLeftpivot = 9050;
+
+    //Motor Wire read Right Dancer 
+    MotorWirereadRightDancer = 9051;
+
+    //Motor Wire read Right Driving
+    MotorWirereadRightDriving = 9052;
+
+    //Motor Wire read Right Loadarm
+    MotorWirereadRightLoadarm = 9053;
+
+    //Motor Wire read Right Rockers
+    MotorWirereadRightRockers = 9054;
+
+    //Motor Wire read Spare1_1
+    MotorWirereadSpare1_1 = 9055;
+
+    //Motor Wire read Spare1_2
+    MotorWirereadSpare1_2 = 9056;
+
+    //Motor Wire read Spare2_1
+    MotorWirereadSpare2_1 = 9057;
+
+    //Motor Wire read Spare2_2
+    MotorWirereadSpare2_2 = 9058;
+
+    //Motor Wire read Spare3_1
+    MotorWirereadSpare3_1 = 9059;
+
+    //In Blower turn Off
+    InBlowerturnOff = 10000;
+
+    //Out Blower turn Off
+    OutBlowerturnOff = 10001;
+
+    //In Blower turn On
+    InBlowerturnOn = 10002;
+
+    //Out Blower turn On
+    OutBlowerturnOn = 10003;
+
+    //In Blower Pressure
+    InBlowerPressure = 10004;
+
+    //Out Blower Pressure
+    OutBlowerPressure = 10005;
+
+    //WHS Blower does not build pressure
+    WHSBlowerdoesnotbuildpressure = 10006;
+
+    //WHS Dryer sensor failure
+    WHSDryersensorfailure = 10007;
+
+    //WHS Head sensor failure
+    WHSHeadsensorfailure = 10008;
+
+    //WHS Other sensor failure
+    WHSOthersensorfailure = 10009;
+
+    //Pressure building up 1
+    Pressurebuildingup1 = 11000;
+
+    //Pressure building up 2
+    Pressurebuildingup2 = 11001;
+
+    //Pressure building up 3
+    Pressurebuildingup3 = 11002;
+
+    //Pressure building up 4
+    Pressurebuildingup4 = 11003;
+
+    //Pressure building up 5
+    Pressurebuildingup5 = 11004;
+
+    //Pressure building up 6
+    Pressurebuildingup6 = 11005;
+
+    //Pressure building up 7
+    Pressurebuildingup7 = 11006;
+
+    //Pressure building up 8
+    Pressurebuildingup8 = 11007;
+
+    //Pressure released 1
+    Pressurereleased1 = 11008;
+
+    //Pressure released 2
+    Pressurereleased2 = 11009;
+
+    //Pressure released 3
+    Pressurereleased3 = 11010;
+
+    //Pressure released 4
+    Pressurereleased4 = 11011;
+
+    //Pressure released 5
+    Pressurereleased5 = 11012;
+
+    //Pressure released 6
+    Pressurereleased6 = 11013;
+
+    //Pressure released 7
+    Pressurereleased7 = 11014;
+
+    //Pressure released 8
+    Pressurereleased8 = 11015;
+
+}