Skip to content
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

Add additional default brakeshoe CoF #847

Merged
merged 2 commits into from Jul 3, 2023

Conversation

peternewell
Copy link
Contributor

Following some research some additional CoF curves have been found for brake shoe operation.

These have been added to increase the variety available to users.

These changes are an enhancement as part of - https://blueprints.launchpad.net/or/+spec/braking-enhancement

@peternewell peternewell added the enhancement New feature or request label Jun 24, 2023
@peternewell peternewell self-assigned this Jun 24, 2023
k4 = 39.5f;
k5 = 33f;

frictionfraction = k1 * ((brakeShoeForcekN + k2) / (brakeShoeForcekN + k3)) * ((MpS.ToKpH(AbsSpeedMpS) + k4) / (MpS.ToKpH(AbsSpeedMpS) + k5));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are using the same formula in several places. Consider moving it outside the if blocks to avoid code duplication

twpol pushed a commit that referenced this pull request Jun 29, 2023
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting
- Pull request #757 at d9d75f4: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #842 at a1c784c: Set up ability for steam locomotives to have multiple engines
- Pull request #846 at 1748e36: Initialize cars before restore
- Pull request #847 at 51067c3: Add additional default brakeshoe CoF
twpol pushed a commit that referenced this pull request Jul 1, 2023
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting
- Pull request #757 at d9d75f4: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #842 at a1c784c: Set up ability for steam locomotives to have multiple engines
- Pull request #846 at 1748e36: Initialize cars before restore
- Pull request #847 at 51067c3: Add additional default brakeshoe CoF
twpol pushed a commit that referenced this pull request Jul 1, 2023
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting
- Pull request #757 at d9d75f4: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #842 at a1c784c: Set up ability for steam locomotives to have multiple engines
- Pull request #846 at 1748e36: Initialize cars before restore
- Pull request #847 at 51067c3: Add additional default brakeshoe CoF
- Pull request #849 at 0d4e3da: Contributed projects and forking clarity
twpol pushed a commit that referenced this pull request Jul 1, 2023
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting
- Pull request #757 at d9d75f4: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #842 at a1c784c: Set up ability for steam locomotives to have multiple engines
- Pull request #846 at 1748e36: Initialize cars before restore
- Pull request #847 at 51067c3: Add additional default brakeshoe CoF
- Pull request #849 at 0d4e3da: Contributed projects and forking clarity
- Pull request #850 at 1605667: Correct output of sound system info
twpol pushed a commit that referenced this pull request Jul 2, 2023
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting
- Pull request #757 at d9d75f4: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves
- Pull request #831 at 9417e1b: 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 1748e36: Initialize cars before restore
- Pull request #847 at 51067c3: Add additional default brakeshoe CoF
- Pull request #849 at 0d4e3da: Contributed projects and forking clarity
- Pull request #850 at 1605667: Correct output of sound system info
Copy link
Contributor

@cesarBLG cesarBLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Peter

@peternewell
Copy link
Contributor Author

Hi Cesar,

Thanks for that.

@peternewell peternewell merged commit 55f992d into openrails:master Jul 3, 2023
3 checks passed
@peternewell peternewell deleted the brake-shoe#2 branch July 3, 2023 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
2 participants