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

Jump to bottom

UDriver parameter library #35

Merged
merged 6 commits into from
Apr 22, 2024
Merged

UDriver parameter library #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df631f7
afc_timing: remove unnecessary MASK fields.
ericonr Mar 22, 2024
5d4c7df
udriver: add parameter property vector to class.
ericonr Mar 25, 2024
fabb8f6
afc_timing: don't use invalid keys for clock parameters.
ericonr Mar 25, 2024
8eb090c
udriver: support doubles in read_parameters.
ericonr Mar 25, 2024
1f85e33
fofb_processing: use UDriver native double support.
ericonr Mar 25, 2024
eb9fa3e
udriver: add generic writeFloat64 function.
ericonr Mar 25, 2024
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
4 changes: 0 additions & 4 deletions utcaApp/Db/afc_timing_trigger.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ record(bo, "$(P)$(R)$(S)$(C)State-Sel"){
field(DESC, "$(S) trigger $(C) state")
field(PINI, YES)
field(OUT,"@asyn($(PORT),$(ADDR))CH_EN")
field(MASK, "1")
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
}
Expand All @@ -23,7 +22,6 @@ record(bo, "$(P)$(R)$(S)$(C)Polarity-Sel"){
field(DTYP, "asynInt32")
field(DESC, "$(S) trigger $(C) Polarity")
field(PINI, YES)
field(MASK, "1")
field(OUT,"@asyn($(PORT),$(ADDR))CH_POL")
field(ZNAM, "Normal")
field(ONAM, "Inverse")
Expand All @@ -42,7 +40,6 @@ record(bo, "$(P)$(R)$(S)$(C)Log-Sel"){
field(DTYP, "asynInt32")
field(DESC, "$(S) trigger $(C) Time Log")
field(PINI, YES)
field(MASK, "1")
field(OUT,"@asyn($(PORT),$(ADDR))CH_LOG")
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
Expand Down Expand Up @@ -76,7 +73,6 @@ record(bo, "$(P)$(R)$(S)$(C)Dir-Sel"){
field(DESC, "$(S) trigger $(C) direction")
field(PINI, YES)
field(OUT,"@asyn($(PORT),$(ADDR))CH_DIR")
field(MASK, "1")
field(ZNAM, "Out")
field(ONAM, "In")
}
Expand Down
6 changes: 2 additions & 4 deletions utcaApp/src/acq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,16 +281,14 @@ class Acq: public UDriver {
return asynSuccess;
}

asynStatus writeFloat64(asynUser *pasynUser, epicsFloat64 value)
asynStatus writeFloat64Impl(asynUser *, const int function, const int, epicsFloat64 value)
{
const int function = pasynUser->reason;

if (parameters_to_store.count(function)) {
setDoubleParam(function, value);
return asynSuccess;
}

return asynPortDriver::writeFloat64(pasynUser, value);
return asynError;
}
};

Expand Down
33 changes: 13 additions & 20 deletions utcaApp/src/afc_timing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ class AFCTiming: public UDriver {
{"STA_LOCKED_AFC_LATCH", p_afc_lock_latch},
{"STA_LOCKED_RTM_LATCH", p_rtm_lock_latch},
{"STA_LOCKED_GT0_LATCH", p_gt0_lock_latch},
{"STA_LOCKED_RST_LATCH", p_lock_latch_rst},
ParamInit{"STA_LOCKED_RST_LATCH", p_lock_latch_rst}.set_wo(),
},
{
{"RFREQ_HI", p_rfreq_hi},
{"RFREQ_LO", p_rfreq_lo},
{"N1", p_n1},
{"HS_DIV", p_hs_div},
{"FREQ_KP", p_freq_kp},
{"FREQ_KI", p_freq_ki},
{"PHASE_KP", p_phase_kp},
{"PHASE_KI", p_phase_ki},
{"MAF_NAVG", p_maf_navg},
{"MAF_DIV_EXP", p_maf_divexp},
ParamInit{"RFREQ_HI", p_rfreq_hi}.set_nc(2),
ParamInit{"RFREQ_LO", p_rfreq_lo}.set_nc(2),
ParamInit{"N1", p_n1}.set_nc(2),
ParamInit{"HS_DIV", p_hs_div}.set_nc(2),
ParamInit{"FREQ_KP", p_freq_kp}.set_nc(2),
ParamInit{"FREQ_KI", p_freq_ki}.set_nc(2),
ParamInit{"PHASE_KP", p_phase_kp}.set_nc(2),
ParamInit{"PHASE_KI", p_phase_ki}.set_nc(2),
ParamInit{"MAF_NAVG", p_maf_navg}.set_nc(2),
ParamInit{"MAF_DIV_EXP", p_maf_divexp}.set_nc(2),

{"CH_EN", p_ch_en},
{"CH_POL", p_ch_pol},
Expand All @@ -64,7 +64,7 @@ class AFCTiming: public UDriver {
{"CH_SRC", p_ch_src},
{"CH_DIR", p_ch_dir},
{"CH_PULSES", p_ch_pulses},
{"CH_COUNT_RST", p_ch_count_rst},
ParamInit{"CH_COUNT_RST", p_ch_count_rst}.set_wo(),
{"CH_COUNT", p_ch_count},
{"CH_EVT", p_ch_evt},
{"CH_DLY", p_ch_dly},
Expand All @@ -79,8 +79,6 @@ class AFCTiming: public UDriver {

createParam("FREQ", asynParamFloat64, &p_freq);

write_only = {p_lock_latch_rst, p_ch_count_rst};

read_parameters();
}

Expand Down Expand Up @@ -138,11 +136,8 @@ class AFCTiming: public UDriver {
return write_params(pasynUser, ctl);
}

asynStatus writeFloat64(asynUser *pasynUser, epicsFloat64 value)
asynStatus writeFloat64Impl(asynUser *pasynUser, const int function, const int addr, epicsFloat64 value)
{
int function = pasynUser->reason, addr;
getAddress(pasynUser, &addr);

if (function == p_freq) {
bool rv;
if (addr == 0) rv = ctl.set_rtm_freq(value);
Expand All @@ -152,8 +147,6 @@ class AFCTiming: public UDriver {

setDoubleParam(addr, function, value);
callParamCallbacks(addr);
} else {
return asynPortDriver::writeFloat64(pasynUser, value);
}

return write_params(pasynUser, ctl);
Expand Down
4 changes: 1 addition & 3 deletions utcaApp/src/bpm_swap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class BPMSwap: public UDriver {
"BPM_SWAP", port_number, &dec,
1,
{
{"RESET", p_reset},
ParamInit{"RESET", p_reset}.set_wo(),
{"MODE", p_mode},
{"DIV_F_CNT_EN", p_swap_div_f_cnt_en},
{"DIV_F", p_swap_div_f},
Expand All @@ -32,8 +32,6 @@ class BPMSwap: public UDriver {
dec.set_devinfo(v);
ctl.set_devinfo(v);

write_only = {p_reset};

read_parameters();
}

Expand Down
8 changes: 3 additions & 5 deletions utcaApp/src/fofb_cc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ class FofbCc: public UDriver {
"FOFB_CC", port_number, &dec,
::number_of_channels,
{
{"ERR_CLR", p_err_clr},
ParamInit{"ERR_CLR", p_err_clr}.set_wo(),
{"CC_ENABLE", p_cc_enable},
{"TFS_OVERRIDE", p_tfs_override},
{"TOA_RD_EN", p_toa_rd_en},
{"TOA_RD_STR", p_toa_rd_str},
ParamInit{"TOA_RD_STR", p_toa_rd_str}.set_wo(),
{"TOA_DATA", p_toa_data},
{"RCB_RD_EN", p_rcb_rd_en},
{"RCB_RD_STR", p_rcb_rd_str},
ParamInit{"RCB_RD_STR", p_rcb_rd_str}.set_wo(),
{"RCB_DATA", p_rcb_data},
{"BPM_ID", p_bpm_id},
{"TIME_FRAME_LEN", p_time_frame_len},
Expand Down Expand Up @@ -70,8 +70,6 @@ class FofbCc: public UDriver {
dec.set_devinfo(v);
ctl.set_devinfo(v);

write_only = {p_err_clr, p_toa_rd_str, p_rcb_rd_str};

read_parameters();
}

Expand Down
31 changes: 5 additions & 26 deletions utcaApp/src/fofb_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class FofbProcessing: public UDriver {
"FOFB_PROCESSING", port_number, &dec,
::number_of_channels,
{
{"INTLK_CTL_CLR", p_intlk_clr},
ParamInit{"INTLK_CTL_CLR", p_intlk_clr}.set_wo(),
{"INTLK_CTL_SRC_EN_ORB_DISTORT", p_intlk_en_orb_distort},
{"INTLK_CTL_SRC_EN_PACKET_LOSS", p_intlk_en_packet_loss},
{"INTLK_STA", p_intlk_sta},
Expand All @@ -38,7 +38,8 @@ class FofbProcessing: public UDriver {
{"SP_DECIM_RATIO_MAX", p_sp_decim_ratio_max},
},
{
{"CH_ACC_CTL_CLEAR", p_acc_clr},
ParamInit{"CH_ACC_CTL_CLEAR", p_acc_clr}.set_wo(),
{"CH_ACC_GAIN", p_acc_gain, asynParamFloat64},
{"CH_ACC_CTL_FREEZE", p_acc_freeze},
{"CH_ACC_LIMITS_MAX", p_sp_limits_max},
{"CH_ACC_LIMITS_MIN", p_sp_limits_min},
Expand All @@ -55,27 +56,12 @@ class FofbProcessing: public UDriver {
createParam("REF_ORBIT_X", asynParamInt32Array, &p_reforb_x);
createParam("REF_ORBIT_Y", asynParamInt32Array, &p_reforb_y);

createParam("CH_ACC_GAIN", asynParamFloat64, &p_acc_gain);
createParam("CH_COEFFS_X", asynParamFloat64Array, &p_coeffs_x);
createParam("CH_COEFFS_Y", asynParamFloat64Array, &p_coeffs_y);

write_only = {p_intlk_clr, p_acc_clr};

read_parameters();
}

asynStatus read_parameters(bool only_monitors=false)
{
UDriver::read_parameters(only_monitors);

for (unsigned addr = 0; addr < ::number_of_channels; addr++)
setDoubleParam(addr, p_acc_gain, dec.get_channel_data<double>("CH_ACC_GAIN", addr));

do_callbacks();

return asynSuccess;
}

asynStatus writeInt32Impl(asynUser *pasynUser, const int function, const int addr, epicsInt32 value)
{
if (function == p_intlk_clr) ctl.intlk_sta_clr = value;
Expand All @@ -93,18 +79,11 @@ class FofbProcessing: public UDriver {
return write_params(pasynUser, ctl);
}

asynStatus writeFloat64(asynUser *pasynUser, epicsFloat64 value)
asynStatus writeFloat64Impl(asynUser *pasynUser, const int function, const int addr, epicsFloat64 value)
{
int function = pasynUser->reason, addr;
getAddress(pasynUser, &addr);

if (function == p_acc_gain) {
if (function == p_acc_gain)
ctl.parameters[addr].acc_gain = value;

} else {
return asynPortDriver::writeFloat64(pasynUser, value);
}

return write_params(pasynUser, ctl);
}

Expand Down
8 changes: 3 additions & 5 deletions utcaApp/src/orbit_intlk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ class OrbitIntlk: public UDriver {
1,
{
{"EN", p_enable},
{"CLR", p_clear},
ParamInit{"CLR", p_clear}.set_wo(),
{"MIN_SUM_EN", p_min_sum_en},
{"POS_EN", p_pos_en},
{"POS_CLR", p_pos_clear},
ParamInit{"POS_CLR", p_pos_clear}.set_wo(),
{"ANG_EN", p_ang_en},
{"ANG_CLR", p_ang_clear},
ParamInit{"ANG_CLR", p_ang_clear}.set_wo(),

{"POS_UPPER_X", p_read_only},
{"POS_UPPER_Y", p_read_only},
Expand Down Expand Up @@ -73,8 +73,6 @@ class OrbitIntlk: public UDriver {
dec.set_devinfo(v);
ctl.set_devinfo(v);

write_only = {p_clear, p_pos_clear, p_ang_clear};

read_parameters();
}

Expand Down
2 changes: 1 addition & 1 deletion utcaApp/src/rtmlamp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class RtmLamp: public UDriver {
dec.set_devinfo(v);
ctl.set_devinfo(v);

decoder_controller.insert(p_mode);
parameter_props.at(p_mode).write_decoder_controller = true;

read_parameters();
}
Expand Down
6 changes: 2 additions & 4 deletions utcaApp/src/trigger_iface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class TriggerIface: public UDriver {
{
{"DIR", p_dir},
{"DIR_POL", p_dir_pol},
{"RCV_COUNT_RST", p_rcv_count_rst},
{"TRANSM_COUNT_RST", p_transm_count_rst},
ParamInit{"RCV_COUNT_RST", p_rcv_count_rst}.set_wo(),
ParamInit{"TRANSM_COUNT_RST", p_transm_count_rst}.set_wo(),
{"RCV_LEN", p_rcv_len},
{"TRANSM_LEN", p_transm_len},
{"RCV_COUNT", p_rcv_count},
Expand All @@ -40,8 +40,6 @@ class TriggerIface: public UDriver {
dec.set_devinfo(v);
ctl.set_devinfo(v);

write_only = {p_rcv_count_rst, p_transm_count_rst};

read_parameters();
}

Expand Down
Loading