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

DCC++ ESP (WiFi enabled DCC++) customizations #4533

Merged
merged 2 commits into from Dec 15, 2017

Conversation

Projects
None yet
2 participants
@atanisoft

atanisoft commented Dec 8, 2017

The DCC++ ESP base station has support for additional motorboards, or power districts. As such a couple of the replies need slight adjustment for parsing. The code is structured such that it can function with either the DCC++ESP base station, DCC++ base station, or the to be released DCC++ESP32 base station (runs on the ESP32, no arduino involved).

The DCC++ESP base station code can be found here: https://github.com/atanisoft/BaseStation

The DCC++ESP32 base station code hasn't been pushed yet but will be before Christmas.

Mike Dunston added some commits Dec 8, 2017

Mike Dunston
DCC++ ESP changes + cleanups
1) Removing unused ArrayList<Integer>
2) Adding support for named power districts and current draws.
3) Adding version parser for ESP32 based basestation.
@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Dec 10, 2017

Member

AppVeyor restarted after:

    [junit] ------------- ---------------- ---------------
    [junit] Testcase: jmri.RunCucumberTest:	Caused an ERROR
    [junit] Unexpected ERROR or FATAL messages emitted
    [junit] java.lang.AssertionError: Unexpected ERROR or FATAL messages emitted
    [junit] 	at apps.tests.Log4JFixture.tearDown(Log4JFixture.java:38)
    [junit] 	at jmri.RunCucumberTest.afterTests(RunCucumberTest.java:38)
    [junit] 	at cucumber.api.junit.Cucumber.run(Cucumber.java:100)
    [junit] 
    [junit] 
    [junit] ERROR - reply complete in unexpected state: 10 was O
mvn :     [junit] Test apps.tests.AllTest FAILED
At line:1 char:1
Member

bobjacobsen commented Dec 10, 2017

AppVeyor restarted after:

    [junit] ------------- ---------------- ---------------
    [junit] Testcase: jmri.RunCucumberTest:	Caused an ERROR
    [junit] Unexpected ERROR or FATAL messages emitted
    [junit] java.lang.AssertionError: Unexpected ERROR or FATAL messages emitted
    [junit] 	at apps.tests.Log4JFixture.tearDown(Log4JFixture.java:38)
    [junit] 	at jmri.RunCucumberTest.afterTests(RunCucumberTest.java:38)
    [junit] 	at cucumber.api.junit.Cucumber.run(Cucumber.java:100)
    [junit] 
    [junit] 
    [junit] ERROR - reply complete in unexpected state: 10 was O
mvn :     [junit] Test apps.tests.AllTest FAILED
At line:1 char:1
@atanisoft

This comment has been minimized.

Show comment
Hide comment
@atanisoft

atanisoft Dec 10, 2017

I suspect the AppVeyor failure originally was due to this:

    [junit] Only local connections are allowed.
    [junit] ERROR - Error on WebSocket message:
    [junit] Will not send message on non-open session [main] jmri.server.json.JsonWebSocket.?()
    [junit] ERROR - Error on WebSocket message:
    [junit] Will not send message on non-open session [main] jmri.server.json.JsonWebSocket.?()
    [junit] .......................................................
    [junit] 
    [junit] 17 Scenarios (17 passed)

I don't know which test this came from though since the test results are not preserved from AppVeyor and I can't reproduce this locally. It also looks to be coming from code outside of the DCC++ tests, which probably should be expanded some.

atanisoft commented Dec 10, 2017

I suspect the AppVeyor failure originally was due to this:

    [junit] Only local connections are allowed.
    [junit] ERROR - Error on WebSocket message:
    [junit] Will not send message on non-open session [main] jmri.server.json.JsonWebSocket.?()
    [junit] ERROR - Error on WebSocket message:
    [junit] Will not send message on non-open session [main] jmri.server.json.JsonWebSocket.?()
    [junit] .......................................................
    [junit] 
    [junit] 17 Scenarios (17 passed)

I don't know which test this came from though since the test results are not preserved from AppVeyor and I can't reproduce this locally. It also looks to be coming from code outside of the DCC++ tests, which probably should be expanded some.

@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Dec 15, 2017

Member

Thanks. This all looks good to me (though I don't have a hardware setup to test it on real trains). Particularly appreciate the tests.

In addition to the code (which I'll merge shortly), should there be a mention of this in the help/en/html/hardware/dccpp/index.shtml file? That then shows up on the JMRI web site.

Member

bobjacobsen commented Dec 15, 2017

Thanks. This all looks good to me (though I don't have a hardware setup to test it on real trains). Particularly appreciate the tests.

In addition to the code (which I'll merge shortly), should there be a mention of this in the help/en/html/hardware/dccpp/index.shtml file? That then shows up on the JMRI web site.

@bobjacobsen bobjacobsen added this to the 4.11.1 milestone Dec 15, 2017

@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Dec 15, 2017

Member

Also, is there a real name I can credit this to in the release note? Thanks.

Member

bobjacobsen commented Dec 15, 2017

Also, is there a real name I can credit this to in the release note? Thanks.

@bobjacobsen bobjacobsen merged commit 8717fe0 into JMRI:master Dec 15, 2017

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 39.725%
Details
@atanisoft

This comment has been minimized.

Show comment
Hide comment
@atanisoft

atanisoft Dec 15, 2017

@bobjacobsen you can credit to Mike Dunston. Thanks for merging. It's appreciated!

atanisoft commented Dec 15, 2017

@bobjacobsen you can credit to Mike Dunston. Thanks for merging. It's appreciated!

@atanisoft

This comment has been minimized.

Show comment
Hide comment
@atanisoft

atanisoft Dec 15, 2017

Mentioning it in the dcc++ html file would likely be good. The base station code I am working on is 100% compatible with the Arduino version but I have removed the Arduino from the stack. I also have a version of the base station that uses an Arduino and esp8266 to provide the wifi interface that uses the same modifications as provided in this PR.

atanisoft commented Dec 15, 2017

Mentioning it in the dcc++ html file would likely be good. The base station code I am working on is 100% compatible with the Arduino version but I have removed the Arduino from the stack. I also have a version of the base station that uses an Arduino and esp8266 to provide the wifi interface that uses the same modifications as provided in this PR.

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