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

fix: TCLKA and TCLKB and EVRU/EVRD clocks. #94

Merged
merged 1 commit into from
Oct 26, 2023
Merged

fix: TCLKA and TCLKB and EVRU/EVRD clocks. #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions evrMrmApp/src/drvem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,6 @@ try{

} else if(formfactor==formFactor_mTCA) {

// mapping to TCLKA and TCLKB as UNIV16, 17
// we move down to UNIV0, 1
outputs[std::make_pair(OutputFPUniv,0)]=new MRMOutput(SB()<<n<<":FrontUnivOut0", this, OutputFPUniv, 16);
outputs[std::make_pair(OutputFPUniv,1)]=new MRMOutput(SB()<<n<<":FrontUnivOut1", this, OutputFPUniv, 17);

Comment on lines -289 to -293
Copy link
Contributor

Choose a reason for hiding this comment

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

If this is removed, where is the configuration of TCLKA and TCLKB done on the MTCA EVR?

Copy link
Contributor

Choose a reason for hiding this comment

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

I found the solution to my answer above in the pull request #95 and commit 64b5763, where the number of UNIV-IOs is extended to 18 and the TCLKA and TCLKB are mapped as UNIV-IO16 and 17.

Now I only have a question how this will be handled on the GUI.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

$(P)Out-TCLKA-Pat-Low00_15-SP etc.

shortcmls.resize(2);
shortcmls[0]=new MRMCML(n+":CML0", 0,*this,MRMCML::typeCML,form);
shortcmls[1]=new MRMCML(n+":CML1", 1,*this,MRMCML::typeCML,form);
Expand Down Expand Up @@ -685,7 +680,7 @@ EVRMRM::setSourceTS(TSSource src)
switch(src){
case TSSourceInternal:
// div!=0 selects src internal
div=(epicsUInt16)(eclk/clk);
div=roundToUInt(eclk/clk, 0xffff);
break;
case TSSourceEvent:
BITCLR(NAT,32, base, Control, Control_tsdbus);
Expand Down Expand Up @@ -727,7 +722,14 @@ EVRMRM::clockTSSet(double clk)
TSSource src=SourceTS();
double eclk=clock();

if(clk>eclk*1.01 || clk==0.0)
/* There is an issue with this and the embedded EVRs of the mTCA EVM vers
* 280b0207. The register holding the fractional synthesizer configuration
* word is empty, so eclk always resolves to 0, and so does clk. This messes
* up with the delay generators width/delay settings. By removing this check
* clockTS() can be used for the calculation of the width/delay.
* if(clk>eclk*1.01 || clk==0.0)
*/
if(clk==0.0)
clk=eclk;

SCOPED_LOCK(evrLock);
Expand Down
Loading