Diamond changes #4
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
January 11, 2017 09:54
This commit introduced no changes to the code, only the formatting was changed to be consistent across the source file.
Removed some of the dead code, changed visability of some of the methods of the class, removed some of the magic numbers.
Moved functions that do not depend on the class out of the class, named some more constants, flattened the structure of conditionals a bit, this does not impact performance but the code is much more readable now, error is returned in set functions if nothing is done.
Consistency of naming convention. Removal of some magic numbers.
Removed some of the if clause inconsistancies. Moved an if/else stack to switch. Added some more TODO comments for future references.
Now the firmware version is set. Added communication status checks so there should be less false positives.
Wrapped everything in namespace, wrapped byte swap functions into one function, interface for read from device simplified.
Connection errors are now handled with exceptions.
…evice writes. Moved the acquisition status set to the acquisition task Removed temporary array, used macro for another magic number.
Removed serial number as it is only supported on some versions and not too helpful Added documentation. Added the gui.
…update the C code with the new settings and separate the EDM screens into two different versions.
…shold using the autosettings command.
# Conflicts: # iocs/mythenIOC/configure/RELEASE # mythenApp/op/Makefile # mythenApp/src/mythen.cpp
Removing local RELEASE file, etc/ dir and various other tweaks for the DLS environment, as a preparation for an upstream PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an attempt to merge what is essentially two forks, having diverged a little since around 2016...
Unfortunately the people who made the core changes have now left Diamond - but the driver appears to be in a working state on one of our beamlines.
What I have done for this branch/PR is basically: