@@ -537,7 +537,7 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
537537 FullServPressurePSI = fullServPressurePSI ;
538538 AutoCylAirPSIM3 = immediateRelease ? 0 : ( maxPressurePSI - BrakeLine1PressurePSI ) * AuxResVolumeM3 ;
539539 QuickServiceBulbPressurePSI = BrakeLine1PressurePSI < maxPressurePSI ? BrakeLine1PressurePSI : 0 ;
540- if ( CylSource == 0 )
540+ if ( CylSource == CylinderSource . AuxRes )
541541 AutoCylPressurePSI = ForceBrakeCylinderPressure ( ref AutoCylAirPSIM3 , AdvancedBrakeCylinderPressure ( AutoCylAirPSIM3 ) ) ;
542542 else
543543 AutoCylPressurePSI = immediateRelease ? 0 : Math . Min ( ( maxPressurePSI - BrakeLine1PressurePSI ) * AuxCylVolumeRatio , MaxTripleValveCylPressurePSI ) ;
@@ -1165,7 +1165,7 @@ public override void Update(float elapsedClockSeconds)
11651165 AuxResPressurePSI -= elapsedClockSeconds * MaxApplicationRatePSIpS ;
11661166 if ( AuxResPressurePSI < 0 )
11671167 AuxResPressurePSI = 0 ;
1168- if ( CylSource == 0 )
1168+ if ( CylSource == CylinderSource . AuxRes )
11691169 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , - elapsedClockSeconds * MaxReleaseRatePSIpS , 0 ) ;
11701170 else
11711171 AutoCylPressurePSI -= elapsedClockSeconds * MaxReleaseRatePSIpS ;
@@ -1232,7 +1232,7 @@ public override void Update(float elapsedClockSeconds)
12321232 if ( dp < 0 )
12331233 dp = 0 ;
12341234
1235- if ( CylSource == 0 ) // Aux res is directly connected to brake cylinder, no relay valve
1235+ if ( CylSource == CylinderSource . AuxRes ) // Aux res is directly connected to brake cylinder, no relay valve
12361236 {
12371237 float prevAutoCylAirPSIM3 = AutoCylAirPSIM3 ;
12381238 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , dp , threshold ) ;
@@ -1263,7 +1263,7 @@ public override void Update(float elapsedClockSeconds)
12631263 dp = elapsedClockSeconds * MaxReleaseRatePSIpS ;
12641264 if ( AutoCylPressurePSI - dp < AuxResPressurePSI + dp / AuxCylVolumeRatio )
12651265 dp = Math . Max ( ( AutoCylPressurePSI - AuxResPressurePSI ) * ( AuxCylVolumeRatio / ( 1 + AuxCylVolumeRatio ) ) , 0 ) ;
1266- if ( CylSource == 0 )
1266+ if ( CylSource == CylinderSource . AuxRes )
12671267 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , - dp , AuxResPressurePSI ) ;
12681268 else
12691269 AutoCylPressurePSI -= dp ;
@@ -1329,7 +1329,7 @@ public override void Update(float elapsedClockSeconds)
13291329 dp = ( BrakeLine1PressurePSI - AutoCylPressurePSI ) / ( 1 + CylBrakeLineVolumeRatio ) ;
13301330 if ( dp < 0 )
13311331 dp = 0 ;
1332- if ( CylSource == 0 )
1332+ if ( CylSource == CylinderSource . AuxRes )
13331333 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , dp , BrakeLine1PressurePSI ) ;
13341334 else
13351335 AutoCylPressurePSI += dp ;
@@ -1386,7 +1386,7 @@ public override void Update(float elapsedClockSeconds)
13861386 if ( dp < 0 )
13871387 dp = 0 ;
13881388
1389- if ( CylSource == 0 ) // Aux res is directly connected to brake cylinder, no relay valve
1389+ if ( CylSource == CylinderSource . AuxRes ) // Aux res is directly connected to brake cylinder, no relay valve
13901390 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , - dp , threshold ) ;
13911391 else
13921392 AutoCylPressurePSI -= dp ;
@@ -1399,7 +1399,7 @@ public override void Update(float elapsedClockSeconds)
13991399 float dp = elapsedClockSeconds * ReleaseRatePSIpS ;
14001400 if ( AutoCylPressurePSI - dp < target )
14011401 dp = AutoCylPressurePSI - target ;
1402- if ( CylSource == 0 )
1402+ if ( CylSource == CylinderSource . AuxRes )
14031403 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , - dp , target ) ;
14041404 else
14051405 AutoCylPressurePSI -= dp ;
@@ -1410,7 +1410,7 @@ public override void Update(float elapsedClockSeconds)
14101410 dp *= MathHelper . Clamp ( MathHelper . Lerp ( 1.0f , 0.1f , ( AutoCylPressurePSI - HighSpeedReducingPressurePSI ) / 5.0f ) , 0.1f , 1.0f ) ; // Rate of release reduces as pressure difference increases
14111411 if ( AutoCylPressurePSI - dp < HighSpeedReducingPressurePSI )
14121412 dp = AutoCylPressurePSI - HighSpeedReducingPressurePSI ;
1413- if ( CylSource == 0 )
1413+ if ( CylSource == CylinderSource . AuxRes )
14141414 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , - dp , HighSpeedReducingPressurePSI ) ;
14151415 else
14161416 AutoCylPressurePSI -= dp ;
@@ -1455,7 +1455,7 @@ public override void Update(float elapsedClockSeconds)
14551455 dp = ( QuickServiceBulbPressurePSI - AutoCylPressurePSI ) / ( 1 + volumeRatio ) ;
14561456 if ( dp < 0 )
14571457 dp = 0 ;
1458- if ( CylSource == 0 )
1458+ if ( CylSource == CylinderSource . AuxRes )
14591459 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , dp , QuickServiceLimitPSI ) ;
14601460 else
14611461 AutoCylPressurePSI += dp ;
@@ -1735,7 +1735,7 @@ public override void Update(float elapsedClockSeconds)
17351735 {
17361736 float dp = elapsedClockSeconds * RelayValveApplicationRatePSIpS ;
17371737 // Reduce glitchyness caused by extremely low demanded pressures
1738- if ( CylSource != 0 && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f )
1738+ if ( CylSource != CylinderSource . AuxRes && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f )
17391739 dp *= 0.2f ;
17401740 if ( dp > demandedPressurePSI - CylPressurePSI )
17411741 dp = demandedPressurePSI - CylPressurePSI ;
@@ -1774,7 +1774,7 @@ public override void Update(float elapsedClockSeconds)
17741774 {
17751775 float dp = elapsedClockSeconds * RelayValveReleaseRatePSIpS ;
17761776 // Reduce glitchyness caused by extremely low demanded pressures
1777- if ( CylSource != 0 && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f )
1777+ if ( CylSource != CylinderSource . AuxRes && demandedPressurePSI < BrakeCylinderSpringPressurePSI / 2.0f )
17781778 dp *= 0.2f ;
17791779 if ( dp > CylPressurePSI - demandedPressurePSI )
17801780 dp = CylPressurePSI - demandedPressurePSI ;
@@ -1820,7 +1820,7 @@ public override void Update(float elapsedClockSeconds)
18201820
18211821 if ( AuxResPressurePSI - dp < 0 )
18221822 dp = AuxResPressurePSI ;
1823- if ( CylSource == 0 )
1823+ if ( CylSource == CylinderSource . AuxRes )
18241824 AutoCylPressurePSI = CalculateBrakeCylinderPressure ( ref AutoCylAirPSIM3 , - dp , 0 ) ;
18251825 else
18261826 AutoCylPressurePSI -= dp ;
0 commit comments