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

Vsdecoder: engine auto-start update #4880

Merged
merged 3 commits into from Feb 12, 2018

Conversation

Projects
None yet
4 participants
@klk32003
Contributor

klk32003 commented Feb 10, 2018

Harmonized auto-start for all engine types.
Wait for the end of the engine starting sound (Diesel).
A popup window appears if the speed is not zero at engine start (Diesel and Steam).
Cleanup.

@@ -15,14 +15,12 @@
* for more details.
* <P>
*
* @author Mark Underwood Copyright (C) 2011
* @author Mark Underwood Copyright (C) 2011, 2018

This comment has been minimized.

@rhwood

rhwood Feb 10, 2018

Contributor

@klk32003 Unless you are also @msunderwd, please do not extend his copyright to cover your changes. Please include yourself as another author using a second @author tag.

If you are msunderwd as well, is there a technical concern that leads you to use two accounts?

@msunderwd

This comment has been minimized.

Contributor

msunderwd commented Feb 10, 2018

@klk32003

This comment has been minimized.

Contributor

klk32003 commented Feb 11, 2018

@rhwood, @msunderwd
Thanks for clarification and sorry for the confusion.

@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Feb 12, 2018

Travis graphical restarted after timeout.

WARN  - Cleaning up frame "PanelPro" (a class jmri.util.JmriJFrame) in apps.PanelPro.PanelProTest. [Time-limited test] jmri.util.JUnitUtil.resetWindows()
WARN  - Cleaning up frame "PanelPro" (a class jmri.util.JmriJFrame) in apps.PanelPro.PanelProTest. [Time-limited test] jmri.util.JUnitUtil.resetWindows()
@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Feb 12, 2018

@rhwood It looks like your corrected changes have been done. I'd like to get this into 4.11.3 this evening. If I don't hear from you, and Travis passes, I'll merge and we can clean up any missing bits later. Thanks,

@rhwood

rhwood approved these changes Feb 12, 2018

@bobjacobsen bobjacobsen added this to the 4.11.3 milestone Feb 12, 2018

@bobjacobsen bobjacobsen merged commit 3fb8160 into JMRI:master Feb 12, 2018

4 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.02%) to 40.727%
Details

@klk32003 klk32003 deleted the klk32003:vsdecoder-engine-auto-start-update branch Feb 12, 2018

@klk32003

This comment has been minimized.

Contributor

klk32003 commented Feb 12, 2018

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment