From 7d54607a2a61b9a99376b385c40e94257365eb18 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 14 May 2023 16:45:03 +0300 Subject: Working on Jerrican Levels Twine X4. --- .../Tango.PMR/MachineStatus/IDSPackLevel.cs | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/Tango.PMR') diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs index 099069143..a11341386 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs @@ -23,16 +23,16 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", - "IrgBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy", + "ItcBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy", "TGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVsGAMgASgBEhcKD0plcnJpY2Fu", "UHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGltZW91dEVycm9yGAUgASgIEhQK", "DE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRUYW5rUmVmaWxsUHVtcEFjdGl2", - "ZRgHIAEoCEIjCiFjb20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNi", - "BnByb3RvMw==")); + "ZRgHIAEoCBIdChVUaW1lclJlbWFpbmluZ1NlY29uZHMYCCABKAVCIwohY29t", + "LnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive", "TimerRemainingSeconds" }, null, null, null) })); } #endregion @@ -70,6 +70,7 @@ namespace Tango.PMR.MachineStatus { fillingTimeoutError_ = other.fillingTimeoutError_; midTankEmpty_ = other.midTankEmpty_; midTankRefillPumpActive_ = other.midTankRefillPumpActive_; + timerRemainingSeconds_ = other.timerRemainingSeconds_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -154,6 +155,17 @@ namespace Tango.PMR.MachineStatus { } } + /// Field number for the "TimerRemainingSeconds" field. + public const int TimerRemainingSecondsFieldNumber = 8; + private int timerRemainingSeconds_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int TimerRemainingSeconds { + get { return timerRemainingSeconds_; } + set { + timerRemainingSeconds_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as IDSPackLevel); @@ -174,6 +186,7 @@ namespace Tango.PMR.MachineStatus { if (FillingTimeoutError != other.FillingTimeoutError) return false; if (MidTankEmpty != other.MidTankEmpty) return false; if (MidTankRefillPumpActive != other.MidTankRefillPumpActive) return false; + if (TimerRemainingSeconds != other.TimerRemainingSeconds) return false; return true; } @@ -187,6 +200,7 @@ namespace Tango.PMR.MachineStatus { if (FillingTimeoutError != false) hash ^= FillingTimeoutError.GetHashCode(); if (MidTankEmpty != false) hash ^= MidTankEmpty.GetHashCode(); if (MidTankRefillPumpActive != false) hash ^= MidTankRefillPumpActive.GetHashCode(); + if (TimerRemainingSeconds != 0) hash ^= TimerRemainingSeconds.GetHashCode(); return hash; } @@ -225,6 +239,10 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(56); output.WriteBool(MidTankRefillPumpActive); } + if (TimerRemainingSeconds != 0) { + output.WriteRawTag(64); + output.WriteInt32(TimerRemainingSeconds); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -251,6 +269,9 @@ namespace Tango.PMR.MachineStatus { if (MidTankRefillPumpActive != false) { size += 1 + 1; } + if (TimerRemainingSeconds != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(TimerRemainingSeconds); + } return size; } @@ -280,6 +301,9 @@ namespace Tango.PMR.MachineStatus { if (other.MidTankRefillPumpActive != false) { MidTankRefillPumpActive = other.MidTankRefillPumpActive; } + if (other.TimerRemainingSeconds != 0) { + TimerRemainingSeconds = other.TimerRemainingSeconds; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -318,6 +342,10 @@ namespace Tango.PMR.MachineStatus { MidTankRefillPumpActive = input.ReadBool(); break; } + case 64: { + TimerRemainingSeconds = input.ReadInt32(); + break; + } } } } -- cgit v1.3.1