-
Notifications
You must be signed in to change notification settings - Fork 98
New Triple Valve Features #851
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New Triple Valve Features #851
Conversation
cesarBLG
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the improvements! They look OK to me, unfortunately they will conflict with my PR. I'll try to find reviewers for my PRs, and as soon as they are merged I'll add this PR to the Unstable releases
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
Outdated
Show resolved
Hide resolved
|
My two PRs have been approved and merged (thanks Peter). You can now merge the master branch into your branch and solve conflicts. Basically, the conflicting point will be the creation of two different Initialize() methods. One is intended for initial configuration of brakes (e.g. to configure parameters to a default value if they are not defined), and the other one is to reset brakes with shift+/ After conflicts are solved, your changes will be available in the Unstable release, as I've tagged this PR as "for-unstable" |
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting - Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at cf9f306: New Triple Valve Features - Pull request #852 at d599941: Remove unneeded adhesion options
|
Got the conflicts with the relay valve code sorted, and I did a scan to make sure I'm using AutoCylPressurePSI instead of CylPressurePSI which should mean my code will function as expected with relay valves (all pressures are in terms of the brake cylinder feed line, not the actual brake cylinder pressure). That said, I am not at home so I have not had an opportunity to actually do a build and test that theory. Also it looks like my brake cylinder return spring code got lost when resolving conflicts with the brake shoe enhancement. Oops. |
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting - Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at cf9f306: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting - Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 1bdb7df: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at cf9f306: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting - Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 1bdb7df: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at 858fa7e: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting - Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 1bdb7df: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options
|
Could you please add a Trello card for the feature, and link it here? Also, a link to the relevant forum posts is required. (see https://github.com/openrails/openrails/blob/master/Docs/Contributing.md for further information). Once the Trello card is approved, I can review and merge this PR. |
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 1bdb7df: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 1bdb7df: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options - Pull request #853 at c8f02ad: Notify out of focus
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 1bdb7df: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #849 at 0d4e3da: Contributed projects and forking clarity - Pull request #850 at 1605667: Correct output of sound system info - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #852 at 72b9655: Remove unneeded adhesion options - Pull request #853 at c8f02ad: Notify out of focus - Pull request #854 at 027fac8: fix: Updating manual to match PR 647
Trello card added and approved by moving to stack v1.6 |
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at 98f1c45: Initialize cars before restore - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #853 at c8f02ad: Notify out of focus - Pull request #854 at 027fac8: fix: Updating manual to match PR 647
|
Thanks for approving the Trello card Chris! |
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at eae6246: Initialize cars before restore - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #853 at c8f02ad: Notify out of focus - Pull request #854 at 027fac8: fix: Updating manual to match PR 647
cesarBLG
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have just a couple of suggestions, nothing really important. Thanks for all the new features!
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
Outdated
Show resolved
Hide resolved
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
Outdated
Show resolved
Hide resolved
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
Outdated
Show resolved
Hide resolved
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
Outdated
Show resolved
Hide resolved
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at eae6246: Initialize cars before restore - Pull request #851 at d3e8c3e: New Triple Valve Features - Pull request #853 at 8357922: Notify out of focus - Pull request #854 at 027fac8: fix: Updating manual to match PR 647
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #844 at 3f42c30: Animate axles separately - Pull request #846 at eae6246: Initialize cars before restore - Pull request #851 at f4feee3: New Triple Valve Features - Pull request #853 at 8357922: Notify out of focus - Pull request #854 at 027fac8: fix: Updating manual to match PR 647
cesarBLG
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, everything looks OK to me.
My first enhancement for OR, this adds multiple new features to the air brake code to allow for simulating some features of more modern brake valve types (eg: ABD, ABDW), and also refactors/reorganizes some brake system behaviors to accommodate the new features better.
(Start of) Discussion on ElvasTower
Trello Card
ORTSEmergencyResQuickRelease ( 1 )[default is 0]ORTSUniformChargingThreshold ( 3psi )[default is 3 psi], and the factor by which the rate of charging is reduced withORTSUniformChargingRatio ( 2 )[default is 0, disabling the feature] {setting of 2 halves the rate, 0.5 would double the rate}.ORTSQuickServiceLimit ( 10psi )[default is 0, disabling the feature], set the rate of brake pipe venting withORTSQuickServiceVentRate ( 2.5psi/s )[default is 0] or leave it at 0 psi/s to simulate systems which don't vent the brake pipe, and optionally allow for brake cylinder feed pressure to increase faster than usual usingORTSQuickServiceApplicationRate ( 15psi/s )[default is 0].ORTSAcceleratedApplicationFactor ( 0.5 )[default is 0, disabling the feature] but beware that this is an open loop control system, and setting ratios too large can cause too much air to be vented (I found factors above 1 start to risk the brake pipe emptying itself). Additionally, set a limit on the venting rate of accelerated application withORTSAcceleratedApplicationMaxVentRate ( 1psi/s )[default is 5 psi].ORTSInitialApplicationThreshold ( 2psi )[default is 1 psi of direct release, 0.15 bar for graduated release].ORTSCylinderSpringPressure ( 3psi )[default is 0, resulting in force with any brake cylinder pressure].ORTSMaxServiceCylinderPressure ( 72psi )[default is 0, resulting in this limit being ignored], whileORTSMaxTripleValveCylinderPressureacts as the pressure limit in emergency.ORTSEmergencyDumpValveTimeris set to 0.