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

Changes to FFO and MKS317 #43

Merged
merged 40 commits into from
Jun 24, 2020
Merged

Changes to FFO and MKS317 #43

merged 40 commits into from
Jun 24, 2020

Conversation

ghalym
Copy link
Collaborator

@ghalym ghalym commented Jun 19, 2020

ENH: VGC FFO AutoReset
DEV: Modify limit based on experience with EM1K0-GMD-GPI-40

ghalym and others added 30 commits March 18, 2020 15:37
@ghalym
DEV: Issue#20, Issue#22
fac3c9c 
Issue#20 : Ion Pumps use own pressure reading after turning on, also added a method for AutoOn. user program to invoke the method.

Issue#22, Update MKS 909 Hot Cathode POU with logging and all other upgrades.
@ghalym
DEV: PIP AutoOn is availabe through pragma
1593aa2
@ghalym
DEV: Gauge event severity and message changes
6901e05
@ghalym
DEV: PIP logger and VGC pmps
c3a75b3
@ghalym
Merge branch 'master' into master
3fcf67d
@ghalym
DEV: Added Gagues 972,909
107470c 
ENH: PTM MagDriveDigital has status updates
DEV: Serial_IO Methodes added to pumps with serial interface
@ghalym
DEV: Unit Tests, Agilent Analog Signals. FIX: EBARA PTM Analaog Signals
29916e6
@ghalym
Merge branch 'master' of https://github.com/ghalym/L2SI-Vacuum-Lib
ae102dd
@ghalym
ENH: Comments
8f84457
@ghalym
FIX: PIP Pressure is not calculated when device is off
3b943c9
@ghalym
Issues pcdshub#11, pcdshub#14,pcdshub#21,pcdshub#25,pcdshub#27,pcdshu…
bf9cc18 
…b#32
@ghalym
Issue pcdshub#17
84751c9
@ghalym
ENH: MKS 500 logger, Ebara dry pymp and ebara turbo
97544db
@ghalym
FIX: Pragma
0acf6cf
@ghalym
ENH: Change the valve moving timout to 30s
4953693
@ghalym
DEV: VGC new position State, Diode interlock ok function, Ebara max b…
ad851cd 
…acking pressure
@ghalym
ENH: xLog bool to switch off logger for noisy gauges
792840b 
FIX: PTM_Ebara Current speed calculations
@n-wbrown
DEV: Don't use hard-coded values
459b3d3
@n-wbrown
BUG: move MKS317's ValidLo low limit to .15V
3849a90
@n-wbrown
STY: order range limits
cfb12e2
@ghalym
FIX: MKS317's ValidLo limit issue pcdshub#36
4041d66
@ghalym
Merge branch 'master' into mks317-validlo-limits
f5012e2
@ghalym
Merge pull request #6 from n-wbrown/mks317-validlo-limits
38fa4a2 
BUG: Adjust MKS317's limits for the ValidLo state
@ghalym
Merge branch 'master' into master
5ebafec
@ghalym
Merge remote-tracking branch 'upstream/master'
b78f775
@ghalym
ENH: PIP xError
cf218bd
@ghalym
Merge branch 'master' of git@github.com:ghalym/lcls-twincat-vacuum.git
d8f8f7a 
# Conflicts:
#	L2SIVacuum/L2SIVacuum.tmc
@ghalym
Merge branch 'master' of git@github.com:ghalym/lcls-twincat-vacuum.git
6737170 
# Conflicts:
#	L2SIVacuum/L2SIVacuum.tmc
@ghalym
FIX: FB_VGC valve state
e917164
@ghalym
Merge remote-tracking branch 'upstream/master'
11bf252
@ghalym
Copy link
Collaborator Author

ghalym commented Jun 19, 2020

@slacAWallace I am not sure why every new pull request still show the old commits. Any idea what I could be doing wrong here?

@slacAWallace
Copy link
Contributor

Tough to say without knowing your workflow. @klauer or @ZLLentz might have a better idea.

@klauer
Copy link
Contributor

klauer commented Jun 20, 2020

Take a look here and see where your master is in comparison to where pcdshub's is: https://github.com/pcdshub/lcls-twincat-vacuum/network

@ZLLentz
Copy link
Member

ZLLentz commented Jun 20, 2020

All of these "extra" commits are not present on the pcdshub master branch. I assume this is because your pull requests were merged via a squash commit?

You can avoid this in the future by starting from exactly the pcdshub master branch when you make changes.

ghalym added 2 commits June 19, 2020 19:17
@ghalym
ENH: VGC Logger moved to ACT_logger. ADS Watchdog read and write time…
3a22c86 
…s has been configured (5-10 times) the signal transmission
@ghalym
watchdog
e442d9f
@ZLLentz
Copy link
Member

ZLLentz commented Jun 22, 2020

The other thing you can do to help avoid this is to make a new branch instead of working on your own master branch. Then you can keep your master as a mirror of pcdshub/master and then you're always starting from the shared master when you create new branches in the future. There is some elaboration here: https://pcdshub.github.io/development.html

@ghalym ghalym requested a review from slacAdpai June 24, 2020 16:59
slacAdpai
slacAdpai approved these changes Jun 24, 2020
View reviewed changes
Copy link
Contributor

@slacAdpai slacAdpai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@ghalym ghalym merged commit e24e1f6 into pcdshub:master Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slacAdpai slacAdpai slacAdpai approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ghalym @slacAWallace @klauer @ZLLentz @slacAdpai @n-wbrown