-
Notifications
You must be signed in to change notification settings - Fork 30
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
db file update and bug fix #181
Conversation
@jerzyjamroz I also took a look at the evm-mtca-300 substitution file and I found the 1Pps source bit assignment was not correct either. FP0 and FP1 are right but the rests are not. I guess no one was actually using other input as the 1Pps sources. Should we correct them in this PR too? |
@hongran , the documentation gives the reference here:
|
@hongran Feel free to contribute the correction. |
{"\$(P)InpUniv13", "$(EVG):UnivInp13", 2, "1"} | ||
{"\$(P)InpUniv14", "$(EVG):UnivInp14", 3, "1"} | ||
{"\$(P)InpUniv15", "$(EVG):UnivInp15", 4, "1"} | ||
{"\$(P)InpRear0", "$(EVG):RearInp0", 5, "1"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't it be:
{"\$(P)InpRear0", "$(EVG):RearInp0", 6, "1"}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be bit 5. The mbbi value is 0x20, which is bit 5 (0x01 is bit 0).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be bit 5. The mbbi value is 0x20, which is bit 5 (0x01 is bit 0).
I think it would be nice to group: evgMrmApp/Db/evgTrigEvt.db into mbbo-s like:
- Mxc + AC + Front
- Univ0..9
- Univ10..15
- Rear0..9
- Rear10..15 (it would be not used by MTCA).
and evgMrmApp/Db/evgDbus.db using the same concept.
Let me know your opinion.
{"\$(P)InpRear1", "$(EVG):RearInp1", 0, "2"} | ||
{"\$(P)InpRear2", "$(EVG):RearInp2", 1, "2"} | ||
{"\$(P)InpRear3", "$(EVG):RearInp3", 2, "2"} | ||
{"\$(P)InpRear4", "$(EVG):RearInp4", 3, "2"} | ||
{"\$(P)InpRear5", "$(EVG):RearInp5", 4, "2"} | ||
{"\$(P)InpRear6", "$(EVG):RearInp6", 5, "2"} | ||
{"\$(P)InpRear7", "$(EVG):RearInp7", 6, "2"} | ||
{"\$(P)InpRear8", "$(EVG):RearInp8", 7, "2"} | ||
{"\$(P)InpRear9", "$(EVG):RearInp9", 8, "2"} | ||
{"\$(P)InpRear10", "$(EVG):RearInp10", 9, "2"} | ||
{"\$(P)InpRear11", "$(EVG):RearInp11", A, "2"} | ||
{"\$(P)InpRear12", "$(EVG):RearInp12", B, "2"} | ||
{"\$(P)InpRear13", "$(EVG):RearInp13", C, "2"} | ||
{"\$(P)InpRear14", "$(EVG):RearInp14", D, "2"} | ||
{"\$(P)InpRear15", "$(EVG):RearInp15", E, "2"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in the manual: InpRear -> InpTB
change suggested.
{"\$(P)OutTBUV00", "$(EVR):RearUniv0", "TBUV 0"} | ||
{"\$(P)OutTBUV01", "$(EVR):RearUniv1", "TBUV 1"} | ||
{"\$(P)OutTBUV02", "$(EVR):RearUniv2", "TBUV 2"} | ||
{"\$(P)OutTBUV03", "$(EVR):RearUniv3", "TBUV 3"} | ||
{"\$(P)OutTBUV04", "$(EVR):RearUniv4", "TBUV 4"} | ||
{"\$(P)OutTBUV05", "$(EVR):RearUniv5", "TBUV 5"} | ||
{"\$(P)OutTBUV06", "$(EVR):RearUniv6", "TBUV 6"} | ||
{"\$(P)OutTBUV07", "$(EVR):RearUniv7", "TBUV 7"} | ||
{"\$(P)OutTBUV08", "$(EVR):RearUniv8", "TBUV 8"} | ||
{"\$(P)OutTBUV09", "$(EVR):RearUniv9", "TBUV 9"} | ||
{"\$(P)OutTBUV10", "$(EVR):RearUniv10", "TBUV 10"} | ||
{"\$(P)OutTBUV11", "$(EVR):RearUniv11", "TBUV 11"} | ||
{"\$(P)OutTBUV12", "$(EVR):RearUniv12", "TBUV 12"} | ||
{"\$(P)OutTBUV13", "$(EVR):RearUniv13", "TBUV 13"} | ||
{"\$(P)OutTBUV14", "$(EVR):RearUniv14", "TBUV 14"} | ||
{"\$(P)OutTBUV15", "$(EVR):RearUniv15", "TBUV 15"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OutTBUV -> OutTB (as in the manual).
Sure. Making it consistent with the manual is good. |
@jerzyjamroz There are more record names and mbbo bit strings with name like RearInp in evgMrm.db, evgDbus.db and evgTrigEvt.db. Should we change all of them (Rear -> TB)? I am worried that such changes cause issues in facilities that are using them. |
I do not have a clear idea how to approach that, but even your suggestion here:
introduce more confusion with RB (why not OutRear0 but new name? And TB in the DESC). Well, share your opinion, do you prefer to use P.S. |
Yes, "Rear" is OK for me, so it is at least consistent with the rest of record names. I will fix the DESC, too. I will fix that commit. |
I just updated the commit to make the naming scheme consistent with the rest of the database. |
Updates for consistency:
1: In the evr-vme-300 substitution file, for the transition board output records, TBUV is changed to RBUV because the objects in the drivers are like RearInput.
2: Added Univ11-15 to the DBus source selection, so that all Univ inputs can be used. Mainly for EVRU and EVRD interface
Bug fix:
1: Fixed the FLNK filed of the Mxc reset enable for hardware input channels
2: Fixed the evm-vme-300 substitution file regarding the bit assignment for the 1 Pps source.