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

Ecos direction change #4945

Merged
merged 2 commits into from Feb 25, 2018

Conversation

Projects
None yet
2 participants
@mattharris
Member

mattharris commented Feb 24, 2018

This fixes the issue #4891 where an ECoS does not retain the current speed setting if a direction change is made by a JMRI Throttle (or WiThrottle) with a non-zero speed.

@mattharris mattharris added the Bug label Feb 24, 2018

@mattharris mattharris self-assigned this Feb 24, 2018

@mattharris mattharris added this to the 4.11.4 milestone Feb 24, 2018

@mattharris

This comment has been minimized.

Member

mattharris commented Feb 24, 2018

Travis Headless pr build failed with:

[INFO] Results:
[INFO] 
[ERROR] Failures: 
[ERROR]   OlcbSensorTest.testQueryState:247 expected:<[198f4c4c] 01 02 03 04 05 06 07 08> but was:<null>
[INFO] 
[ERROR] Tests run: 33436, Failures: 1, Errors: 0, Skipped: 1892

Restarted.

@mattharris

This comment has been minimized.

Member

mattharris commented Feb 24, 2018

Travis Headfull pr build failed due to:

$ travis_wait 40 ./scripts/travis.sh
Still running (40 of 40): ./scripts/travis.sh
Timeout (40 minutes) reached. Terminating "./scripts/travis.sh"
The command ./scripts/travis.sh exited with 137.

Restarted.

@mattharris

This comment has been minimized.

Member

mattharris commented Feb 24, 2018

AppVeyor branch build failed due to:

    [junit] ------------- ---------------- ---------------
    [junit] Testcase: testLaunchTmcc(apps.DispatcherPro.DispatcherProTest):	Caused an ERROR
    [junit] test timed out after 90 seconds
    [junit] org.junit.runners.model.TestTimedOutException: test timed out after 90 seconds
    [junit] 	at java.lang.Object.wait(Native Method)
    [junit] 	at java.lang.Object.wait(Object.java:502)
    [junit] 	at java.awt.WaitDispatchSupport.enter(WaitDispatchSupport.java:264)
    [junit] 	at java.awt.Dialog.show(Dialog.java:1084)
    [junit] 	at javax.swing.JOptionPane.showOptionDialog(JOptionPane.java:869)
    [junit] 	at javax.swing.JOptionPane.showMessageDialog(JOptionPane.java:666)
    [junit] 	at javax.swing.JOptionPane.showMessageDialog(JOptionPane.java:637)
    [junit] 	at jmri.implementation.JmriConfigurationManager.load(JmriConfigurationManager.java:204)
    [junit] 	at jmri.implementation.JmriConfigurationManager.load(JmriConfigurationManager.java:170)
    [junit] 	at apps.Apps.<init>(Apps.java:252)
    [junit] 	at apps.DispatcherPro.DispatcherPro.<init>(DispatcherPro.java:40)
    [junit] 	at apps.DispatcherPro.DispatcherPro.main(DispatcherPro.java:102)
    [junit] 	at apps.DispatcherPro.DispatcherProTest.testLaunchTmcc(DispatcherProTest.java:112)
    [junit] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
    [junit] 	at java.lang.Thread.run(Thread.java:748)
    [junit] 
    [junit] 
mvn :     [junit] Test apps.tests.AllTest FAILED
At line:1 char:1
+ mvn test -P appveyor --batch-mode
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (    [junit] Tes....AllTest FAILED:String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError

Restarted.

@bobjacobsen bobjacobsen merged commit 50fae80 into master Feb 25, 2018

6 checks passed

WIP ready for review
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
coverage/coveralls First build on master at 40.697%
Details

@bobjacobsen bobjacobsen deleted the ecos-direction-change branch Feb 25, 2018

mattharris added a commit to mattharris/JMRI that referenced this pull request Feb 26, 2018

mattharris added a commit that referenced this pull request Feb 26, 2018

Merge pull request #4964 from mattharris/ecos-direction-change
Typo-fix - missed a rather important angle bracket in #4945
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment