diff options
Diffstat (limited to 'Software/Visual_Studio')
14 files changed, 534 insertions, 219 deletions
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs index 02c1333e8..c609533df 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs @@ -2876,6 +2876,12 @@ namespace Tango.BL.Enumerations E_NO_COMMUNICATION_WITH_IDS_5_BOARD = 105022, /// <summary> + /// (No communication with waste load cell. Cannot execute job) + /// </summary> + [Description("No communication with waste load cell. Cannot execute job")] + E_NO_COMMUNICATION_WITH_WASTE_LOADCELL = 105023, + + /// <summary> /// (Left door is open) /// </summary> [Description("Left door is open")] @@ -4226,16 +4232,46 @@ namespace Tango.BL.Enumerations E_WASTE_JERRYCAN_AND_SUB_TANKS_ARE_FULL = 113002, /// <summary> - /// (No draining from IDU-Chimney sub-tank. Cannot execute job) + /// (No draining from IDU-Chimney sub-tank due to timeout. Cannot execute job) + /// </summary> + [Description("No draining from IDU-Chimney sub-tank due to timeout. Cannot execute job")] + E_NO_DRAINING_FROM_IDU_CHIMNEY_SUB_TANK_TIMEOUT = 113003, + + /// <summary> + /// (No draining from IFS-Dryer sub-tank due to timeout. Cannot execute job) + /// </summary> + [Description("No draining from IFS-Dryer sub-tank due to timeout. Cannot execute job")] + E_NO_DRAINING_FROM_IFS_DRYER_SUB_TANK_TIMEOUT = 113004, + + /// <summary> + /// (No draining from IDU-Chimney sub-tank due to emptying issue. Cannot execute job) + /// </summary> + [Description("No draining from IDU-Chimney sub-tank due to emptying issue. Cannot execute job")] + E_NO_DRAINING_FROM_IDU_CHIMNEY_SUB_TANK_ISSUE = 113005, + + /// <summary> + /// (No draining from IFS-Dryer sub-tank due to emptying issue. Cannot execute job) + /// </summary> + [Description("No draining from IFS-Dryer sub-tank due to emptying issue. Cannot execute job")] + E_NO_DRAINING_FROM_IFS_DRYER_SUB_TANK_ISSUE = 113006, + + /// <summary> + /// (IDU-Chimney sub-tank pump malfunction. Cannot execute job) + /// </summary> + [Description("IDU-Chimney sub-tank pump malfunction. Cannot execute job")] + E_IDU_CHIMNEY_SUB_TANK_PUMP_MALFUNCTION = 113007, + + /// <summary> + /// (IFS-Dryer sub-tank pump malfunction. Cannot execute job) /// </summary> - [Description("No draining from IDU-Chimney sub-tank. Cannot execute job")] - E_NO_DRAINING_FROM_IDU_CHIMNEY_SUB_TANK = 113003, + [Description("IFS-Dryer sub-tank pump malfunction. Cannot execute job")] + E_IFS_DRYER_SUB_TANK_PUMP_MALFUNCTION = 113008, /// <summary> - /// (No draining from IFS-Dryer sub-tank. Cannot execute job) + /// (Waste jerrycan presence switch malfunction. Cannot execute job) /// </summary> - [Description("No draining from IFS-Dryer sub-tank. Cannot execute job")] - E_NO_DRAINING_FROM_IFS_DRYER_SUB_TANK = 113004, + [Description("Waste jerrycan presence switch malfunction. Cannot execute job")] + E_WASTE_JERRYCAN_PRESENCE_SWITCH_MALFUNCTION = 113009, } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechIos.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechIos.cs index e1c485e53..84363b622 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechIos.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechIos.cs @@ -2545,5 +2545,35 @@ namespace Tango.BL.Enumerations [Description("SafetyCirculatorAirflow")] SafetyCirculatorAirflow = 420, + /// <summary> + /// (Block Subtanks) + /// </summary> + [Description("Block Subtanks")] + BlockSubtanks = 421, + + /// <summary> + /// (Waste System Error) + /// </summary> + [Description("Waste System Error")] + WasteSystemError = 422, + + /// <summary> + /// (Waste Jerrican Presence) + /// </summary> + [Description("Waste Jerrican Presence")] + WasteJerricanPresence = 423, + + /// <summary> + /// (Front Subtank Full) + /// </summary> + [Description("Front Subtank Full")] + FrontSubtankFull = 424, + + /// <summary> + /// (Rear Subtank Full) + /// </summary> + [Description("Rear Subtank Full")] + RearSubtankFull = 425, + } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs index 373038387..473af6efc 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs @@ -1160,6 +1160,18 @@ namespace Tango.BL.Enumerations EuTunnelTemperature = 1020, /// <summary> + /// (Eureka Waste Front Pump Current) + /// </summary> + [Description("Eureka Waste Front Pump Current")] + EuWasteFrontPumpCurrent = 1401, + + /// <summary> + /// (Eureka Waste Jerrican Weight) + /// </summary> + [Description("Eureka Waste Jerrican Weight")] + EuWasteJerricanWeight = 1400, + + /// <summary> /// (Eureka Waste Level) /// </summary> [Description("Eureka Waste Level")] @@ -1172,6 +1184,12 @@ namespace Tango.BL.Enumerations EuWastePumpVoltage = 1334, /// <summary> + /// (Eureka Waste Rear Pump Current) + /// </summary> + [Description("Eureka Waste Rear Pump Current")] + EuWasteRearPumpCurrent = 1402, + + /// <summary> /// (Eureka Winder Dancer 1) /// </summary> [Description("Eureka Winder Dancer 1")] diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs index 2cccb815b..6a956efb4 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v", - "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIqc7ChNEaWFnbm9zdGljc01vbml0", + "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIoo8ChNEaWFnbm9zdGljc01vbml0", "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD", "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl", "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY", @@ -192,12 +192,14 @@ namespace Tango.PMR.Diagnostics { "bXBlcmF0dXJlGIACIAMoARIfChZFdVB1bXAyQ2FyZFRlbXBlcmF0dXJlGIEC", "IAMoARIfChZFdVB1bXAzQ2FyZFRlbXBlcmF0dXJlGIICIAMoARIfChZFdVB1", "bXA0Q2FyZFRlbXBlcmF0dXJlGIMCIAMoARIfChZFdVB1bXA1Q2FyZFRlbXBl", - "cmF0dXJlGIQCIAMoAUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0", - "aWNzYgZwcm90bzM=")); + "cmF0dXJlGIQCIAMoARIeChVFdVdhc3RlSmVycmljYW5XZWlnaHQYhQIgAygB", + "EiAKF0V1V2FzdGVGcm9udFB1bXBDdXJyZW50GIYCIAMoARIfChZFdVdhc3Rl", + "UmVhclB1bXBDdXJyZW50GIcCIAMoAUIhCh9jb20udHdpbmUudGFuZ28ucG1y", + "LmRpYWdub3N0aWNzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4", "EuBtsr5DispAv", "EuBtsr6DispAv", "EuBtsr7DispAv", "EuBtsr8DispAv", "EuBtsr5PeakMax", "EuBtsr6PeakMax", "EuBtsr7PeakMax", "EuBtsr8PeakMax", "EuBtsr5PeakMin", "EuBtsr6PeakMin", "EuBtsr7PeakMin", "EuBtsr8PeakMin", "EuBtsr5Speed", "EuBtsr6Speed", "EuBtsr7Speed", "EuBtsr8Speed", "EuBtsr5SpeedAv", "EuBtsr6SpeedAv", "EuBtsr7SpeedAv", "EuBtsr8SpeedAv", "EuDispenser17Voltage", "EuDispenser18Voltage", "EuDispenser19Voltage", "EuDispenser20Voltage", "EuDispenser21Voltage", "EuDispenser22Voltage", "EuDispenser9Pressure", "EuDispenser10Pressure", "EuDispenser11Pressure", "EuMidTank9Level", "EuMidTank1Level0", "EuMidTank1Level1", "EuPump1Current", "EuPump2Current", "EuPump3Current", "EuPump4Current", "EuPump5Current", "EuPump6Current", "EuPump7Current", "EuPump8Current", "EuPump9Current", "EuPump10Current", "EuPump11Current", "EuPump12Current", "EuPump13Current", "EuPump14Current", "EuPump15Current", "EuPump16Current", "EuPump17Current", "EuPump18Current", "EuPump19Current", "EuPump20Current", "EuPump21Current", "EuPump22Current", "EuWastePumpVoltage", "EuDryerOutgoingAirflow", "EuDryerIncomingVoltage", "EuDryerOutgoingVoltage", "EuDryerAirTemperature", "EuPump1CardTemperature", "EuPump2CardTemperature", "EuPump3CardTemperature", "EuPump4CardTemperature", "EuPump5CardTemperature" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4", "EuBtsr5DispAv", "EuBtsr6DispAv", "EuBtsr7DispAv", "EuBtsr8DispAv", "EuBtsr5PeakMax", "EuBtsr6PeakMax", "EuBtsr7PeakMax", "EuBtsr8PeakMax", "EuBtsr5PeakMin", "EuBtsr6PeakMin", "EuBtsr7PeakMin", "EuBtsr8PeakMin", "EuBtsr5Speed", "EuBtsr6Speed", "EuBtsr7Speed", "EuBtsr8Speed", "EuBtsr5SpeedAv", "EuBtsr6SpeedAv", "EuBtsr7SpeedAv", "EuBtsr8SpeedAv", "EuDispenser17Voltage", "EuDispenser18Voltage", "EuDispenser19Voltage", "EuDispenser20Voltage", "EuDispenser21Voltage", "EuDispenser22Voltage", "EuDispenser9Pressure", "EuDispenser10Pressure", "EuDispenser11Pressure", "EuMidTank9Level", "EuMidTank1Level0", "EuMidTank1Level1", "EuPump1Current", "EuPump2Current", "EuPump3Current", "EuPump4Current", "EuPump5Current", "EuPump6Current", "EuPump7Current", "EuPump8Current", "EuPump9Current", "EuPump10Current", "EuPump11Current", "EuPump12Current", "EuPump13Current", "EuPump14Current", "EuPump15Current", "EuPump16Current", "EuPump17Current", "EuPump18Current", "EuPump19Current", "EuPump20Current", "EuPump21Current", "EuPump22Current", "EuWastePumpVoltage", "EuDryerOutgoingAirflow", "EuDryerIncomingVoltage", "EuDryerOutgoingVoltage", "EuDryerAirTemperature", "EuPump1CardTemperature", "EuPump2CardTemperature", "EuPump3CardTemperature", "EuPump4CardTemperature", "EuPump5CardTemperature", "EuWasteJerricanWeight", "EuWasteFrontPumpCurrent", "EuWasteRearPumpCurrent" }, null, null, null) })); } #endregion @@ -488,6 +490,9 @@ namespace Tango.PMR.Diagnostics { euPump3CardTemperature_ = other.euPump3CardTemperature_.Clone(); euPump4CardTemperature_ = other.euPump4CardTemperature_.Clone(); euPump5CardTemperature_ = other.euPump5CardTemperature_.Clone(); + euWasteJerricanWeight_ = other.euWasteJerricanWeight_.Clone(); + euWasteFrontPumpCurrent_ = other.euWasteFrontPumpCurrent_.Clone(); + euWasteRearPumpCurrent_ = other.euWasteRearPumpCurrent_.Clone(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -3875,6 +3880,45 @@ namespace Tango.PMR.Diagnostics { get { return euPump5CardTemperature_; } } + /// <summary>Field number for the "EuWasteJerricanWeight" field.</summary> + public const int EuWasteJerricanWeightFieldNumber = 261; + private static readonly pb::FieldCodec<double> _repeated_euWasteJerricanWeight_codec + = pb::FieldCodec.ForDouble(2090); + private readonly pbc::RepeatedField<double> euWasteJerricanWeight_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka Waste Jerrican Weight (Min = 0, Max = 5000, PPF = 1) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuWasteJerricanWeight { + get { return euWasteJerricanWeight_; } + } + + /// <summary>Field number for the "EuWasteFrontPumpCurrent" field.</summary> + public const int EuWasteFrontPumpCurrentFieldNumber = 262; + private static readonly pb::FieldCodec<double> _repeated_euWasteFrontPumpCurrent_codec + = pb::FieldCodec.ForDouble(2098); + private readonly pbc::RepeatedField<double> euWasteFrontPumpCurrent_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka Waste Front Pump Current (Min = 0, Max = 1000, PPF = 1) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuWasteFrontPumpCurrent { + get { return euWasteFrontPumpCurrent_; } + } + + /// <summary>Field number for the "EuWasteRearPumpCurrent" field.</summary> + public const int EuWasteRearPumpCurrentFieldNumber = 263; + private static readonly pb::FieldCodec<double> _repeated_euWasteRearPumpCurrent_codec + = pb::FieldCodec.ForDouble(2106); + private readonly pbc::RepeatedField<double> euWasteRearPumpCurrent_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka Waste Rear Pump Current (Min = 0, Max = 1000, PPF = 1) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuWasteRearPumpCurrent { + get { return euWasteRearPumpCurrent_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as DiagnosticsMonitors); @@ -4148,6 +4192,9 @@ namespace Tango.PMR.Diagnostics { if(!euPump3CardTemperature_.Equals(other.euPump3CardTemperature_)) return false; if(!euPump4CardTemperature_.Equals(other.euPump4CardTemperature_)) return false; if(!euPump5CardTemperature_.Equals(other.euPump5CardTemperature_)) return false; + if(!euWasteJerricanWeight_.Equals(other.euWasteJerricanWeight_)) return false; + if(!euWasteFrontPumpCurrent_.Equals(other.euWasteFrontPumpCurrent_)) return false; + if(!euWasteRearPumpCurrent_.Equals(other.euWasteRearPumpCurrent_)) return false; return true; } @@ -4414,6 +4461,9 @@ namespace Tango.PMR.Diagnostics { hash ^= euPump3CardTemperature_.GetHashCode(); hash ^= euPump4CardTemperature_.GetHashCode(); hash ^= euPump5CardTemperature_.GetHashCode(); + hash ^= euWasteJerricanWeight_.GetHashCode(); + hash ^= euWasteFrontPumpCurrent_.GetHashCode(); + hash ^= euWasteRearPumpCurrent_.GetHashCode(); return hash; } @@ -4684,6 +4734,9 @@ namespace Tango.PMR.Diagnostics { euPump3CardTemperature_.WriteTo(output, _repeated_euPump3CardTemperature_codec); euPump4CardTemperature_.WriteTo(output, _repeated_euPump4CardTemperature_codec); euPump5CardTemperature_.WriteTo(output, _repeated_euPump5CardTemperature_codec); + euWasteJerricanWeight_.WriteTo(output, _repeated_euWasteJerricanWeight_codec); + euWasteFrontPumpCurrent_.WriteTo(output, _repeated_euWasteFrontPumpCurrent_codec); + euWasteRearPumpCurrent_.WriteTo(output, _repeated_euWasteRearPumpCurrent_codec); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -4949,6 +5002,9 @@ namespace Tango.PMR.Diagnostics { size += euPump3CardTemperature_.CalculateSize(_repeated_euPump3CardTemperature_codec); size += euPump4CardTemperature_.CalculateSize(_repeated_euPump4CardTemperature_codec); size += euPump5CardTemperature_.CalculateSize(_repeated_euPump5CardTemperature_codec); + size += euWasteJerricanWeight_.CalculateSize(_repeated_euWasteJerricanWeight_codec); + size += euWasteFrontPumpCurrent_.CalculateSize(_repeated_euWasteFrontPumpCurrent_codec); + size += euWasteRearPumpCurrent_.CalculateSize(_repeated_euWasteRearPumpCurrent_codec); return size; } @@ -5217,6 +5273,9 @@ namespace Tango.PMR.Diagnostics { euPump3CardTemperature_.Add(other.euPump3CardTemperature_); euPump4CardTemperature_.Add(other.euPump4CardTemperature_); euPump5CardTemperature_.Add(other.euPump5CardTemperature_); + euWasteJerricanWeight_.Add(other.euWasteJerricanWeight_); + euWasteFrontPumpCurrent_.Add(other.euWasteFrontPumpCurrent_); + euWasteRearPumpCurrent_.Add(other.euWasteRearPumpCurrent_); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -6517,6 +6576,21 @@ namespace Tango.PMR.Diagnostics { euPump5CardTemperature_.AddEntriesFrom(input, _repeated_euPump5CardTemperature_codec); break; } + case 2090: + case 2089: { + euWasteJerricanWeight_.AddEntriesFrom(input, _repeated_euWasteJerricanWeight_codec); + break; + } + case 2098: + case 2097: { + euWasteFrontPumpCurrent_.AddEntriesFrom(input, _repeated_euWasteFrontPumpCurrent_codec); + break; + } + case 2106: + case 2105: { + euWasteRearPumpCurrent_.AddEntriesFrom(input, _repeated_euWasteRearPumpCurrent_codec); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index 0c03f9be2..6ab992e15 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Diagnostics { static EventTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyqVxQEK", + "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyrLxwEK", "CUV2ZW50VHlwZRIICgROb25lEAASEQoMUkVRVUVTVF9TRU5UEOgHEhYKEVJF", "U1BPTlNFX1JFQ0VJVkVEEOkHEhMKDlJFUVVFU1RfRkFJTEVEEOoHEhoKFUFQ", "UExJQ0FUSU9OX0VYQ0VQVElPThDrBxIcChdBUFBMSUNBVElPTl9JTkZPUk1B", @@ -392,199 +392,206 @@ namespace Tango.PMR.Diagnostics { "JAoeRV9OT19DT01NVU5JQ0FUSU9OX1dJVEhfQlRTUl82ELu0BhIkCh5FX05P", "X0NPTU1VTklDQVRJT05fV0lUSF9CVFNSXzcQvLQGEiQKHkVfTk9fQ09NTVVO", "SUNBVElPTl9XSVRIX0JUU1JfOBC9tAYSKQojRV9OT19DT01NVU5JQ0FUSU9O", - "X1dJVEhfSURTXzVfQk9BUkQQvrQGEhYKEEVfTEVGVF9ET09SX09QRU4QkLwG", - "EhcKEUVfUklHSFRfRE9PUl9PUEVOEJG8BhIVCg9FX1RPUF9ET09SX09QRU4Q", - "krwGEhoKFEVfVFVOTkVMX0xJRF9JU19PUEVOEJO8BhIXChFFX0FSQ19MSURf", - "SVNfT1BFThCUvAYSGQoTRV9EUllFUl9MSURfSVNfT1BFThCVvAYSGgoURV9C", - "VFNSXzFfTUFMRlVOQ1RJT04Q+MMGEhoKFEVfQlRTUl8yX01BTEZVTkNUSU9O", - "EPnDBhIaChRFX0JUU1JfM19NQUxGVU5DVElPThD6wwYSGgoURV9CVFNSXzRf", - "TUFMRlVOQ1RJT04Q+8MGEikKI0VfVEVOU0lPTl9JTl9CVFNSXzFfSVNfT1VU", - "X09GX1JBTkdFEPzDBhIpCiNFX1RFTlNJT05fSU5fQlRTUl8yX0lTX09VVF9P", - "Rl9SQU5HRRD9wwYSKQojRV9URU5TSU9OX0lOX0JUU1JfM19JU19PVVRfT0Zf", - "UkFOR0UQ/sMGEikKI0VfVEVOU0lPTl9JTl9CVFNSXzRfSVNfT1VUX09GX1JB", - "TkdFEP/DBhIUCg5FX1RIUkVBRF9CUkVBSxCAxAYSKAoiRV9EQU5DRVJfMV9U", - "RU5TSU9OX0NPTlRST0xfRkFJTFVSRRCBxAYSKAoiRV9EQU5DRVJfMl9URU5T", - "SU9OX0NPTlRST0xfRkFJTFVSRRCCxAYSKAoiRV9EQU5DRVJfM19URU5TSU9O", - "X0NPTlRST0xfRkFJTFVSRRCDxAYSKAoiRV9EQU5DRVJfNF9URU5TSU9OX0NP", - "TlRST0xfRkFJTFVSRRCExAYSHAoWRV9USFJFQURfTE9BRElOR19FUlJPUhCF", - "xAYSGwoVRV9HUklQUEVSX01BTEZVTkNUSU9OEIbEBhIWChBFX1RIUkVBRF9N", - "SVNTSU5HEIfEBhIhChtFX0xPQURJTkdfQ09NQl9OT1RfSU5fUExBQ0UQiMQG", - "EhoKFEVfQlRTUl81X01BTEZVTkNUSU9OEInEBhIaChRFX0JUU1JfNl9NQUxG", - "VU5DVElPThCKxAYSGgoURV9CVFNSXzdfTUFMRlVOQ1RJT04Qi8QGEhoKFEVf", - "QlRTUl84X01BTEZVTkNUSU9OEIzEBhIpCiNFX1RFTlNJT05fSU5fQlRTUl81", - "X0lTX09VVF9PRl9SQU5HRRCNxAYSKQojRV9URU5TSU9OX0lOX0JUU1JfNl9J", - "U19PVVRfT0ZfUkFOR0UQjsQGEikKI0VfVEVOU0lPTl9JTl9CVFNSXzdfSVNf", - "T1VUX09GX1JBTkdFEI/EBhIpCiNFX1RFTlNJT05fSU5fQlRTUl84X0lTX09V", - "VF9PRl9SQU5HRRCQxAYSFgoQRV9CVFNSXzFfU1RPUFBFRBCRxAYSFgoQRV9C", - "VFNSXzJfU1RPUFBFRBCSxAYSFgoQRV9CVFNSXzNfU1RPUFBFRBCTxAYSFgoQ", - "RV9CVFNSXzRfU1RPUFBFRBCUxAYSFgoQRV9CVFNSXzVfU1RPUFBFRBCVxAYS", - "FgoQRV9CVFNSXzZfU1RPUFBFRBCWxAYSFgoQRV9CVFNSXzdfU1RPUFBFRBCX", - "xAYSFgoQRV9CVFNSXzhfU1RPUFBFRBCYxAYSHgoYRV9XSU5ERVJfMV9NT1RP", - "Ul9TVE9QUEVEEJnEBhIeChhFX1dJTkRFUl8yX01PVE9SX1NUT1BQRUQQmsQG", - "Eh4KGEVfV0lOREVSXzNfTU9UT1JfU1RPUFBFRBCbxAYSHgoYRV9XSU5ERVJf", - "NF9NT1RPUl9TVE9QUEVEEJzEBhIsCiZFX0RZRUlOR19IRUFEX1pPTkVfMV9P", - "VkVSVEVNUEVSQVRVUkVfQRDgywYSLAomRV9EWUVJTkdfSEVBRF9aT05FXzJf", - "T1ZFUlRFTVBFUkFUVVJFX0EQ4csGEiwKJkVfRFlFSU5HX0hFQURfWk9ORV8z", - "X09WRVJURU1QRVJBVFVSRV9BEOLLBhIhChtFX01JWEVSXzFfT1ZFUlRFTVBF", - "UkFUVVJFX0EQ48sGEiEKG0VfTUlYRVJfMl9PVkVSVEVNUEVSQVRVUkVfQRDk", - "ywYSIAoaRV9UVU5ORUxfT1ZFUlRFTVBFUkFUVVJFX0EQ5csGEigKIkVfRFJZ", - "RVJfSEVBVEVSXzFfT1ZFUlRFTVBFUkFUVVJFX0EQ58sGEigKIkVfRFJZRVJf", - "SEVBVEVSXzJfT1ZFUlRFTVBFUkFUVVJFX0EQ6MsGEigKIkVfRFJZRVJfSEVB", - "VEVSXzNfT1ZFUlRFTVBFUkFUVVJFX0EQ6csGEiMKHUVfTFVCUklDQU5UX09W", - "RVJURU1QRVJBVFVSRV9BEOrLBhItCidFX0RZRUlOR19IRUFEX1pPTkVfMV9V", - "TkRFUlRFTVBFUkFUVVJFX0EQ68sGEi0KJ0VfRFlFSU5HX0hFQURfWk9ORV8y", - "X1VOREVSVEVNUEVSQVRVUkVfQRDsywYSLQonRV9EWUVJTkdfSEVBRF9aT05F", - "XzNfVU5ERVJURU1QRVJBVFVSRV9BEO3LBhIiChxFX01JWEVSXzFfVU5ERVJU", - "RU1QRVJBVFVSRV9BEO7LBhIiChxFX01JWEVSXzJfVU5ERVJURU1QRVJBVFVS", - "RV9BEO/LBhIhChtFX1RVTk5FTF9VTkRFUlRFTVBFUkFUVVJFX0EQ8MsGEikK", - "I0VfRFJZRVJfSEVBVEVSXzFfVU5ERVJURU1QRVJBVFVSRV9BEPHLBhIpCiNF", - "X0RSWUVSX0hFQVRFUl8yX1VOREVSVEVNUEVSQVRVUkVfQRDyywYSKQojRV9E", - "UllFUl9IRUFURVJfM19VTkRFUlRFTVBFUkFUVVJFX0EQ88sGEiQKHkVfTFVC", - "UklDQU5UX1VOREVSVEVNUEVSQVRVUkVfQRD0ywYSLQonRV9EWUVJTkdfSEVB", - "RF9aT05FXzFfVU5ERVJURU1QRVJBVFVSRV9CEPXLBhItCidFX0RZRUlOR19I", - "RUFEX1pPTkVfMl9VTkRFUlRFTVBFUkFUVVJFX0IQ9ssGEi0KJ0VfRFlFSU5H", - "X0hFQURfWk9ORV8zX1VOREVSVEVNUEVSQVRVUkVfQhD3ywYSIgocRV9NSVhF", - "Ul8xX1VOREVSVEVNUEVSQVRVUkVfQhD4ywYSIgocRV9NSVhFUl8yX1VOREVS", - "VEVNUEVSQVRVUkVfQhD5ywYSIQobRV9UVU5ORUxfVU5ERVJURU1QRVJBVFVS", - "RV9CEPrLBhIpCiNFX0RSWUVSX0hFQVRFUl8xX1VOREVSVEVNUEVSQVRVUkVf", - "QhD7ywYSKQojRV9EUllFUl9IRUFURVJfMl9VTkRFUlRFTVBFUkFUVVJFX0IQ", - "/MsGEikKI0VfRFJZRVJfSEVBVEVSXzNfVU5ERVJURU1QRVJBVFVSRV9CEP3L", - "BhIkCh5FX0xVQlJJQ0FOVF9VTkRFUlRFTVBFUkFUVVJFX0IQ/ssGEiwKJkVf", - "V0hTXzFfQ09PTEVSX1RFTVBFUkFUVVJFX0lTX1RPT19ISUdIEP/LBhIrCiVF", - "X1dIU18xX0NPT0xFUl9URU1QRVJBVFVSRV9JU19UT09fTE9XEIDMBhIsCiZF", - "X1dIU18yX0NPT0xFUl9URU1QRVJBVFVSRV9JU19UT09fSElHSBCBzAYSKwol", - "RV9XSFNfMl9DT09MRVJfVEVNUEVSQVRVUkVfSVNfVE9PX0xPVxCCzAYSJQof", - "RV9URU1QRVJBVFVSRV9NRUFTVVJFTUVOVF9FUlJPUhCDzAYSKgokRV9EUllF", - "Ul9JTlRFUk5BTF9URU1QRVJBVFVSRV9UT09fTE9XEITMBhIsCiZFX0RZRUlO", - "R19IRUFEX1pPTkVfMV9PVkVSVEVNUEVSQVRVUkVfQhCFzAYSLAomRV9EWUVJ", - "TkdfSEVBRF9aT05FXzJfT1ZFUlRFTVBFUkFUVVJFX0IQhswGEiwKJkVfRFlF", - "SU5HX0hFQURfWk9ORV8zX09WRVJURU1QRVJBVFVSRV9CEIfMBhIhChtFX01J", - "WEVSXzFfT1ZFUlRFTVBFUkFUVVJFX0IQiMwGEiEKG0VfTUlYRVJfMl9PVkVS", - "VEVNUEVSQVRVUkVfQhCJzAYSIAoaRV9UVU5ORUxfT1ZFUlRFTVBFUkFUVVJF", - "X0IQiswGEigKIkVfRFJZRVJfSEVBVEVSXzFfT1ZFUlRFTVBFUkFUVVJFX0IQ", - "i8wGEigKIkVfRFJZRVJfSEVBVEVSXzJfT1ZFUlRFTVBFUkFUVVJFX0IQjMwG", - "EigKIkVfRFJZRVJfSEVBVEVSXzNfT1ZFUlRFTVBFUkFUVVJFX0IQjcwGEiMK", - "HUVfTFVCUklDQU5UX09WRVJURU1QRVJBVFVSRV9CEI7MBhIlCh9FX0lEU19B", - "TUJJRU5UXzFfT1ZFUlRFTVBFUkFUVVJFEI/MBhIlCh9FX0lEU19BTUJJRU5U", - "XzJfT1ZFUlRFTVBFUkFUVVJFEJDMBhIvCilFX0RZRUlOR19IRUFEX1pPTkVf", - "MV9DVVJSRU5UX09VVF9PRl9SQU5HRRDI0wYSLwopRV9EWUVJTkdfSEVBRF9a", - "T05FXzJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQydMGEi8KKUVfRFlFSU5HX0hF", - "QURfWk9ORV8zX0NVUlJFTlRfT1VUX09GX1JBTkdFEMrTBhIrCiVFX01JWEVS", - "XzFfSEVBVEVSX0NVUlJFTlRfT1VUX09GX1JBTkdFEMvTBhIrCiVFX01JWEVS", - "XzJfSEVBVEVSX0NVUlJFTlRfT1VUX09GX1JBTkdFEMzTBhIqCiRFX1RVTk5F", - "TF9IRUFURVJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQzdMGEisKJUVfRFJZRVJf", - "SEVBVEVSXzFfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQztMGEisKJUVfRFJZRVJf", - "SEVBVEVSXzJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQz9MGEisKJUVfRFJZRVJf", - "SEVBVEVSXzNfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ0NMGEi0KJ0VfTFVCUklD", - "QU5UX0hFQVRFUl9DVVJSRU5UX09VVF9PRl9SQU5HRRDR0wYSLQonRV9EWUVJ", - "TkdfSEVBRF9aT05FXzFfQ1VSUkVOVF9MT09QX0JSRUFLENLTBhItCidFX0RZ", - "RUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQ09MGEi0KJ0Vf", - "RFlFSU5HX0hFQURfWk9ORV8zX0NVUlJFTlRfTE9PUF9CUkVBSxDU0wYSKQoj", - "RV9NSVhFUl8xX0hFQVRFUl9DVVJSRU5UX0xPT1BfQlJFQUsQ1dMGEikKI0Vf", - "TUlYRVJfMl9IRUFURVJfQ1VSUkVOVF9MT09QX0JSRUFLENbTBhIoCiJFX1RV", - "Tk5FTF9IRUFURVJfQ1VSUkVOVF9MT09QX0JSRUFLENfTBhIpCiNFX0RSWUVS", - "X0hFQVRFUl8xX0NVUlJFTlRfTE9PUF9CUkVBSxDY0wYSKQojRV9EUllFUl9I", - "RUFURVJfMl9DVVJSRU5UX0xPT1BfQlJFQUsQ2dMGEikKI0VfRFJZRVJfSEVB", - "VEVSXzNfQ1VSUkVOVF9MT09QX0JSRUFLENrTBhIrCiVFX0xVQlJJQ0FOVF9I", - "RUFURVJfQ1VSUkVOVF9MT09QX0JSRUFLENvTBhIkCh5FX0RSWUVSX01BSU5f", - "TU9UT1JfTUFMRlVOQ1RJT04QsNsGEi4KKEVfRFJZRVJfVEhSRUFEX0xPQURJ", - "TkdfTU9UT1JfTUFMRlVOQ1RJT04QsdsGEiIKHEVfV0lOREVSXzFfTU9UT1Jf", - "TUFMRlVOQ1RJT04QstsGEiIKHEVfV0lOREVSXzJfTU9UT1JfTUFMRlVOQ1RJ", - "T04Qs9sGEiIKHEVfV0lOREVSXzNfTU9UT1JfTUFMRlVOQ1RJT04QtNsGEiIK", - "HEVfV0lOREVSXzRfTU9UT1JfTUFMRlVOQ1RJT04QtdsGEiIKHEVfREFOQ0VS", - "XzFfTU9UT1JfTUFMRlVOQ1RJT04QttsGEiIKHEVfREFOQ0VSXzJfTU9UT1Jf", - "TUFMRlVOQ1RJT04Qt9sGEiIKHEVfREFOQ0VSXzNfTU9UT1JfTUFMRlVOQ1RJ", - "T04QuNsGEiIKHEVfREFOQ0VSXzRfTU9UT1JfTUFMRlVOQ1RJT04QudsGEi0K", - "J0VfRFlFSU5HX0hFQURfQ0xFQU5FUl9NT1RPUl9NQUxGVU5DVElPThC62wYS", - "JwohRV9EUllFUl9QVVNIX0JMT1dFUl9GTE9XX1VOU1RBQkxFEJjjBhIqCiRF", - "X0RSWUVSX1NVQ1RJT05fQkxPV0VSX0ZMT1dfVU5TVEFCTEUQmeMGEigKIkVf", - "VFVOTkVMX1BVU0hfQkxPV0VSX0ZMT1dfVU5TVEFCTEUQmuMGEisKJUVfVFVO", - "TkVMX1NVQ1RJT05fQkxPV0VSX0ZMT1dfVU5TVEFCTEUQm+MGEicKIUVfSURT", - "X0FJUl9DT05ESVRJT05FUl9NQUxGVU5DVElPThCc4wYSHwoZRV9EUllFUl9Q", - "VVNIX0ZMT1dfVE9PX0xPVxCd4wYSIgocRV9EUllFUl9TVUNUSU9OX0ZMT1df", - "VE9PX0xPVxCe4wYSIAoaRV9UVU5ORUxfUFVTSF9GTE9XX1RPT19MT1cQn+MG", - "EiMKHUVfVFVOTkVMX1NVQ1RJT05fRkxPV19UT09fTE9XEKDjBhIgChpFX0RS", - "WUVSX1BVU0hfRkxPV19UT09fSElHSBCh4wYSIwodRV9EUllFUl9TVUNUSU9O", - "X0ZMT1dfVE9PX0hJR0gQouMGEiEKG0VfVFVOTkVMX1BVU0hfRkxPV19UT09f", - "SElHSBCj4wYSJAoeRV9UVU5ORUxfU1VDVElPTl9GTE9XX1RPT19ISUdIEKTj", - "BhIkCh5FX0lOS19MSU5FXzFfUFJFU1NVUkVfVE9PX0hJR0gQgOsGEiQKHkVf", - "SU5LX0xJTkVfMl9QUkVTU1VSRV9UT09fSElHSBCB6wYSJAoeRV9JTktfTElO", - "RV8zX1BSRVNTVVJFX1RPT19ISUdIEILrBhIkCh5FX0lOS19MSU5FXzRfUFJF", - "U1NVUkVfVE9PX0hJR0gQg+sGEiQKHkVfSU5LX0xJTkVfNV9QUkVTU1VSRV9U", - "T09fSElHSBCE6wYSJAoeRV9JTktfTElORV82X1BSRVNTVVJFX1RPT19ISUdI", - "EIXrBhIkCh5FX0lOS19MSU5FXzdfUFJFU1NVUkVfVE9PX0hJR0gQhusGEiQK", - "HkVfSU5LX0xJTkVfOF9QUkVTU1VSRV9UT09fSElHSBCH6wYSJAoeRV9JTktf", - "TElORV85X1BSRVNTVVJFX1RPT19ISUdIEIjrBhIlCh9FX0lOS19MSU5FXzEw", - "X1BSRVNTVVJFX1RPT19ISUdIEInrBhIjCh1FX0lOS19MSU5FXzFfUFJFU1NV", - "UkVfVE9PX0xPVxCK6wYSIwodRV9JTktfTElORV8yX1BSRVNTVVJFX1RPT19M", - "T1cQi+sGEiMKHUVfSU5LX0xJTkVfM19QUkVTU1VSRV9UT09fTE9XEIzrBhIj", - "Ch1FX0lOS19MSU5FXzRfUFJFU1NVUkVfVE9PX0xPVxCN6wYSIwodRV9JTktf", - "TElORV81X1BSRVNTVVJFX1RPT19MT1cQjusGEiMKHUVfSU5LX0xJTkVfNl9Q", - "UkVTU1VSRV9UT09fTE9XEI/rBhIjCh1FX0lOS19MSU5FXzdfUFJFU1NVUkVf", - "VE9PX0xPVxCQ6wYSIwodRV9JTktfTElORV84X1BSRVNTVVJFX1RPT19MT1cQ", - "kesGEiMKHUVfSU5LX0xJTkVfOV9QUkVTU1VSRV9UT09fTE9XEJLrBhIkCh5F", - "X0lOS19MSU5FXzEwX1BSRVNTVVJFX1RPT19MT1cQk+sGEh4KGEVfSU5LX1BV", - "TVBfMV9NQUxGVU5DVElPThCU6wYSHgoYRV9JTktfUFVNUF8yX01BTEZVTkNU", - "SU9OEJXrBhIeChhFX0lOS19QVU1QXzNfTUFMRlVOQ1RJT04QlusGEh4KGEVf", - "SU5LX1BVTVBfNF9NQUxGVU5DVElPThCX6wYSHgoYRV9JTktfUFVNUF81X01B", - "TEZVTkNUSU9OEJjrBhIeChhFX0lOS19QVU1QXzZfTUFMRlVOQ1RJT04QmesG", - "Eh4KGEVfSU5LX1BVTVBfN19NQUxGVU5DVElPThCa6wYSHgoYRV9JTktfUFVN", - "UF84X01BTEZVTkNUSU9OEJvrBhIeChhFX0lOS19QVU1QXzlfTUFMRlVOQ1RJ", - "T04QnOsGEh8KGUVfSU5LX1BVTVBfMTBfTUFMRlVOQ1RJT04QnesGEh8KGUVf", - "SU5LX1BVTVBfMTFfTUFMRlVOQ1RJT04QnusGEh8KGUVfSU5LX1BVTVBfMTJf", - "TUFMRlVOQ1RJT04Qn+sGEh8KGUVfSU5LX1BVTVBfMTNfTUFMRlVOQ1RJT04Q", - "oOsGEh8KGUVfSU5LX1BVTVBfMTRfTUFMRlVOQ1RJT04QoesGEh8KGUVfSU5L", - "X1BVTVBfMTVfTUFMRlVOQ1RJT04QousGEiUKH0VfSU5LX0xJTkVfMV9NSURf", - "VEFOS19MT1dfTEVWRUwQo+sGEiUKH0VfSU5LX0xJTkVfMl9NSURfVEFOS19M", - "T1dfTEVWRUwQpOsGEiUKH0VfSU5LX0xJTkVfM19NSURfVEFOS19MT1dfTEVW", - "RUwQpesGEiUKH0VfSU5LX0xJTkVfNF9NSURfVEFOS19MT1dfTEVWRUwQpusG", - "EiUKH0VfSU5LX0xJTkVfNV9NSURfVEFOS19MT1dfTEVWRUwQp+sGEiUKH0Vf", - "SU5LX0xJTkVfNl9NSURfVEFOS19MT1dfTEVWRUwQqOsGEiUKH0VfSU5LX0xJ", - "TkVfN19NSURfVEFOS19MT1dfTEVWRUwQqesGEiUKH0VfSU5LX0xJTkVfOF9N", - "SURfVEFOS19MT1dfTEVWRUwQqusGEiUKH0VfSU5LX0xJTkVfOV9NSURfVEFO", - "S19MT1dfTEVWRUwQq+sGEiYKIEVfSU5LX0xJTkVfMTBfTUlEX1RBTktfTE9X", - "X0xFVkVMEKzrBhIoCiJFX0lOS19MSU5FXzFfTUlEX1RBTktfRklMTF9USU1F", - "T1VUEK3rBhIoCiJFX0lOS19MSU5FXzJfTUlEX1RBTktfRklMTF9USU1FT1VU", - "EK7rBhIoCiJFX0lOS19MSU5FXzNfTUlEX1RBTktfRklMTF9USU1FT1VUEK/r", - "BhIoCiJFX0lOS19MSU5FXzRfTUlEX1RBTktfRklMTF9USU1FT1VUELDrBhIo", - "CiJFX0lOS19MSU5FXzVfTUlEX1RBTktfRklMTF9USU1FT1VUELHrBhIoCiJF", - "X0lOS19MSU5FXzZfTUlEX1RBTktfRklMTF9USU1FT1VUELLrBhIoCiJFX0lO", - "S19MSU5FXzdfTUlEX1RBTktfRklMTF9USU1FT1VUELPrBhIoCiJFX0lOS19M", - "SU5FXzhfTUlEX1RBTktfRklMTF9USU1FT1VUELTrBhIoCiJFX0lOS19MSU5F", - "XzlfTUlEX1RBTktfRklMTF9USU1FT1VUELXrBhIpCiNFX0lOS19MSU5FXzEw", - "X01JRF9UQU5LX0ZJTExfVElNRU9VVBC26wYSJwohRV9JTktfTElORV8xX01J", - "RF9UQU5LX01BTEZVTkNUSU9OELfrBhInCiFFX0lOS19MSU5FXzJfTUlEX1RB", - "TktfTUFMRlVOQ1RJT04QuOsGEicKIUVfSU5LX0xJTkVfM19NSURfVEFOS19N", - "QUxGVU5DVElPThC56wYSJwohRV9JTktfTElORV80X01JRF9UQU5LX01BTEZV", - "TkNUSU9OELrrBhInCiFFX0lOS19MSU5FXzVfTUlEX1RBTktfTUFMRlVOQ1RJ", - "T04Qu+sGEicKIUVfSU5LX0xJTkVfNl9NSURfVEFOS19NQUxGVU5DVElPThC8", - "6wYSJwohRV9JTktfTElORV83X01JRF9UQU5LX01BTEZVTkNUSU9OEL3rBhIn", - "CiFFX0lOS19MSU5FXzhfTUlEX1RBTktfTUFMRlVOQ1RJT04QvusGEicKIUVf", - "SU5LX0xJTkVfOV9NSURfVEFOS19NQUxGVU5DVElPThC/6wYSKAoiRV9JTktf", - "TElORV8xMF9NSURfVEFOS19NQUxGVU5DVElPThDA6wYSHwoZRV9JTktfUFVN", - "UF8xNl9NQUxGVU5DVElPThDB6wYSHwoZRV9JTktfUFVNUF8xN19NQUxGVU5D", - "VElPThDC6wYSHwoZRV9JTktfUFVNUF8xOF9NQUxGVU5DVElPThDD6wYSHwoZ", - "RV9JTktfUFVNUF8xOV9NQUxGVU5DVElPThDE6wYSHwoZRV9JTktfUFVNUF8y", - "MF9NQUxGVU5DVElPThDF6wYSHwoZRV9JTktfUFVNUF8yMV9NQUxGVU5DVElP", - "ThDG6wYSJgogRV9JTktfTElORV8xMV9NSURfVEFOS19MT1dfTEVWRUwQx+sG", - "EikKI0VfSU5LX0xJTkVfMTFfTUlEX1RBTktfRklMTF9USU1FT1VUEMjrBhIo", - "CiJFX0lOS19MSU5FXzExX01JRF9UQU5LX01BTEZVTkNUSU9OEMnrBhIhChtF", - "X0lOS19MSU5FXzFfTUlEX1RBTktfRU1QVFkQyusGEiEKG0VfSU5LX0xJTkVf", - "Ml9NSURfVEFOS19FTVBUWRDL6wYSIQobRV9JTktfTElORV8zX01JRF9UQU5L", - "X0VNUFRZEMzrBhIhChtFX0lOS19MSU5FXzRfTUlEX1RBTktfRU1QVFkQzesG", - "EiEKG0VfSU5LX0xJTkVfNV9NSURfVEFOS19FTVBUWRDO6wYSIQobRV9JTktf", - "TElORV82X01JRF9UQU5LX0VNUFRZEM/rBhIhChtFX0lOS19MSU5FXzdfTUlE", - "X1RBTktfRU1QVFkQ0OsGEiEKG0VfSU5LX0xJTkVfOF9NSURfVEFOS19FTVBU", - "WRDR6wYSIQobRV9JTktfTElORV85X01JRF9UQU5LX0VNUFRZENLrBhIiChxF", - "X0lOS19MSU5FXzEwX01JRF9UQU5LX0VNUFRZENPrBhIiChxFX0lOS19MSU5F", - "XzExX01JRF9UQU5LX0VNUFRZENTrBhIjCh1FX0xVQlJJQ0FOVF9KRVJSWUNB", - "Tl9JU19FTVBUWRDV6wYSJgogRV9MVUJSSUNBTlRfSkVSUllDQU5fTk9UX1BS", - "RVNFTlQQ1usGEiIKHEVfV0FTVEVfSkVSUllDQU5fTk9UX1BSRVNFTlQQ6PIG", - "Eh4KGEVfV0FTVEVfSkVSUllDQU5fSVNfRlVMTBDp8gYSLQonRV9XQVNURV9K", - "RVJSWUNBTl9BTkRfU1VCX1RBTktTX0FSRV9GVUxMEOryBhItCidFX05PX0RS", - "QUlOSU5HX0ZST01fSURVX0NISU1ORVlfU1VCX1RBTksQ6/IGEisKJUVfTk9f", - "RFJBSU5JTkdfRlJPTV9JRlNfRFJZRVJfU1VCX1RBTksQ7PIGQiEKH2NvbS50", - "d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); + "X1dJVEhfSURTXzVfQk9BUkQQvrQGEiwKJkVfTk9fQ09NTVVOSUNBVElPTl9X", + "SVRIX1dBU1RFX0xPQURDRUxMEL+0BhIWChBFX0xFRlRfRE9PUl9PUEVOEJC8", + "BhIXChFFX1JJR0hUX0RPT1JfT1BFThCRvAYSFQoPRV9UT1BfRE9PUl9PUEVO", + "EJK8BhIaChRFX1RVTk5FTF9MSURfSVNfT1BFThCTvAYSFwoRRV9BUkNfTElE", + "X0lTX09QRU4QlLwGEhkKE0VfRFJZRVJfTElEX0lTX09QRU4QlbwGEhoKFEVf", + "QlRTUl8xX01BTEZVTkNUSU9OEPjDBhIaChRFX0JUU1JfMl9NQUxGVU5DVElP", + "ThD5wwYSGgoURV9CVFNSXzNfTUFMRlVOQ1RJT04Q+sMGEhoKFEVfQlRTUl80", + "X01BTEZVTkNUSU9OEPvDBhIpCiNFX1RFTlNJT05fSU5fQlRTUl8xX0lTX09V", + "VF9PRl9SQU5HRRD8wwYSKQojRV9URU5TSU9OX0lOX0JUU1JfMl9JU19PVVRf", + "T0ZfUkFOR0UQ/cMGEikKI0VfVEVOU0lPTl9JTl9CVFNSXzNfSVNfT1VUX09G", + "X1JBTkdFEP7DBhIpCiNFX1RFTlNJT05fSU5fQlRTUl80X0lTX09VVF9PRl9S", + "QU5HRRD/wwYSFAoORV9USFJFQURfQlJFQUsQgMQGEigKIkVfREFOQ0VSXzFf", + "VEVOU0lPTl9DT05UUk9MX0ZBSUxVUkUQgcQGEigKIkVfREFOQ0VSXzJfVEVO", + "U0lPTl9DT05UUk9MX0ZBSUxVUkUQgsQGEigKIkVfREFOQ0VSXzNfVEVOU0lP", + "Tl9DT05UUk9MX0ZBSUxVUkUQg8QGEigKIkVfREFOQ0VSXzRfVEVOU0lPTl9D", + "T05UUk9MX0ZBSUxVUkUQhMQGEhwKFkVfVEhSRUFEX0xPQURJTkdfRVJST1IQ", + "hcQGEhsKFUVfR1JJUFBFUl9NQUxGVU5DVElPThCGxAYSFgoQRV9USFJFQURf", + "TUlTU0lORxCHxAYSIQobRV9MT0FESU5HX0NPTUJfTk9UX0lOX1BMQUNFEIjE", + "BhIaChRFX0JUU1JfNV9NQUxGVU5DVElPThCJxAYSGgoURV9CVFNSXzZfTUFM", + "RlVOQ1RJT04QisQGEhoKFEVfQlRTUl83X01BTEZVTkNUSU9OEIvEBhIaChRF", + "X0JUU1JfOF9NQUxGVU5DVElPThCMxAYSKQojRV9URU5TSU9OX0lOX0JUU1Jf", + "NV9JU19PVVRfT0ZfUkFOR0UQjcQGEikKI0VfVEVOU0lPTl9JTl9CVFNSXzZf", + "SVNfT1VUX09GX1JBTkdFEI7EBhIpCiNFX1RFTlNJT05fSU5fQlRTUl83X0lT", + "X09VVF9PRl9SQU5HRRCPxAYSKQojRV9URU5TSU9OX0lOX0JUU1JfOF9JU19P", + "VVRfT0ZfUkFOR0UQkMQGEhYKEEVfQlRTUl8xX1NUT1BQRUQQkcQGEhYKEEVf", + "QlRTUl8yX1NUT1BQRUQQksQGEhYKEEVfQlRTUl8zX1NUT1BQRUQQk8QGEhYK", + "EEVfQlRTUl80X1NUT1BQRUQQlMQGEhYKEEVfQlRTUl81X1NUT1BQRUQQlcQG", + "EhYKEEVfQlRTUl82X1NUT1BQRUQQlsQGEhYKEEVfQlRTUl83X1NUT1BQRUQQ", + "l8QGEhYKEEVfQlRTUl84X1NUT1BQRUQQmMQGEh4KGEVfV0lOREVSXzFfTU9U", + "T1JfU1RPUFBFRBCZxAYSHgoYRV9XSU5ERVJfMl9NT1RPUl9TVE9QUEVEEJrE", + "BhIeChhFX1dJTkRFUl8zX01PVE9SX1NUT1BQRUQQm8QGEh4KGEVfV0lOREVS", + "XzRfTU9UT1JfU1RPUFBFRBCcxAYSLAomRV9EWUVJTkdfSEVBRF9aT05FXzFf", + "T1ZFUlRFTVBFUkFUVVJFX0EQ4MsGEiwKJkVfRFlFSU5HX0hFQURfWk9ORV8y", + "X09WRVJURU1QRVJBVFVSRV9BEOHLBhIsCiZFX0RZRUlOR19IRUFEX1pPTkVf", + "M19PVkVSVEVNUEVSQVRVUkVfQRDiywYSIQobRV9NSVhFUl8xX09WRVJURU1Q", + "RVJBVFVSRV9BEOPLBhIhChtFX01JWEVSXzJfT1ZFUlRFTVBFUkFUVVJFX0EQ", + "5MsGEiAKGkVfVFVOTkVMX09WRVJURU1QRVJBVFVSRV9BEOXLBhIoCiJFX0RS", + "WUVSX0hFQVRFUl8xX09WRVJURU1QRVJBVFVSRV9BEOfLBhIoCiJFX0RSWUVS", + "X0hFQVRFUl8yX09WRVJURU1QRVJBVFVSRV9BEOjLBhIoCiJFX0RSWUVSX0hF", + "QVRFUl8zX09WRVJURU1QRVJBVFVSRV9BEOnLBhIjCh1FX0xVQlJJQ0FOVF9P", + "VkVSVEVNUEVSQVRVUkVfQRDqywYSLQonRV9EWUVJTkdfSEVBRF9aT05FXzFf", + "VU5ERVJURU1QRVJBVFVSRV9BEOvLBhItCidFX0RZRUlOR19IRUFEX1pPTkVf", + "Ml9VTkRFUlRFTVBFUkFUVVJFX0EQ7MsGEi0KJ0VfRFlFSU5HX0hFQURfWk9O", + "RV8zX1VOREVSVEVNUEVSQVRVUkVfQRDtywYSIgocRV9NSVhFUl8xX1VOREVS", + "VEVNUEVSQVRVUkVfQRDuywYSIgocRV9NSVhFUl8yX1VOREVSVEVNUEVSQVRV", + "UkVfQRDvywYSIQobRV9UVU5ORUxfVU5ERVJURU1QRVJBVFVSRV9BEPDLBhIp", + "CiNFX0RSWUVSX0hFQVRFUl8xX1VOREVSVEVNUEVSQVRVUkVfQRDxywYSKQoj", + "RV9EUllFUl9IRUFURVJfMl9VTkRFUlRFTVBFUkFUVVJFX0EQ8ssGEikKI0Vf", + "RFJZRVJfSEVBVEVSXzNfVU5ERVJURU1QRVJBVFVSRV9BEPPLBhIkCh5FX0xV", + "QlJJQ0FOVF9VTkRFUlRFTVBFUkFUVVJFX0EQ9MsGEi0KJ0VfRFlFSU5HX0hF", + "QURfWk9ORV8xX1VOREVSVEVNUEVSQVRVUkVfQhD1ywYSLQonRV9EWUVJTkdf", + "SEVBRF9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9CEPbLBhItCidFX0RZRUlO", + "R19IRUFEX1pPTkVfM19VTkRFUlRFTVBFUkFUVVJFX0IQ98sGEiIKHEVfTUlY", + "RVJfMV9VTkRFUlRFTVBFUkFUVVJFX0IQ+MsGEiIKHEVfTUlYRVJfMl9VTkRF", + "UlRFTVBFUkFUVVJFX0IQ+csGEiEKG0VfVFVOTkVMX1VOREVSVEVNUEVSQVRV", + "UkVfQhD6ywYSKQojRV9EUllFUl9IRUFURVJfMV9VTkRFUlRFTVBFUkFUVVJF", + "X0IQ+8sGEikKI0VfRFJZRVJfSEVBVEVSXzJfVU5ERVJURU1QRVJBVFVSRV9C", + "EPzLBhIpCiNFX0RSWUVSX0hFQVRFUl8zX1VOREVSVEVNUEVSQVRVUkVfQhD9", + "ywYSJAoeRV9MVUJSSUNBTlRfVU5ERVJURU1QRVJBVFVSRV9CEP7LBhIsCiZF", + "X1dIU18xX0NPT0xFUl9URU1QRVJBVFVSRV9JU19UT09fSElHSBD/ywYSKwol", + "RV9XSFNfMV9DT09MRVJfVEVNUEVSQVRVUkVfSVNfVE9PX0xPVxCAzAYSLAom", + "RV9XSFNfMl9DT09MRVJfVEVNUEVSQVRVUkVfSVNfVE9PX0hJR0gQgcwGEisK", + "JUVfV0hTXzJfQ09PTEVSX1RFTVBFUkFUVVJFX0lTX1RPT19MT1cQgswGEiUK", + "H0VfVEVNUEVSQVRVUkVfTUVBU1VSRU1FTlRfRVJST1IQg8wGEioKJEVfRFJZ", + "RVJfSU5URVJOQUxfVEVNUEVSQVRVUkVfVE9PX0xPVxCEzAYSLAomRV9EWUVJ", + "TkdfSEVBRF9aT05FXzFfT1ZFUlRFTVBFUkFUVVJFX0IQhcwGEiwKJkVfRFlF", + "SU5HX0hFQURfWk9ORV8yX09WRVJURU1QRVJBVFVSRV9CEIbMBhIsCiZFX0RZ", + "RUlOR19IRUFEX1pPTkVfM19PVkVSVEVNUEVSQVRVUkVfQhCHzAYSIQobRV9N", + "SVhFUl8xX09WRVJURU1QRVJBVFVSRV9CEIjMBhIhChtFX01JWEVSXzJfT1ZF", + "UlRFTVBFUkFUVVJFX0IQicwGEiAKGkVfVFVOTkVMX09WRVJURU1QRVJBVFVS", + "RV9CEIrMBhIoCiJFX0RSWUVSX0hFQVRFUl8xX09WRVJURU1QRVJBVFVSRV9C", + "EIvMBhIoCiJFX0RSWUVSX0hFQVRFUl8yX09WRVJURU1QRVJBVFVSRV9CEIzM", + "BhIoCiJFX0RSWUVSX0hFQVRFUl8zX09WRVJURU1QRVJBVFVSRV9CEI3MBhIj", + "Ch1FX0xVQlJJQ0FOVF9PVkVSVEVNUEVSQVRVUkVfQhCOzAYSJQofRV9JRFNf", + "QU1CSUVOVF8xX09WRVJURU1QRVJBVFVSRRCPzAYSJQofRV9JRFNfQU1CSUVO", + "VF8yX09WRVJURU1QRVJBVFVSRRCQzAYSLwopRV9EWUVJTkdfSEVBRF9aT05F", + "XzFfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQyNMGEi8KKUVfRFlFSU5HX0hFQURf", + "Wk9ORV8yX0NVUlJFTlRfT1VUX09GX1JBTkdFEMnTBhIvCilFX0RZRUlOR19I", + "RUFEX1pPTkVfM19DVVJSRU5UX09VVF9PRl9SQU5HRRDK0wYSKwolRV9NSVhF", + "Ul8xX0hFQVRFUl9DVVJSRU5UX09VVF9PRl9SQU5HRRDL0wYSKwolRV9NSVhF", + "Ul8yX0hFQVRFUl9DVVJSRU5UX09VVF9PRl9SQU5HRRDM0wYSKgokRV9UVU5O", + "RUxfSEVBVEVSX0NVUlJFTlRfT1VUX09GX1JBTkdFEM3TBhIrCiVFX0RSWUVS", + "X0hFQVRFUl8xX0NVUlJFTlRfT1VUX09GX1JBTkdFEM7TBhIrCiVFX0RSWUVS", + "X0hFQVRFUl8yX0NVUlJFTlRfT1VUX09GX1JBTkdFEM/TBhIrCiVFX0RSWUVS", + "X0hFQVRFUl8zX0NVUlJFTlRfT1VUX09GX1JBTkdFENDTBhItCidFX0xVQlJJ", + "Q0FOVF9IRUFURVJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ0dMGEi0KJ0VfRFlF", + "SU5HX0hFQURfWk9ORV8xX0NVUlJFTlRfTE9PUF9CUkVBSxDS0wYSLQonRV9E", + "WUVJTkdfSEVBRF9aT05FXzJfQ1VSUkVOVF9MT09QX0JSRUFLENPTBhItCidF", + "X0RZRUlOR19IRUFEX1pPTkVfM19DVVJSRU5UX0xPT1BfQlJFQUsQ1NMGEikK", + "I0VfTUlYRVJfMV9IRUFURVJfQ1VSUkVOVF9MT09QX0JSRUFLENXTBhIpCiNF", + "X01JWEVSXzJfSEVBVEVSX0NVUlJFTlRfTE9PUF9CUkVBSxDW0wYSKAoiRV9U", + "VU5ORUxfSEVBVEVSX0NVUlJFTlRfTE9PUF9CUkVBSxDX0wYSKQojRV9EUllF", + "Ul9IRUFURVJfMV9DVVJSRU5UX0xPT1BfQlJFQUsQ2NMGEikKI0VfRFJZRVJf", + "SEVBVEVSXzJfQ1VSUkVOVF9MT09QX0JSRUFLENnTBhIpCiNFX0RSWUVSX0hF", + "QVRFUl8zX0NVUlJFTlRfTE9PUF9CUkVBSxDa0wYSKwolRV9MVUJSSUNBTlRf", + "SEVBVEVSX0NVUlJFTlRfTE9PUF9CUkVBSxDb0wYSJAoeRV9EUllFUl9NQUlO", + "X01PVE9SX01BTEZVTkNUSU9OELDbBhIuCihFX0RSWUVSX1RIUkVBRF9MT0FE", + "SU5HX01PVE9SX01BTEZVTkNUSU9OELHbBhIiChxFX1dJTkRFUl8xX01PVE9S", + "X01BTEZVTkNUSU9OELLbBhIiChxFX1dJTkRFUl8yX01PVE9SX01BTEZVTkNU", + "SU9OELPbBhIiChxFX1dJTkRFUl8zX01PVE9SX01BTEZVTkNUSU9OELTbBhIi", + "ChxFX1dJTkRFUl80X01PVE9SX01BTEZVTkNUSU9OELXbBhIiChxFX0RBTkNF", + "Ul8xX01PVE9SX01BTEZVTkNUSU9OELbbBhIiChxFX0RBTkNFUl8yX01PVE9S", + "X01BTEZVTkNUSU9OELfbBhIiChxFX0RBTkNFUl8zX01PVE9SX01BTEZVTkNU", + "SU9OELjbBhIiChxFX0RBTkNFUl80X01PVE9SX01BTEZVTkNUSU9OELnbBhIt", + "CidFX0RZRUlOR19IRUFEX0NMRUFORVJfTU9UT1JfTUFMRlVOQ1RJT04QutsG", + "EicKIUVfRFJZRVJfUFVTSF9CTE9XRVJfRkxPV19VTlNUQUJMRRCY4wYSKgok", + "RV9EUllFUl9TVUNUSU9OX0JMT1dFUl9GTE9XX1VOU1RBQkxFEJnjBhIoCiJF", + "X1RVTk5FTF9QVVNIX0JMT1dFUl9GTE9XX1VOU1RBQkxFEJrjBhIrCiVFX1RV", + "Tk5FTF9TVUNUSU9OX0JMT1dFUl9GTE9XX1VOU1RBQkxFEJvjBhInCiFFX0lE", + "U19BSVJfQ09ORElUSU9ORVJfTUFMRlVOQ1RJT04QnOMGEh8KGUVfRFJZRVJf", + "UFVTSF9GTE9XX1RPT19MT1cQneMGEiIKHEVfRFJZRVJfU1VDVElPTl9GTE9X", + "X1RPT19MT1cQnuMGEiAKGkVfVFVOTkVMX1BVU0hfRkxPV19UT09fTE9XEJ/j", + "BhIjCh1FX1RVTk5FTF9TVUNUSU9OX0ZMT1dfVE9PX0xPVxCg4wYSIAoaRV9E", + "UllFUl9QVVNIX0ZMT1dfVE9PX0hJR0gQoeMGEiMKHUVfRFJZRVJfU1VDVElP", + "Tl9GTE9XX1RPT19ISUdIEKLjBhIhChtFX1RVTk5FTF9QVVNIX0ZMT1dfVE9P", + "X0hJR0gQo+MGEiQKHkVfVFVOTkVMX1NVQ1RJT05fRkxPV19UT09fSElHSBCk", + "4wYSJAoeRV9JTktfTElORV8xX1BSRVNTVVJFX1RPT19ISUdIEIDrBhIkCh5F", + "X0lOS19MSU5FXzJfUFJFU1NVUkVfVE9PX0hJR0gQgesGEiQKHkVfSU5LX0xJ", + "TkVfM19QUkVTU1VSRV9UT09fSElHSBCC6wYSJAoeRV9JTktfTElORV80X1BS", + "RVNTVVJFX1RPT19ISUdIEIPrBhIkCh5FX0lOS19MSU5FXzVfUFJFU1NVUkVf", + "VE9PX0hJR0gQhOsGEiQKHkVfSU5LX0xJTkVfNl9QUkVTU1VSRV9UT09fSElH", + "SBCF6wYSJAoeRV9JTktfTElORV83X1BSRVNTVVJFX1RPT19ISUdIEIbrBhIk", + "Ch5FX0lOS19MSU5FXzhfUFJFU1NVUkVfVE9PX0hJR0gQh+sGEiQKHkVfSU5L", + "X0xJTkVfOV9QUkVTU1VSRV9UT09fSElHSBCI6wYSJQofRV9JTktfTElORV8x", + "MF9QUkVTU1VSRV9UT09fSElHSBCJ6wYSIwodRV9JTktfTElORV8xX1BSRVNT", + "VVJFX1RPT19MT1cQiusGEiMKHUVfSU5LX0xJTkVfMl9QUkVTU1VSRV9UT09f", + "TE9XEIvrBhIjCh1FX0lOS19MSU5FXzNfUFJFU1NVUkVfVE9PX0xPVxCM6wYS", + "IwodRV9JTktfTElORV80X1BSRVNTVVJFX1RPT19MT1cQjesGEiMKHUVfSU5L", + "X0xJTkVfNV9QUkVTU1VSRV9UT09fTE9XEI7rBhIjCh1FX0lOS19MSU5FXzZf", + "UFJFU1NVUkVfVE9PX0xPVxCP6wYSIwodRV9JTktfTElORV83X1BSRVNTVVJF", + "X1RPT19MT1cQkOsGEiMKHUVfSU5LX0xJTkVfOF9QUkVTU1VSRV9UT09fTE9X", + "EJHrBhIjCh1FX0lOS19MSU5FXzlfUFJFU1NVUkVfVE9PX0xPVxCS6wYSJAoe", + "RV9JTktfTElORV8xMF9QUkVTU1VSRV9UT09fTE9XEJPrBhIeChhFX0lOS19Q", + "VU1QXzFfTUFMRlVOQ1RJT04QlOsGEh4KGEVfSU5LX1BVTVBfMl9NQUxGVU5D", + "VElPThCV6wYSHgoYRV9JTktfUFVNUF8zX01BTEZVTkNUSU9OEJbrBhIeChhF", + "X0lOS19QVU1QXzRfTUFMRlVOQ1RJT04Ql+sGEh4KGEVfSU5LX1BVTVBfNV9N", + "QUxGVU5DVElPThCY6wYSHgoYRV9JTktfUFVNUF82X01BTEZVTkNUSU9OEJnr", + "BhIeChhFX0lOS19QVU1QXzdfTUFMRlVOQ1RJT04QmusGEh4KGEVfSU5LX1BV", + "TVBfOF9NQUxGVU5DVElPThCb6wYSHgoYRV9JTktfUFVNUF85X01BTEZVTkNU", + "SU9OEJzrBhIfChlFX0lOS19QVU1QXzEwX01BTEZVTkNUSU9OEJ3rBhIfChlF", + "X0lOS19QVU1QXzExX01BTEZVTkNUSU9OEJ7rBhIfChlFX0lOS19QVU1QXzEy", + "X01BTEZVTkNUSU9OEJ/rBhIfChlFX0lOS19QVU1QXzEzX01BTEZVTkNUSU9O", + "EKDrBhIfChlFX0lOS19QVU1QXzE0X01BTEZVTkNUSU9OEKHrBhIfChlFX0lO", + "S19QVU1QXzE1X01BTEZVTkNUSU9OEKLrBhIlCh9FX0lOS19MSU5FXzFfTUlE", + "X1RBTktfTE9XX0xFVkVMEKPrBhIlCh9FX0lOS19MSU5FXzJfTUlEX1RBTktf", + "TE9XX0xFVkVMEKTrBhIlCh9FX0lOS19MSU5FXzNfTUlEX1RBTktfTE9XX0xF", + "VkVMEKXrBhIlCh9FX0lOS19MSU5FXzRfTUlEX1RBTktfTE9XX0xFVkVMEKbr", + "BhIlCh9FX0lOS19MSU5FXzVfTUlEX1RBTktfTE9XX0xFVkVMEKfrBhIlCh9F", + "X0lOS19MSU5FXzZfTUlEX1RBTktfTE9XX0xFVkVMEKjrBhIlCh9FX0lOS19M", + "SU5FXzdfTUlEX1RBTktfTE9XX0xFVkVMEKnrBhIlCh9FX0lOS19MSU5FXzhf", + "TUlEX1RBTktfTE9XX0xFVkVMEKrrBhIlCh9FX0lOS19MSU5FXzlfTUlEX1RB", + "TktfTE9XX0xFVkVMEKvrBhImCiBFX0lOS19MSU5FXzEwX01JRF9UQU5LX0xP", + "V19MRVZFTBCs6wYSKAoiRV9JTktfTElORV8xX01JRF9UQU5LX0ZJTExfVElN", + "RU9VVBCt6wYSKAoiRV9JTktfTElORV8yX01JRF9UQU5LX0ZJTExfVElNRU9V", + "VBCu6wYSKAoiRV9JTktfTElORV8zX01JRF9UQU5LX0ZJTExfVElNRU9VVBCv", + "6wYSKAoiRV9JTktfTElORV80X01JRF9UQU5LX0ZJTExfVElNRU9VVBCw6wYS", + "KAoiRV9JTktfTElORV81X01JRF9UQU5LX0ZJTExfVElNRU9VVBCx6wYSKAoi", + "RV9JTktfTElORV82X01JRF9UQU5LX0ZJTExfVElNRU9VVBCy6wYSKAoiRV9J", + "TktfTElORV83X01JRF9UQU5LX0ZJTExfVElNRU9VVBCz6wYSKAoiRV9JTktf", + "TElORV84X01JRF9UQU5LX0ZJTExfVElNRU9VVBC06wYSKAoiRV9JTktfTElO", + "RV85X01JRF9UQU5LX0ZJTExfVElNRU9VVBC16wYSKQojRV9JTktfTElORV8x", + "MF9NSURfVEFOS19GSUxMX1RJTUVPVVQQtusGEicKIUVfSU5LX0xJTkVfMV9N", + "SURfVEFOS19NQUxGVU5DVElPThC36wYSJwohRV9JTktfTElORV8yX01JRF9U", + "QU5LX01BTEZVTkNUSU9OELjrBhInCiFFX0lOS19MSU5FXzNfTUlEX1RBTktf", + "TUFMRlVOQ1RJT04QuesGEicKIUVfSU5LX0xJTkVfNF9NSURfVEFOS19NQUxG", + "VU5DVElPThC66wYSJwohRV9JTktfTElORV81X01JRF9UQU5LX01BTEZVTkNU", + "SU9OELvrBhInCiFFX0lOS19MSU5FXzZfTUlEX1RBTktfTUFMRlVOQ1RJT04Q", + "vOsGEicKIUVfSU5LX0xJTkVfN19NSURfVEFOS19NQUxGVU5DVElPThC96wYS", + "JwohRV9JTktfTElORV84X01JRF9UQU5LX01BTEZVTkNUSU9OEL7rBhInCiFF", + "X0lOS19MSU5FXzlfTUlEX1RBTktfTUFMRlVOQ1RJT04Qv+sGEigKIkVfSU5L", + "X0xJTkVfMTBfTUlEX1RBTktfTUFMRlVOQ1RJT04QwOsGEh8KGUVfSU5LX1BV", + "TVBfMTZfTUFMRlVOQ1RJT04QwesGEh8KGUVfSU5LX1BVTVBfMTdfTUFMRlVO", + "Q1RJT04QwusGEh8KGUVfSU5LX1BVTVBfMThfTUFMRlVOQ1RJT04Qw+sGEh8K", + "GUVfSU5LX1BVTVBfMTlfTUFMRlVOQ1RJT04QxOsGEh8KGUVfSU5LX1BVTVBf", + "MjBfTUFMRlVOQ1RJT04QxesGEh8KGUVfSU5LX1BVTVBfMjFfTUFMRlVOQ1RJ", + "T04QxusGEiYKIEVfSU5LX0xJTkVfMTFfTUlEX1RBTktfTE9XX0xFVkVMEMfr", + "BhIpCiNFX0lOS19MSU5FXzExX01JRF9UQU5LX0ZJTExfVElNRU9VVBDI6wYS", + "KAoiRV9JTktfTElORV8xMV9NSURfVEFOS19NQUxGVU5DVElPThDJ6wYSIQob", + "RV9JTktfTElORV8xX01JRF9UQU5LX0VNUFRZEMrrBhIhChtFX0lOS19MSU5F", + "XzJfTUlEX1RBTktfRU1QVFkQy+sGEiEKG0VfSU5LX0xJTkVfM19NSURfVEFO", + "S19FTVBUWRDM6wYSIQobRV9JTktfTElORV80X01JRF9UQU5LX0VNUFRZEM3r", + "BhIhChtFX0lOS19MSU5FXzVfTUlEX1RBTktfRU1QVFkQzusGEiEKG0VfSU5L", + "X0xJTkVfNl9NSURfVEFOS19FTVBUWRDP6wYSIQobRV9JTktfTElORV83X01J", + "RF9UQU5LX0VNUFRZENDrBhIhChtFX0lOS19MSU5FXzhfTUlEX1RBTktfRU1Q", + "VFkQ0esGEiEKG0VfSU5LX0xJTkVfOV9NSURfVEFOS19FTVBUWRDS6wYSIgoc", + "RV9JTktfTElORV8xMF9NSURfVEFOS19FTVBUWRDT6wYSIgocRV9JTktfTElO", + "RV8xMV9NSURfVEFOS19FTVBUWRDU6wYSIwodRV9MVUJSSUNBTlRfSkVSUllD", + "QU5fSVNfRU1QVFkQ1esGEiYKIEVfTFVCUklDQU5UX0pFUlJZQ0FOX05PVF9Q", + "UkVTRU5UENbrBhIiChxFX1dBU1RFX0pFUlJZQ0FOX05PVF9QUkVTRU5UEOjy", + "BhIeChhFX1dBU1RFX0pFUlJZQ0FOX0lTX0ZVTEwQ6fIGEi0KJ0VfV0FTVEVf", + "SkVSUllDQU5fQU5EX1NVQl9UQU5LU19BUkVfRlVMTBDq8gYSNQovRV9OT19E", + "UkFJTklOR19GUk9NX0lEVV9DSElNTkVZX1NVQl9UQU5LX1RJTUVPVVQQ6/IG", + "EjMKLUVfTk9fRFJBSU5JTkdfRlJPTV9JRlNfRFJZRVJfU1VCX1RBTktfVElN", + "RU9VVBDs8gYSMwotRV9OT19EUkFJTklOR19GUk9NX0lEVV9DSElNTkVZX1NV", + "Ql9UQU5LX0lTU1VFEO3yBhIxCitFX05PX0RSQUlOSU5HX0ZST01fSUZTX0RS", + "WUVSX1NVQl9UQU5LX0lTU1VFEO7yBhItCidFX0lEVV9DSElNTkVZX1NVQl9U", + "QU5LX1BVTVBfTUFMRlVOQ1RJT04Q7/IGEisKJUVfSUZTX0RSWUVSX1NVQl9U", + "QU5LX1BVTVBfTUFMRlVOQ1RJT04Q8PIGEjIKLEVfV0FTVEVfSkVSUllDQU5f", + "UFJFU0VOQ0VfU1dJVENIX01BTEZVTkNUSU9OEPHyBkIhCh9jb20udHdpbmUu", + "dGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.EventType), }, null)); @@ -2503,6 +2510,10 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("E_NO_COMMUNICATION_WITH_IDS_5_BOARD")] ENoCommunicationWithIds5Board = 105022, /// <summary> + ///No communication with waste load cell. Cannot execute job (Group = GeneralHardware, Category = Error) + /// </summary> + [pbr::OriginalName("E_NO_COMMUNICATION_WITH_WASTE_LOADCELL")] ENoCommunicationWithWasteLoadcell = 105023, + /// <summary> ///Left door is open (Group = GeneralHardware, Category = Warning) /// </summary> [pbr::OriginalName("E_LEFT_DOOR_OPEN")] ELeftDoorOpen = 106000, @@ -3403,13 +3414,33 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("E_WASTE_JERRYCAN_AND_SUB_TANKS_ARE_FULL")] EWasteJerrycanAndSubTanksAreFull = 113002, /// <summary> - ///No draining from IDU-Chimney sub-tank. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + ///No draining from IDU-Chimney sub-tank due to timeout. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("E_NO_DRAINING_FROM_IDU_CHIMNEY_SUB_TANK_TIMEOUT")] ENoDrainingFromIduChimneySubTankTimeout = 113003, + /// <summary> + ///No draining from IFS-Dryer sub-tank due to timeout. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("E_NO_DRAINING_FROM_IFS_DRYER_SUB_TANK_TIMEOUT")] ENoDrainingFromIfsDryerSubTankTimeout = 113004, + /// <summary> + ///No draining from IDU-Chimney sub-tank due to emptying issue. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("E_NO_DRAINING_FROM_IDU_CHIMNEY_SUB_TANK_ISSUE")] ENoDrainingFromIduChimneySubTankIssue = 113005, + /// <summary> + ///No draining from IFS-Dryer sub-tank due to emptying issue. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("E_NO_DRAINING_FROM_IFS_DRYER_SUB_TANK_ISSUE")] ENoDrainingFromIfsDryerSubTankIssue = 113006, + /// <summary> + ///IDU-Chimney sub-tank pump malfunction. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("E_IDU_CHIMNEY_SUB_TANK_PUMP_MALFUNCTION")] EIduChimneySubTankPumpMalfunction = 113007, + /// <summary> + ///IFS-Dryer sub-tank pump malfunction. Cannot execute job (Group = WasteHandlingSystem, Category = Error) /// </summary> - [pbr::OriginalName("E_NO_DRAINING_FROM_IDU_CHIMNEY_SUB_TANK")] ENoDrainingFromIduChimneySubTank = 113003, + [pbr::OriginalName("E_IFS_DRYER_SUB_TANK_PUMP_MALFUNCTION")] EIfsDryerSubTankPumpMalfunction = 113008, /// <summary> - ///No draining from IFS-Dryer sub-tank. Cannot execute job (Group = WasteHandlingSystem, Category = Error) + ///Waste jerrycan presence switch malfunction. Cannot execute job (Group = WasteHandlingSystem, Category = Error) /// </summary> - [pbr::OriginalName("E_NO_DRAINING_FROM_IFS_DRYER_SUB_TANK")] ENoDrainingFromIfsDryerSubTank = 113004, + [pbr::OriginalName("E_WASTE_JERRYCAN_PRESENCE_SWITCH_MALFUNCTION")] EWasteJerrycanPresenceSwitchMalfunction = 113009, } #endregion diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/InterfaceIOs.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/InterfaceIOs.cs index 07836ea67..4a93fe2f4 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/InterfaceIOs.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/InterfaceIOs.cs @@ -22,8 +22,8 @@ namespace Tango.PMR.Diagnostics { static InterfaceIOsReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJJbnRlcmZhY2VJT3MucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyqt", - "RQoMSW50ZXJmYWNlSU9zEhcKE0FOQUxPR19NSVhDSElQX1RFTVAQABIXChNB", + "ChJJbnRlcmZhY2VJT3MucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyqh", + "RgoMSW50ZXJmYWNlSU9zEhcKE0FOQUxPR19NSVhDSElQX1RFTVAQABIXChNB", "Tl9EWUVJTkdIX0NVUlNFTl8xEAESFwoTQU5fRFlFSU5HSF9DVVJTRU5fMhAC", "EhcKE0FOX0RZRUlOR0hfQ1VSU0VOXzMQAxIXChNBTl9EWUVJTkdIX0NVUlNF", "Tl80EAQSFwoTQU5fRFlFSU5HSF9DVVJTRU5fNRAFEhgKFEFOQUxPR19EWUVJ", @@ -220,8 +220,10 @@ namespace Tango.PMR.Diagnostics { "Y0NvdmVyEJ4DEg0KCERyeWVyNDh2EJ8DEhMKDlNhZmV0eURyeWVyVENPEKAD", "EhQKD1NhZmV0eVR1bm5lbFRDTxChAxIXChJTYWZldHlEcnllckFpcmZsb3cQ", "ogMSGAoTU2FmZXR5VHVubmVsQWlyZmxvdxCjAxIcChdTYWZldHlDaXJjdWxh", - "dG9yQWlyZmxvdxCkA0IhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0", - "aWNzYgZwcm90bzM=")); + "dG9yQWlyZmxvdxCkAxISCg1CbG9ja1N1YnRhbmtzEKUDEhUKEFdhc3RlU3lz", + "dGVtRXJyb3IQpgMSGgoVV2FzdGVKZXJyaWNhblByZXNlbmNlEKcDEhUKEEZy", + "b250U3VidGFua0Z1bGwQqAMSFAoPUmVhclN1YnRhbmtGdWxsEKkDQiEKH2Nv", + "bS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.InterfaceIOs), }, null)); @@ -1915,6 +1917,26 @@ namespace Tango.PMR.Diagnostics { ///Designator: X4GPI204 /// </summary> [pbr::OriginalName("SafetyCirculatorAirflow")] SafetyCirculatorAirflow = 420, + /// <summary> + ///Designator: X4GPI400 + /// </summary> + [pbr::OriginalName("BlockSubtanks")] BlockSubtanks = 421, + /// <summary> + ///Designator: X4GPO400 + /// </summary> + [pbr::OriginalName("WasteSystemError")] WasteSystemError = 422, + /// <summary> + ///Designator: X4GPO401 + /// </summary> + [pbr::OriginalName("WasteJerricanPresence")] WasteJerricanPresence = 423, + /// <summary> + ///Designator: X4GPO402 + /// </summary> + [pbr::OriginalName("FrontSubtankFull")] FrontSubtankFull = 424, + /// <summary> + ///Designator: X4GPO403 + /// </summary> + [pbr::OriginalName("RearSubtankFull")] RearSubtankFull = 425, } #endregion diff --git a/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs index bb3939ef1..c605be33c 100644 --- a/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Insights { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChZJbnNpZ2h0c01vbml0b3JzLnByb3RvEhJUYW5nby5QTVIuSW5zaWdodHMi", - "vDgKEEluc2lnaHRzTW9uaXRvcnMSFAoMRGFuY2VyMUFuZ2xlGAEgASgBEhQK", + "nzkKEEluc2lnaHRzTW9uaXRvcnMSFAoMRGFuY2VyMUFuZ2xlGAEgASgBEhQK", "DERhbmNlcjJBbmdsZRgCIAEoARIUCgxEYW5jZXIzQW5nbGUYAyABKAESHAoU", "RmVlZGVyTW90b3JGcmVxdWVuY3kYBCABKAESEgoKRHJ5ZXJNb3RvchgFIAEo", "ARITCgtQb2xsZXJNb3RvchgGIAEoARITCgtXaW5kZXJNb3RvchgHIAEoARIS", @@ -183,12 +183,14 @@ namespace Tango.PMR.Insights { "Eh8KFkV1UHVtcDFDYXJkVGVtcGVyYXR1cmUYgAIgASgBEh8KFkV1UHVtcDJD", "YXJkVGVtcGVyYXR1cmUYgQIgASgBEh8KFkV1UHVtcDNDYXJkVGVtcGVyYXR1", "cmUYggIgASgBEh8KFkV1UHVtcDRDYXJkVGVtcGVyYXR1cmUYgwIgASgBEh8K", - "FkV1UHVtcDVDYXJkVGVtcGVyYXR1cmUYhAIgASgBQh4KHGNvbS50d2luZS50", - "YW5nby5wbXIuaW5zaWdodHNiBnByb3RvMw==")); + "FkV1UHVtcDVDYXJkVGVtcGVyYXR1cmUYhAIgASgBEh4KFUV1V2FzdGVKZXJy", + "aWNhbldlaWdodBiFAiABKAESIAoXRXVXYXN0ZUZyb250UHVtcEN1cnJlbnQY", + "hgIgASgBEh8KFkV1V2FzdGVSZWFyUHVtcEN1cnJlbnQYhwIgASgBQh4KHGNv", + "bS50d2luZS50YW5nby5wbXIuaW5zaWdodHNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Insights.InsightsMonitors), global::Tango.PMR.Insights.InsightsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4", "EuBtsr5DispAv", "EuBtsr6DispAv", "EuBtsr7DispAv", "EuBtsr8DispAv", "EuBtsr5PeakMax", "EuBtsr6PeakMax", "EuBtsr7PeakMax", "EuBtsr8PeakMax", "EuBtsr5PeakMin", "EuBtsr6PeakMin", "EuBtsr7PeakMin", "EuBtsr8PeakMin", "EuBtsr5Speed", "EuBtsr6Speed", "EuBtsr7Speed", "EuBtsr8Speed", "EuBtsr5SpeedAv", "EuBtsr6SpeedAv", "EuBtsr7SpeedAv", "EuBtsr8SpeedAv", "EuDispenser17Voltage", "EuDispenser18Voltage", "EuDispenser19Voltage", "EuDispenser20Voltage", "EuDispenser21Voltage", "EuDispenser22Voltage", "EuDispenser9Pressure", "EuDispenser10Pressure", "EuDispenser11Pressure", "EuMidTank9Level", "EuMidTank1Level0", "EuMidTank1Level1", "EuPump1Current", "EuPump2Current", "EuPump3Current", "EuPump4Current", "EuPump5Current", "EuPump6Current", "EuPump7Current", "EuPump8Current", "EuPump9Current", "EuPump10Current", "EuPump11Current", "EuPump12Current", "EuPump13Current", "EuPump14Current", "EuPump15Current", "EuPump16Current", "EuPump17Current", "EuPump18Current", "EuPump19Current", "EuPump20Current", "EuPump21Current", "EuPump22Current", "EuWastePumpVoltage", "EuDryerOutgoingAirflow", "EuDryerIncomingVoltage", "EuDryerOutgoingVoltage", "EuDryerAirTemperature", "EuPump1CardTemperature", "EuPump2CardTemperature", "EuPump3CardTemperature", "EuPump4CardTemperature", "EuPump5CardTemperature" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Insights.InsightsMonitors), global::Tango.PMR.Insights.InsightsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4", "EuBtsr5DispAv", "EuBtsr6DispAv", "EuBtsr7DispAv", "EuBtsr8DispAv", "EuBtsr5PeakMax", "EuBtsr6PeakMax", "EuBtsr7PeakMax", "EuBtsr8PeakMax", "EuBtsr5PeakMin", "EuBtsr6PeakMin", "EuBtsr7PeakMin", "EuBtsr8PeakMin", "EuBtsr5Speed", "EuBtsr6Speed", "EuBtsr7Speed", "EuBtsr8Speed", "EuBtsr5SpeedAv", "EuBtsr6SpeedAv", "EuBtsr7SpeedAv", "EuBtsr8SpeedAv", "EuDispenser17Voltage", "EuDispenser18Voltage", "EuDispenser19Voltage", "EuDispenser20Voltage", "EuDispenser21Voltage", "EuDispenser22Voltage", "EuDispenser9Pressure", "EuDispenser10Pressure", "EuDispenser11Pressure", "EuMidTank9Level", "EuMidTank1Level0", "EuMidTank1Level1", "EuPump1Current", "EuPump2Current", "EuPump3Current", "EuPump4Current", "EuPump5Current", "EuPump6Current", "EuPump7Current", "EuPump8Current", "EuPump9Current", "EuPump10Current", "EuPump11Current", "EuPump12Current", "EuPump13Current", "EuPump14Current", "EuPump15Current", "EuPump16Current", "EuPump17Current", "EuPump18Current", "EuPump19Current", "EuPump20Current", "EuPump21Current", "EuPump22Current", "EuWastePumpVoltage", "EuDryerOutgoingAirflow", "EuDryerIncomingVoltage", "EuDryerOutgoingVoltage", "EuDryerAirTemperature", "EuPump1CardTemperature", "EuPump2CardTemperature", "EuPump3CardTemperature", "EuPump4CardTemperature", "EuPump5CardTemperature", "EuWasteJerricanWeight", "EuWasteFrontPumpCurrent", "EuWasteRearPumpCurrent" }, null, null, null) })); } #endregion @@ -479,6 +481,9 @@ namespace Tango.PMR.Insights { euPump3CardTemperature_ = other.euPump3CardTemperature_; euPump4CardTemperature_ = other.euPump4CardTemperature_; euPump5CardTemperature_ = other.euPump5CardTemperature_; + euWasteJerricanWeight_ = other.euWasteJerricanWeight_; + euWasteFrontPumpCurrent_ = other.euWasteFrontPumpCurrent_; + euWasteRearPumpCurrent_ = other.euWasteRearPumpCurrent_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -4116,6 +4121,48 @@ namespace Tango.PMR.Insights { } } + /// <summary>Field number for the "EuWasteJerricanWeight" field.</summary> + public const int EuWasteJerricanWeightFieldNumber = 261; + private double euWasteJerricanWeight_; + /// <summary> + ///Eureka Waste Jerrican Weight + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuWasteJerricanWeight { + get { return euWasteJerricanWeight_; } + set { + euWasteJerricanWeight_ = value; + } + } + + /// <summary>Field number for the "EuWasteFrontPumpCurrent" field.</summary> + public const int EuWasteFrontPumpCurrentFieldNumber = 262; + private double euWasteFrontPumpCurrent_; + /// <summary> + ///Eureka Waste Front Pump Current + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuWasteFrontPumpCurrent { + get { return euWasteFrontPumpCurrent_; } + set { + euWasteFrontPumpCurrent_ = value; + } + } + + /// <summary>Field number for the "EuWasteRearPumpCurrent" field.</summary> + public const int EuWasteRearPumpCurrentFieldNumber = 263; + private double euWasteRearPumpCurrent_; + /// <summary> + ///Eureka Waste Rear Pump Current + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuWasteRearPumpCurrent { + get { return euWasteRearPumpCurrent_; } + set { + euWasteRearPumpCurrent_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as InsightsMonitors); @@ -4389,6 +4436,9 @@ namespace Tango.PMR.Insights { if (EuPump3CardTemperature != other.EuPump3CardTemperature) return false; if (EuPump4CardTemperature != other.EuPump4CardTemperature) return false; if (EuPump5CardTemperature != other.EuPump5CardTemperature) return false; + if (EuWasteJerricanWeight != other.EuWasteJerricanWeight) return false; + if (EuWasteFrontPumpCurrent != other.EuWasteFrontPumpCurrent) return false; + if (EuWasteRearPumpCurrent != other.EuWasteRearPumpCurrent) return false; return true; } @@ -4655,6 +4705,9 @@ namespace Tango.PMR.Insights { if (EuPump3CardTemperature != 0D) hash ^= EuPump3CardTemperature.GetHashCode(); if (EuPump4CardTemperature != 0D) hash ^= EuPump4CardTemperature.GetHashCode(); if (EuPump5CardTemperature != 0D) hash ^= EuPump5CardTemperature.GetHashCode(); + if (EuWasteJerricanWeight != 0D) hash ^= EuWasteJerricanWeight.GetHashCode(); + if (EuWasteFrontPumpCurrent != 0D) hash ^= EuWasteFrontPumpCurrent.GetHashCode(); + if (EuWasteRearPumpCurrent != 0D) hash ^= EuWasteRearPumpCurrent.GetHashCode(); return hash; } @@ -5675,6 +5728,18 @@ namespace Tango.PMR.Insights { output.WriteRawTag(161, 16); output.WriteDouble(EuPump5CardTemperature); } + if (EuWasteJerricanWeight != 0D) { + output.WriteRawTag(169, 16); + output.WriteDouble(EuWasteJerricanWeight); + } + if (EuWasteFrontPumpCurrent != 0D) { + output.WriteRawTag(177, 16); + output.WriteDouble(EuWasteFrontPumpCurrent); + } + if (EuWasteRearPumpCurrent != 0D) { + output.WriteRawTag(185, 16); + output.WriteDouble(EuWasteRearPumpCurrent); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -6440,6 +6505,15 @@ namespace Tango.PMR.Insights { if (EuPump5CardTemperature != 0D) { size += 2 + 8; } + if (EuWasteJerricanWeight != 0D) { + size += 2 + 8; + } + if (EuWasteFrontPumpCurrent != 0D) { + size += 2 + 8; + } + if (EuWasteRearPumpCurrent != 0D) { + size += 2 + 8; + } return size; } @@ -7208,6 +7282,15 @@ namespace Tango.PMR.Insights { if (other.EuPump5CardTemperature != 0D) { EuPump5CardTemperature = other.EuPump5CardTemperature; } + if (other.EuWasteJerricanWeight != 0D) { + EuWasteJerricanWeight = other.EuWasteJerricanWeight; + } + if (other.EuWasteFrontPumpCurrent != 0D) { + EuWasteFrontPumpCurrent = other.EuWasteFrontPumpCurrent; + } + if (other.EuWasteRearPumpCurrent != 0D) { + EuWasteRearPumpCurrent = other.EuWasteRearPumpCurrent; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -8268,6 +8351,18 @@ namespace Tango.PMR.Insights { EuPump5CardTemperature = input.ReadDouble(); break; } + case 2089: { + EuWasteJerricanWeight = input.ReadDouble(); + break; + } + case 2097: { + EuWasteFrontPumpCurrent = input.ReadDouble(); + break; + } + case 2105: { + EuWasteRearPumpCurrent = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev26.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev26.xlsx Binary files differnew file mode 100644 index 000000000..e525f64ea --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev26.xlsx diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev27.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev27.xlsx Binary files differnew file mode 100644 index 000000000..8acedc586 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev27.xlsx diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index 3eeb5613f..fe00eb18e 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -16,7 +16,7 @@ namespace Tango.EventsTypesGenerator { class Program { - private static string EVENTS_FILE = "Eureka BB alarm events handling chart_TS_and_X4_Rev24.xlsx"; + private static string EVENTS_FILE = "Eureka BB alarm events handling chart_TS_and_X4_Rev27.xlsx"; private class ExcelEventType { diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index e2959a6f9..a7f7327ad 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -91,6 +91,12 @@ <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev24.xlsx"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev26.xlsx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev27.xlsx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev4.xlsx"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Program.cs index 2869dad68..2aaf7aff9 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Program.cs @@ -34,7 +34,7 @@ namespace Tango.PortsListGenerator { Console.WriteLine("Initializing Ports List..."); - ExcelReader reader = new ExcelReader(PathHelper.GetStartupPath() + "\\Tech IOs v4.xlsx"); + ExcelReader reader = new ExcelReader(PathHelper.GetStartupPath() + "\\Tech IOs v5.xlsx"); var results = reader.GetDataByIndex<PortItem>("Ports List", 2); results.RemoveAll(x => String.IsNullOrWhiteSpace(x.ToString().Replace(",", ""))); diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj index 5b9556832..ce84af19e 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj @@ -76,6 +76,9 @@ <None Include="Tech IOs v4.xlsx"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="Tech IOs v5.xlsx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\Tango.BL\Tango.BL.csproj"> @@ -94,7 +97,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tech IOs v5.xlsx b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tech IOs v5.xlsx Binary files differnew file mode 100644 index 000000000..e184a2157 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tech IOs v5.xlsx |