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

reindent, merge features of MCS driver that were lost from version 1.5.0 #22

Closed
wants to merge 2 commits into from
Closed

reindent, merge features of MCS driver that were lost from version 1.5.0 #22

wants to merge 2 commits into from

Conversation

ganymede42
Copy link

No description provided.

@kmpeters
Copy link
Contributor

@ganymede42, can you revert 82417df and submit it as its own pull req? Formatting and content changes in a single pull req makes it very hard to see what actually changed.

@ganymede42
Copy link
Author

ganymede42 commented Sep 12, 2023 •
edited
Loading

can't you just check the individual commits if you do not trust the final result ?
That was the reason to do the indent in an independent commit... but it makes no sense to create multiple pull requests for that in my opinion.
The files were very inconsistently formatted and features from 1.5.0 were lost. It was a hard work to clean up all stuff and we have now AGAIN MCS1 and MCS2 working correctly at PSI what was not the situation with release R2-1.
To make you more confident with my name:
I work together with Dirk Zimoch ,Scott, Zan, and earlier with Niko Kivel at PSI and we have more that 150 SmarActs with MCS1 and MCS2 running at SwissFEL.

Thierry Zamofing added 2 commits September 12, 2023 10:44
reindent, delete trailling spaces, remove unused variables
3e2ea3e
MCS: merge lost features from 1.5.1, MCS2: various
bbccfdf 
- merge features of MCS driver that were lost since from version 1.5.0
  - Add PTYPE, MCF, AUTO_ZERO, CAL option
  - Fix jog for rot stages
- support PTYPE, MCF and other MCS/MCS2 specific functionalities
- MCS2: fix polling when there are missing positioner
- MCS2: support positioners without encoder
- simplify debugging with DBG_PRINTF
@ganymede42 ganymede42 closed this Sep 12, 2023
@kmpeters
Copy link
Contributor

kmpeters commented Sep 12, 2023 •
edited
Loading

I replied in #23.

The issue is not that I lack confidence in who you are. The issue is that I have a limited amount of time to spend reviewing pull requests. Combining formatting and functional changes makes the job of reviewing changes harder, which greatly increases the likelihood that the review of the pull request will be delayed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ganymede42 @kmpeters