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

Updated TAMS Command Station code for JMRI - for test version #1566

Merged
merged 39 commits into from Jun 29, 2016

Commits on Jun 13, 2016

  1. Copy the full SHA
    83c5c78 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. Updates to TamsTurnoutManager

    - decoderTurnoutState should not be static (so can reference TurnoutManager state), should not be private (so tests can be written later)
    
    - provide turnout from "this" manager, don't do lookup of the manager
    
    - The change in state is from a CS, so use setCommandedStateFromCS
    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    d61e739 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    26a2ac7 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    28148c5 View commit details
    Browse the repository at this point in the history
  4. Initial implementation of tests

    (Not yet known to compile due to missing file in branch)
    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    09fed14 View commit details
    Browse the repository at this point in the history
  5. include tams test package

    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    7c15f7c View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    96d21ed View commit details
    Browse the repository at this point in the history
  7. clean compile

    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    6a7f4de View commit details
    Browse the repository at this point in the history
  8. clean compile

    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    a3082b5 View commit details
    Browse the repository at this point in the history
  9. clean compile

    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    7e5c185 View commit details
    Browse the repository at this point in the history
  10. Turnout name needs 'T'

    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    1398ad3 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #1 from bobjacobsen/bobj-update-to-TamsTurnoutManager

    Updates to TamsTurnoutManager
    janboen committed Jun 14, 2016
    Copy the full SHA
    a6d393b View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    073b11d View commit details
    Browse the repository at this point in the history
  13. line ends

    bobjacobsen committed Jun 14, 2016
    Copy the full SHA
    f4c4583 View commit details
    Browse the repository at this point in the history
  14. Copy the full SHA
    78b5402 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. Merge pull request #3 from bobjacobsen/test-update-to-HEAD-JMRI-JMRI-…

    …master-for-Tams
    
    Merge to current contents of JMRI/JMRI master branch
    janboen committed Jun 15, 2016
    Copy the full SHA
    02e7b78 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2016

  1. Bug fix

    In TamsTrafficController so now all binary commands are properly
    handled.
    janboen committed Jun 16, 2016
    Copy the full SHA
    727452c View commit details
    Browse the repository at this point in the history
  2. Minor edit

    janboen committed Jun 16, 2016
    Copy the full SHA
    61ba747 View commit details
    Browse the repository at this point in the history
  3. also push generic change

    janboen committed Jun 16, 2016
    Copy the full SHA
    bd888e6 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    ecd02d2 View commit details
    Browse the repository at this point in the history
  5. Updated TamsTrafficController with stub endOfMessage method

    This doesn't work as the replies are not handled.
    janboen committed Jun 16, 2016
    Copy the full SHA
    bb25deb View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. Copy the full SHA
    fba0822 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2016

  1. Support for all functions is working

    Binary polling commands for power, turnouts and sensors
    Loco is still using ASCII polling
    Some fixes to be done in command monitor and simulator to be reworked.
    janboen committed Jun 18, 2016
    Copy the full SHA
    05800b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. Reworked TamsThrottle to binary polling

    Must clean this up so only 1 polling message is generated and answers
    properly ditributed to all open TamsThrottle.
    janboen committed Jun 20, 2016
    Copy the full SHA
    5092150 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. Copy the full SHA
    d3cad96 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9d5a51b View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    6721e6a View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. Updated hardware info page

    janboen committed Jun 24, 2016
    Copy the full SHA
    d5ed519 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2016

  1. Update turnout state in JMRI problem

    This version is as quiet as can be but the above problem has to be
    fixed.
    janboen committed Jun 25, 2016
    2
    Copy the full SHA
    4c4ea21 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2016

  1. Tams package should now work properly

    No more use of log.info but switched to log.debug and proper use of
    default.lcf.
    TamsTurnout problem resolved.
    Please let me know how I can get rid of the unwanted files.
    janboen committed Jun 27, 2016
    Copy the full SHA
    184b85a View commit details
    Browse the repository at this point in the history
  2. Update .gitignore

    added .metadata and RemoteSystemTempFiles as per RHWood recommendations.
    janboen committed Jun 27, 2016
    Copy the full SHA
    9bf5b14 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    d39aac4 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    079faaa View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    aa2f243 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Merge branch 'master' of https://github.com/JMRI/JMRI into JMRI-master

    # Conflicts:
    #	java/src/jmri/jmrix/tams/TamsTrafficController.java
    janboen committed Jun 28, 2016
    Copy the full SHA
    b148ec4 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'janboen-master-update-merge' of https://github.com/bobj…

    …acobsen/JMRI into bobjacobsen-janboen-master-update-merge
    janboen committed Jun 28, 2016
    Copy the full SHA
    f7a6c73 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    ae97f0b View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    60236f8 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    0f61b6e View commit details
    Browse the repository at this point in the history