Repository navigation
Move smargon from ibek-support-dls at 2-25 #261
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| # yaml-language-server: $schema=https://github.com/epics-containers/pvi/releases/latest/download/pvi.device.schema.json | ||
| # Grouped from the DLS EDM screen fast-grid-scans.edl (smargon 2-24). | ||
| # Generated from that screen. Hand edits may be overwritten by regeneration. | ||
|
|
||
| label: fastGridScanRecords | ||
| children: | ||
| - type: Group | ||
| name: General | ||
| layout: | ||
| type: Grid | ||
| labelled: true | ||
| children: | ||
| - type: SignalRW | ||
| name: FgsXNumSteps | ||
| label: Number of X Steps | ||
| write_pv: $(P):FGS:X_NUM_STEPS | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:X_NUM_STEPS_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsYNumSteps | ||
| label: Number of Y Steps | ||
| write_pv: $(P):FGS:Y_NUM_STEPS | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Y_NUM_STEPS_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsZNumSteps | ||
| label: Number of Z Steps | ||
| write_pv: $(P):FGS:Z_NUM_STEPS | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Z_NUM_STEPS_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsXStepSize | ||
| label: X Step Size (mm) | ||
| write_pv: $(P):FGS:X_STEP_SIZE | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:X_STEP_SIZE_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsYStepSize | ||
| label: Y Step Size (mm) | ||
| write_pv: $(P):FGS:Y_STEP_SIZE | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Y_STEP_SIZE_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsZStepSize | ||
| label: Z Step Size (mm) | ||
| write_pv: $(P):FGS:Z_STEP_SIZE | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Z_STEP_SIZE_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsDwellTime | ||
| label: Dwell Time (ms) | ||
| write_pv: $(P):FGS:DWELL_TIME | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:DWELL_TIME_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsXStart | ||
| label: X Start Position (mm) | ||
| write_pv: $(P):FGS:X_START | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:X_START_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsYStart | ||
| label: Y1 Start Position (mm) | ||
| write_pv: $(P):FGS:Y_START | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Y_START_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsZStart | ||
| label: Z1 Start Position (mm) | ||
| write_pv: $(P):FGS:Z_START | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Z_START_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsY2Start | ||
| label: Y2 Start Position (mm) | ||
| write_pv: $(P):FGS:Y2_START | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Y2_START_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalRW | ||
| name: FgsZ2Start | ||
| label: Z2 Start Position (mm) | ||
| write_pv: $(P):FGS:Z2_START | ||
| write_widget: | ||
| type: TextWrite | ||
| read_pv: $(P):FGS:Z2_START_RBV | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: FgsPosCounter | ||
| label: Position Counter | ||
| read_pv: $(P):FGS:POS_COUNTER | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: FgsXCounter | ||
| label: X Counter | ||
| read_pv: $(P):FGS:X_COUNTER | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: FgsYCounter | ||
| label: Y Counter | ||
| read_pv: $(P):FGS:Y_COUNTER | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: FgsScanInvalid | ||
| label: Scan Valid | ||
| read_pv: $(P):FGS:SCAN_INVALID | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalW | ||
| name: FgsStopProc | ||
| write_pv: $(P):FGS:STOP.PROC | ||
| write_widget: | ||
| type: ButtonPanel | ||
| actions: | ||
| Stop: '1' | ||
| - type: SignalR | ||
| name: FgsScanStatus | ||
| read_pv: $(P):FGS:SCAN_STATUS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: Group | ||
| name: ProtectedControls | ||
| label: Protected Controls | ||
| layout: | ||
| type: SubScreen | ||
| labelled: false | ||
| children: | ||
| - type: Group | ||
| name: ProtectedGeneral | ||
| label: General | ||
| layout: | ||
| type: Grid | ||
| labelled: true | ||
| children: | ||
| - type: SignalW | ||
| name: FgsRunProc | ||
| write_pv: $(P):FGS:RUN.PROC | ||
| write_widget: | ||
| type: ButtonPanel | ||
| actions: | ||
| Run: '1' | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| # yaml-language-server: $schema=https://github.com/epics-containers/pvi/releases/latest/download/pvi.device.schema.json | ||
| # Grouped from the DLS EDM screen RobotInterlocks.edl (smargon 2-24). | ||
| # Generated from that screen. Hand edits may be overwritten by regeneration. | ||
|
|
||
| label: robotInterlocks | ||
| children: | ||
| - type: Group | ||
| name: General | ||
| layout: | ||
| type: Grid | ||
| labelled: true | ||
| children: | ||
| - type: Group | ||
| name: RowRlX1HighThreshold | ||
| label: RlX1HighThreshold | ||
| layout: | ||
| type: Row | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add axis headers to the interlock rows. Each row contains six axis values, but only the first axis appears in its row label. PVI does not display the child names as column labels. This makes it difficult to identify which axis prevents robot loading. Add
|
||
| children: | ||
| - type: SignalR | ||
| name: RlX1HighThreshold | ||
| read_pv: $(P):RL_X1_HIGH_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlX2HighThreshold | ||
| read_pv: $(P):RL_X2_HIGH_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlYHighThreshold | ||
| read_pv: $(P):RL_Y_HIGH_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlZHighThreshold | ||
| read_pv: $(P):RL_Z_HIGH_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlOmegaHighThreshold | ||
| read_pv: $(P):RL_OMEGA_HIGH_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlPhiHighThreshold | ||
| read_pv: $(P):RL_PHI_HIGH_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: Group | ||
| name: RowX1RawPos | ||
| label: X1RawPos | ||
| layout: | ||
| type: Row | ||
| children: | ||
| - type: SignalR | ||
| name: X1RawPos | ||
| read_pv: $(P):X1_RAW_POS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: X2RawPos | ||
| read_pv: $(P):X2_RAW_POS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: YRawPos | ||
| read_pv: $(P):Y_RAW_POS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: ZRawPos | ||
| read_pv: $(P):Z_RAW_POS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: OmegaRawPos | ||
| read_pv: $(P):OMEGA_RAW_POS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: PhiRawPos | ||
| read_pv: $(P):PHI_RAW_POS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: Group | ||
| name: RowRlX1LowThreshold | ||
| label: RlX1LowThreshold | ||
| layout: | ||
| type: Row | ||
| children: | ||
| - type: SignalR | ||
| name: RlX1LowThreshold | ||
| read_pv: $(P):RL_X1_LOW_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlX2LowThreshold | ||
| read_pv: $(P):RL_X2_LOW_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlYLowThreshold | ||
| read_pv: $(P):RL_Y_LOW_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlZLowThreshold | ||
| read_pv: $(P):RL_Z_LOW_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlOmegaLowThreshold | ||
| read_pv: $(P):RL_OMEGA_LOW_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: RlPhiLowThreshold | ||
| read_pv: $(P):RL_PHI_LOW_THRESHOLD | ||
| read_widget: | ||
| type: TextRead | ||
| - type: Group | ||
| name: RowX1Inpos | ||
| label: X1Inpos | ||
| layout: | ||
| type: Row | ||
| children: | ||
| - type: SignalR | ||
| name: X1Inpos | ||
| read_pv: $(P):X1:INPOS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: X2Inpos | ||
| read_pv: $(P):X2:INPOS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: YInpos | ||
| read_pv: $(P):Y:INPOS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: ZInpos | ||
| read_pv: $(P):Z:INPOS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: OmegaInpos | ||
| read_pv: $(P):OMEGA:INPOS | ||
| read_widget: | ||
| type: TextRead | ||
| - type: SignalR | ||
| name: PhiInpos | ||
| read_pv: $(P):PHI:INPOS | ||
| read_widget: | ||
| type: TextRead | ||
Uh oh!
There was an error while loading. Please reload this page.
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.
Use “Scan Invalid” for this readback.
In release 2-25,
SCAN_INVALIDis1when a scan exceeds its limits and0when all axes pass. The current label gives both values the opposite meaning. Rename the label toScan Invalid; keep the protection logic unchanged. (raw.githubusercontent.com)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.
Fair point about the meaning:
SCAN_INVALIDisA&&B&&C?0:1, so 1 means invalid. The label "Scan Valid" comes verbatim from the EDM screen (fast-grid-scans.edl, where it labels an LED next to this PV), and this file is generated from that screen by pvi-from-edm (see its header). This PR moves the module with its files byte-for-byte unchanged, so I'm leaving it here; a relabel belongs in the pvi-from-edm overrides so a regeneration doesn't undo it.