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

battery switch two buttons option in combination with a delay #822

Merged

Conversation

sweiland-openrails
Copy link
Contributor

When using the battery switch two buttons option in combination with a delay:

Engine (
ORTSBattery (
Mode ( PushButtons )
Delay ( 2s )
DefaultOn ( 1 )
)

battery does not get switched on/off.

@sweiland-openrails sweiland-openrails added the bug Something isn't working label Apr 23, 2023
twpol pushed a commit that referenced this pull request Apr 23, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 2451991: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at 001e285: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
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.

I don't think this is 100% correct. This will cause the physical button on the cab to return to 0 while being pressed, as well as triggering the sound before the button has been released. I'm analyzing the original code and I don't see any obvious issue, so it might be related to your CVF. I'll try to test it.

Okay, so I tested and it works correctly on my side, so I think this is not an OpenRails bug, but something in your CVF (probably you are using Style ( ONOFF ) instead of Style ( PRESSED ))

@sweiland-openrails
Copy link
Contributor Author

sweiland-openrails commented Apr 24, 2023

Ok, I'll give it another look. I'm rather new to Open Rails, where does the abbreviation CVF stand for?

twpol pushed a commit that referenced this pull request Apr 24, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 2451991: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at 8223595: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
twpol pushed a commit that referenced this pull request Apr 24, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 2451991: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
@cesarBLG
Copy link
Contributor

Don't worry. CVF is the CabView File, which is usually located inside the CabView folder of a locomotive. The syntax of CVF files allows several types of buttons: Style ( ONOFF ) means that when you push a button it'll remain active until you push it again, while Style ( PRESSED ) means that it goes back to the original position when you release it.

I tested the bug by adding the block you suggest:

Engine (
ORTSBattery (
Mode ( PushButtons )
Delay ( 2s )
DefaultOn ( 1 )
)

And added the following to the .cvf file of the locomotive:

TwoState (
	Type ( ORTS_BATTERY_SWITCH_COMMAND_BUTTON_CLOSE TWO_STATE )
	Position ( 100 420 24 12 )
	Graphic ( "battery_on.ace" )
	NumFrames ( 2 2 1 )
	Style ( PRESSED )
	MouseControl ( 1 )
)
TwoState (
	Type ( ORTS_BATTERY_SWITCH_COMMAND_BUTTON_OPEN TWO_STATE )
	Position ( 115 420 24 12 )
	Graphic ( "battery_off.ace" )
	NumFrames ( 2 2 1 )
	Style ( PRESSED )
	MouseControl ( 1 )
)

And I'm getting the correct behaviour, so I couldn't reproduce the bug.
It works for me also using the keyboard (Insert for closing, Ctrl+Insert for opening).

twpol pushed a commit that referenced this pull request Apr 25, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 53f4a0e: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
twpol pushed a commit that referenced this pull request Apr 25, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 3acb653: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
twpol pushed a commit that referenced this pull request Apr 27, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 45a72f3: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
twpol pushed a commit that referenced this pull request Apr 28, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 36b4b6d: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 73b637f: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
twpol pushed a commit that referenced this pull request Apr 28, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 36b4b6d: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
twpol pushed a commit that referenced this pull request Apr 28, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 36b4b6d: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
twpol pushed a commit that referenced this pull request Apr 29, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 36b4b6d: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
twpol pushed a commit that referenced this pull request Apr 29, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at ff82bde: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
twpol pushed a commit that referenced this pull request Apr 30, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at ff82bde: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
twpol pushed a commit that referenced this pull request May 1, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at ff82bde: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
twpol pushed a commit that referenced this pull request May 2, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at ff82bde: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
- Pull request #827 at 265ab20: Fixed incomplete INI parameter file path for power supplies
twpol pushed a commit that referenced this pull request May 2, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at ff82bde: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
@sweiland-openrails
Copy link
Contributor Author

Bought a secondhand SDD, so some more diskspace to experiment.

Still I see the same problem. I have no battery statements in my .cvf file. I'm testing with the keys and <Ctrl+Insert>. Works correctly without the delay or a delay of 0 seconds. But with a delay the Battery switch in the Train Driving Info (F5) does not move. I'll have another look in the code...

Thanks for explaining me about the .cvf file.

@cesarBLG
Copy link
Contributor

cesarBLG commented May 2, 2023

Ah, I now see your thinking. The original code requires you to keep the button pressed until the battery is connected, so you have to keep <Ctrl+Insert> pressed for two seconds. This is the correct behaviour for other electrical switches as the circuit breaker, but I don't know about the battery.

You could post a question at Elvas Tower to see if the button has to kept pushed until switch is closed in real trains.

twpol pushed a commit that referenced this pull request May 3, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at ff82bde: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
- Pull request #828 at 048c7b2: Harmless part of "Improvements for braking systems"
@sweiland-openrails
Copy link
Contributor Author

sweiland-openrails commented May 3, 2023

Ah, thanks. I thought I tested keeping the button pressed. Tested once again and it works as you describe, keeping the button pressed. Seems logical to me, pressing the button for two seconds. Can I Undo this Pull Request by pressing the "Close with comment" button?
Oh, wait, I'll change this in a documentation fix.

twpol pushed a commit that referenced this pull request May 3, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 4c064d2: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
- Pull request #828 at 048c7b2: Harmless part of "Improvements for braking systems"
- Pull request #829 at e872eff: Improvements for air brakes #3 - Emergency valves
twpol pushed a commit that referenced this pull request May 3, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 4c064d2: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
- Pull request #828 at 611753f: Harmless part of "Improvements for braking systems"
- Pull request #829 at e872eff: Improvements for air brakes #3 - Emergency valves
twpol pushed a commit that referenced this pull request May 3, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at c163e21: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
- Pull request #828 at 611753f: Harmless part of "Improvements for braking systems"
twpol pushed a commit that referenced this pull request May 3, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at c163e21: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 6d660af: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
- Pull request #828 at 611753f: Harmless part of "Improvements for braking systems"
cesarBLG
cesarBLG previously approved these changes May 3, 2023
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.

Yeah, I think adding it to the documentation is a good idea.

@cesarBLG cesarBLG added the documentation Improvements or additions to documentation label May 3, 2023
twpol pushed a commit that referenced this pull request May 3, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at c163e21: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 6d660af: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #826 at 2ca8fd7: Bug fix for Crash when switching cab https://bugs.launchpad.net/or/+bug/2018230
@sweiland-openrails sweiland-openrails removed the bug Something isn't working label May 4, 2023
@sweiland-openrails
Copy link
Contributor Author

If I now merge this change I not only have a changed .rst documentation file, but also the BatterySwitch.cs file. That's because this .cs file contains 3 extra bytes EF BB BF (which is some UTF-8 byte order mark). I don't want to pollute the history of this BatterySwitch.cs with an extra non existent change. Any idea how I can get rid of this change? Git does not see this as a change, so I cannot commit the file without 3 extra bytes.
Or can I just close the Pull Request without the merge and redo the fix only in the .rst file?

@cesarBLG
Copy link
Contributor

cesarBLG commented May 5, 2023

I fixed it with a simple trick

@cesarBLG cesarBLG merged commit ebe1c5c into openrails:master May 5, 2023
3 checks passed
twpol pushed a commit that referenced this pull request May 5, 2023
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at c163e21: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 832a396: battery switch two buttons option in combination with a delay
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
@sweiland-openrails
Copy link
Contributor Author

thanks...

@sweiland-openrails sweiland-openrails deleted the Bug_2017417_battery_switch branch September 23, 2023 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
2 participants