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.

Sign up for GitHub

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

Jump to bottom

Added two missing 2450 namespaces #20

Merged
merged 4 commits into from
Sep 16, 2018
Merged

Added two missing 2450 namespaces #20

merged 4 commits into from
Sep 16, 2018

Conversation

ethall
Copy link
Collaborator

@ethall ethall commented Sep 16, 2018

Pull Request Checklist

Please review the Contribution Guidelines before submitting.

  • Pulling from a topic/feature/bugfix branch (right side).
  • Pulling against the dev branch (left side).
  • Code passes linting.
  • Code passes unit tests.
  • Code coverage is the same or better.
  • You have previously submitted a Contributor License Agreement or have contacted a maintainer to request one.

Description

  • Added missing smu.interlock and trigger.model namespaces to the 2450.
  • Fixed a bug introduced by not following the proper bugfix procedure. See 4d6801d.

@ethall ethall added the bug Something isn't working label Sep 16, 2018
@ethall ethall self-assigned this Sep 16, 2018
@ethall ethall merged commit f8f28ef into dev Sep 16, 2018
@ethall ethall deleted the bugfix/incomplete-2450 branch September 16, 2018 17:53
ethall added a commit that referenced this pull request Sep 19, 2018
@ethall
Updated CHANGELOG for PRs #20 & #21
1150fae
ethall added a commit that referenced this pull request Sep 20, 2018
@ethall
Merge v0.4.1 into Master (#25)
1a0c472 
* Escaped asterisk in 2450 display.settext (#2)

* Updated documentation for all items in 2450 trigger.* (#4)

* Standardized wording of trigger line reset() functions (#6)

* Inclusion of Lua 5.0.3 keywords, standard library, and select sub-libraries (#12)

* Updated 2450 smu-source and smu-enums (#15)

* Corrected README anchor link for supported instruments (#16)

* Changed how signatures are matched (#17)

* Created an instrument documentation provider (#19)

* Added two missing 2450 namespaces (#20)

* Removed unnecessary asterisk escapes (#21)

* Extracted server handlers into a ContentParser class (#22)

* Updated CHANGELOG for PRs #20 & #21

* Travis CI support (#23)

* Added Codecov support (#24)

* Updated package files to v0.4.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ethall ethall

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ethall