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

VME EVM-300 changes #52

Closed
wants to merge 23 commits into from
Closed

Conversation

afpietryla
Copy link

Included are the changes I've made so far to add support for the VME version of the EVM-300.

I am particularly interested in how to handle the changes for the last commit, so that backward compatibility is maintained.

@afpietryla afpietryla force-pushed the aps branch 5 times, most recently from a152e24 to 865e222 Compare April 28, 2021 21:41
Copy link
Author

@afpietryla afpietryla left a comment

Choose a reason for hiding this comment

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

I need you assistance to continue working.

evgMrmApp/src/evgAcTrig.h Show resolved Hide resolved
evgMrmApp/src/evgAcTrig.h Show resolved Hide resolved
evgMrmApp/src/evgAcTrig.h Show resolved Hide resolved
evgMrmApp/src/evgAcTrig.h Show resolved Hide resolved
evgMrmApp/src/evgMrm.cpp Outdated Show resolved Hide resolved
evgMrmApp/src/evgMrm.cpp Outdated Show resolved Hide resolved
evrApp/Db/evrbase.db Outdated Show resolved Hide resolved
evrApp/src/evr/evr.h Outdated Show resolved Hide resolved
@@ -68,7 +68,7 @@ record(longin , "$(P)Prescaler-RB") {
field( DTYP, "Obj Prop uint32")
field( INP , "@OBJ=$(OBJ), PROP=Prescaler")
field( DESC, "EVG Mux Prescaler RB")
field( FLNK, "$(SYS){$(D)}ResetMxc-Cmd")
field( FLNK, "$(SYS):$(D):ResetMxc-Cmd.PROC")
Copy link
Collaborator

Choose a reason for hiding this comment

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

The preferred way to chase out NSLS2 naming convention out of .db files is with a macro to avoid breaking vme-evg230-nsls2.substitutions and other existing subtitutions.

Also, why the addition of .PROC?

Copy link
Author

Choose a reason for hiding this comment

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

I didn't intend to change the pvname here. I added the .PROC field to quite a warning message.

Copy link
Collaborator

Choose a reason for hiding this comment

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

In this instance the "Forward-link uses Channel Access ..." warning is actually an error. This link is intended to be local.

Copy link
Author

Choose a reason for hiding this comment

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

OK.

evgMrmApp/Db/evgTrigEvt-evm300.db Show resolved Hide resolved
@afpietryla afpietryla marked this pull request as ready for review July 20, 2021 20:43
@afpietryla
Copy link
Author

GIthub no longer running builds.

@mdavidsaver
Copy link
Collaborator

If you can rebase you will pick up the new configuration for github actions.

@anjohnson
Copy link
Member

This is weird, GitHub actions has run the build for Tony's repo after he rebased, but it isn't even noticing the new commits here, let alone running the actions. Are you aware of some kind of a quota which epics-modules might have run out of?

@mdavidsaver
Copy link
Collaborator

Maybe an approval thing? I don't see an "Approve and run" button, but I'm not sure if I am an admin for the epics-modules org.

@mdavidsaver
Copy link
Collaborator

There is definite weirdness. I get an error "Unable to re-run disabled workflow. " when I try to re-run that last successful build.

@mdavidsaver
Copy link
Collaborator

mdavidsaver commented Jul 20, 2021

Ok, maybe my doing. I was experimenting with scheduling a "monthly" build as "surveillance" for dependency problems. However, it seems that GHA will helpfully disable the workflow if there has been no repository activity in the past 60 days. Thank you GHA.

I'll be removing this...

schedule: # monthly
- cron: '0 0 1 * *'

I've re-enabled the workflows, and started re-running the last jobs. Nothing has changed with this PR, but that might happen on the next push.

@anjohnson
Copy link
Member

@hongran @afpietryla The commit e2f9306 that Ran just pushed to this branch needs to be removed or backed out, these changes are not appropriate for this pull request, which is anchored to the github branch.

@afpietryla
Copy link
Author

I believe I addressed all your comments. Please review again. Thanks.

@afpietryla afpietryla closed this Aug 4, 2021
@afpietryla afpietryla reopened this Aug 4, 2021
@afpietryla
Copy link
Author

I believe I addressed all your comments. Please review again. Thanks.

@jerzyjamroz jerzyjamroz marked this pull request as draft October 12, 2023 11:52
@jerzyjamroz
Copy link
Contributor

@hongran once you are ready, please issue the close request for this PR.

@jerzyjamroz
Copy link
Contributor

jerzyjamroz commented Sep 20, 2024

The redesign contains PR-s: #149 to #179 by @hongran .

@jerzyjamroz jerzyjamroz self-assigned this Sep 20, 2024
jerzyjamroz pushed a commit to jerzyjamroz/mrfioc2 that referenced this pull request Oct 10, 2024
@hongran
Copy link
Contributor

hongran commented Oct 16, 2024

The redesign contains PR-s: #149 to #179 by @hongran .

Everything covered by this PR has been merged in other PR-s. We can close this one now.
Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants