Skip to content

Commit

Permalink
Fix SignalRW read_pv convert
Browse files Browse the repository at this point in the history 
The conversion was defaulting to use name + RBV for read_pv,
which is now not correct.

This fix makes SettingPair pass in the read_record so that
the pv comes from the template.

It would probably be possible to refactor these classes so that
more fields are required and checks for None can be removed.
  • Loading branch information
@GDYendell
GDYendell committed Feb 16, 2024
1 parent 6f94bad commit 3296ac9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 32 deletions.
1 change: 1 addition & 0 deletions src/pvi/_convert/_asyn_convert.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def generate_component(self) -> SignalRW:
component = asyn_cls(
name=enforce_pascal_case(self.write_record.name),
write_record=self.write_record.pv,
read_record=self.read_record.pv,
)

return SignalRW(
Expand Down
64 changes: 32 additions & 32 deletions tests/convert/output/simDetector.pvi.device.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ children:
write_pv: $(P)$(R)GainX
write_widget:
type: TextWrite
read_pv: GainX_RBV
read_pv: $(P)$(R)GainX_RBV
read_widget:
type: TextRead

Expand All @@ -42,7 +42,7 @@ children:
write_pv: $(P)$(R)GainY
write_widget:
type: TextWrite
read_pv: GainY_RBV
read_pv: $(P)$(R)GainY_RBV
read_widget:
type: TextRead

Expand All @@ -51,7 +51,7 @@ children:
write_pv: $(P)$(R)GainRed
write_widget:
type: TextWrite
read_pv: GainRed_RBV
read_pv: $(P)$(R)GainRed_RBV
read_widget:
type: TextRead

Expand All @@ -60,7 +60,7 @@ children:
write_pv: $(P)$(R)GainGreen
write_widget:
type: TextWrite
read_pv: GainGreen_RBV
read_pv: $(P)$(R)GainGreen_RBV
read_widget:
type: TextRead

Expand All @@ -69,7 +69,7 @@ children:
write_pv: $(P)$(R)GainBlue
write_widget:
type: TextWrite
read_pv: GainBlue_RBV
read_pv: $(P)$(R)GainBlue_RBV
read_widget:
type: TextRead

Expand All @@ -78,7 +78,7 @@ children:
write_pv: $(P)$(R)Reset
write_widget:
type: TextWrite
read_pv: Reset_RBV
read_pv: $(P)$(R)Reset_RBV
read_widget:
type: TextRead

Expand All @@ -87,7 +87,7 @@ children:
write_pv: $(P)$(R)Offset
write_widget:
type: TextWrite
read_pv: Offset_RBV
read_pv: $(P)$(R)Offset_RBV
read_widget:
type: TextRead

Expand All @@ -96,7 +96,7 @@ children:
write_pv: $(P)$(R)Noise
write_widget:
type: TextWrite
read_pv: Noise_RBV
read_pv: $(P)$(R)Noise_RBV
read_widget:
type: TextRead

Expand All @@ -105,7 +105,7 @@ children:
write_pv: $(P)$(R)SimMode
write_widget:
type: ComboBox
read_pv: SimMode_RBV
read_pv: $(P)$(R)SimMode_RBV
read_widget:
type: TextRead

Expand All @@ -114,7 +114,7 @@ children:
write_pv: $(P)$(R)PeakStartX
write_widget:
type: TextWrite
read_pv: PeakStartX_RBV
read_pv: $(P)$(R)PeakStartX_RBV
read_widget:
type: TextRead

Expand All @@ -123,7 +123,7 @@ children:
write_pv: $(P)$(R)PeakStartY
write_widget:
type: TextWrite
read_pv: PeakStartY_RBV
read_pv: $(P)$(R)PeakStartY_RBV
read_widget:
type: TextRead

Expand All @@ -132,7 +132,7 @@ children:
write_pv: $(P)$(R)PeakNumX
write_widget:
type: TextWrite
read_pv: PeakNumX_RBV
read_pv: $(P)$(R)PeakNumX_RBV
read_widget:
type: TextRead

Expand All @@ -141,7 +141,7 @@ children:
write_pv: $(P)$(R)PeakNumY
write_widget:
type: TextWrite
read_pv: PeakNumY_RBV
read_pv: $(P)$(R)PeakNumY_RBV
read_widget:
type: TextRead

Expand All @@ -150,7 +150,7 @@ children:
write_pv: $(P)$(R)PeakStepX
write_widget:
type: TextWrite
read_pv: PeakStepX_RBV
read_pv: $(P)$(R)PeakStepX_RBV
read_widget:
type: TextRead

Expand All @@ -159,7 +159,7 @@ children:
write_pv: $(P)$(R)PeakStepY
write_widget:
type: TextWrite
read_pv: PeakStepY_RBV
read_pv: $(P)$(R)PeakStepY_RBV
read_widget:
type: TextRead

Expand All @@ -168,7 +168,7 @@ children:
write_pv: $(P)$(R)PeakWidthX
write_widget:
type: TextWrite
read_pv: PeakWidthX_RBV
read_pv: $(P)$(R)PeakWidthX_RBV
read_widget:
type: TextRead

Expand All @@ -177,7 +177,7 @@ children:
write_pv: $(P)$(R)PeakWidthY
write_widget:
type: TextWrite
read_pv: PeakWidthY_RBV
read_pv: $(P)$(R)PeakWidthY_RBV
read_widget:
type: TextRead

Expand All @@ -186,7 +186,7 @@ children:
write_pv: $(P)$(R)PeakVariation
write_widget:
type: TextWrite
read_pv: PeakVariation_RBV
read_pv: $(P)$(R)PeakVariation_RBV
read_widget:
type: TextRead

Expand All @@ -195,7 +195,7 @@ children:
write_pv: $(P)$(R)XSineOperation
write_widget:
type: ComboBox
read_pv: XSineOperation_RBV
read_pv: $(P)$(R)XSineOperation_RBV
read_widget:
type: TextRead

Expand All @@ -204,7 +204,7 @@ children:
write_pv: $(P)$(R)XSine1Amplitude
write_widget:
type: TextWrite
read_pv: XSine1Amplitude_RBV
read_pv: $(P)$(R)XSine1Amplitude_RBV
read_widget:
type: TextRead

Expand All @@ -213,7 +213,7 @@ children:
write_pv: $(P)$(R)XSine1Frequency
write_widget:
type: TextWrite
read_pv: XSine1Frequency_RBV
read_pv: $(P)$(R)XSine1Frequency_RBV
read_widget:
type: TextRead

Expand All @@ -222,7 +222,7 @@ children:
write_pv: $(P)$(R)XSine1Phase
write_widget:
type: TextWrite
read_pv: XSine1Phase_RBV
read_pv: $(P)$(R)XSine1Phase_RBV
read_widget:
type: TextRead

Expand All @@ -231,7 +231,7 @@ children:
write_pv: $(P)$(R)XSine2Amplitude
write_widget:
type: TextWrite
read_pv: XSine2Amplitude_RBV
read_pv: $(P)$(R)XSine2Amplitude_RBV
read_widget:
type: TextRead

Expand All @@ -240,7 +240,7 @@ children:
write_pv: $(P)$(R)XSine2Frequency
write_widget:
type: TextWrite
read_pv: XSine2Frequency_RBV
read_pv: $(P)$(R)XSine2Frequency_RBV
read_widget:
type: TextRead

Expand All @@ -249,7 +249,7 @@ children:
write_pv: $(P)$(R)XSine2Phase
write_widget:
type: TextWrite
read_pv: XSine2Phase_RBV
read_pv: $(P)$(R)XSine2Phase_RBV
read_widget:
type: TextRead

Expand All @@ -258,7 +258,7 @@ children:
write_pv: $(P)$(R)YSineOperation
write_widget:
type: ComboBox
read_pv: YSineOperation_RBV
read_pv: $(P)$(R)YSineOperation_RBV
read_widget:
type: TextRead

Expand All @@ -267,7 +267,7 @@ children:
write_pv: $(P)$(R)YSine1Amplitude
write_widget:
type: TextWrite
read_pv: YSine1Amplitude_RBV
read_pv: $(P)$(R)YSine1Amplitude_RBV
read_widget:
type: TextRead

Expand All @@ -276,7 +276,7 @@ children:
write_pv: $(P)$(R)YSine1Frequency
write_widget:
type: TextWrite
read_pv: YSine1Frequency_RBV
read_pv: $(P)$(R)YSine1Frequency_RBV
read_widget:
type: TextRead

Expand All @@ -285,7 +285,7 @@ children:
write_pv: $(P)$(R)YSine1Phase
write_widget:
type: TextWrite
read_pv: YSine1Phase_RBV
read_pv: $(P)$(R)YSine1Phase_RBV
read_widget:
type: TextRead

Expand All @@ -294,7 +294,7 @@ children:
write_pv: $(P)$(R)YSine2Amplitude
write_widget:
type: TextWrite
read_pv: YSine2Amplitude_RBV
read_pv: $(P)$(R)YSine2Amplitude_RBV
read_widget:
type: TextRead

Expand All @@ -303,7 +303,7 @@ children:
write_pv: $(P)$(R)YSine2Frequency
write_widget:
type: TextWrite
read_pv: YSine2Frequency_RBV
read_pv: $(P)$(R)YSine2Frequency_RBV
read_widget:
type: TextRead

Expand All @@ -312,6 +312,6 @@ children:
write_pv: $(P)$(R)YSine2Phase
write_widget:
type: TextWrite
read_pv: YSine2Phase_RBV
read_pv: $(P)$(R)YSine2Phase_RBV
read_widget:
type: TextRead

0 comments on commit 3296ac9

Please sign in to comment.