X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=6d52b05bad13c8729f72781232ef846d13da8b28;hb=43ff1110fb317fba796f942bbc73c37a95973b8b;hp=cd25a2c2e3e3802b8a5086279352ef759872fd63;hpb=c3bfb95959a69caeecb2886adf9ebc4b51899b4a;p=libsigrok.git diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c index cd25a2c2..6d52b05b 100644 --- a/src/hardware/scpi-pps/profiles.c +++ b/src/hardware/scpi-pps/profiles.c @@ -460,6 +460,7 @@ static const uint32_t hp_6630b_devopts_cg[] = { SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, + SR_CONF_REGULATION | SR_CONF_GET, }; static const struct channel_spec hp_6633a_ch[] = { @@ -520,6 +521,7 @@ static const struct scpi_command hp_6630b_cmd[] = { { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":CURR:PROT:STAT 0" }, { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT?" }, { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT %.6f" }, + { SCPI_CMD_GET_OUTPUT_REGULATION, "STAT:OPER:COND?" }, ALL_ZERO }; @@ -725,7 +727,7 @@ static const struct scpi_command rs_hmc8043_cmd[] = { SR_PRIV const struct scpi_pps pps_profiles[] = { /* Agilent N5763A */ - { "Agilent", "N5763A", 0, + { "Agilent", "N5763A", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(agilent_n5700a_devopts), ARRAY_AND_SIZE(agilent_n5700a_devopts_cg), ARRAY_AND_SIZE(agilent_n5763a_ch), @@ -735,7 +737,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Agilent N5767A */ - { "Agilent", "N5767A", 0, + { "Agilent", "N5767A", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(agilent_n5700a_devopts), ARRAY_AND_SIZE(agilent_n5700a_devopts_cg), ARRAY_AND_SIZE(agilent_n5767a_ch), @@ -745,7 +747,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* BK Precision 9310 */ - { "BK", "^9130$", 0, + { "BK", "^9130$", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(bk_9130_devopts), ARRAY_AND_SIZE(bk_9130_devopts_cg), ARRAY_AND_SIZE(bk_9130_ch), @@ -755,7 +757,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Chroma 61604 */ - { "Chroma", "61604", 0, + { "Chroma", "61604", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(chroma_61604_devopts), ARRAY_AND_SIZE(chroma_61604_devopts_cg), ARRAY_AND_SIZE(chroma_61604_ch), @@ -765,7 +767,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Chroma 62000 series */ - { "Chroma", "620[0-9]{2}P-[0-9]{2,3}-[0-9]{1,3}", 0, + { "Chroma", "620[0-9]{2}P-[0-9]{2,3}-[0-9]{1,3}", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(chroma_62000_devopts), ARRAY_AND_SIZE(chroma_62000_devopts_cg), NULL, 0, @@ -775,7 +777,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* HP 6633A */ - { "HP", "6633A", 0, + { "HP", "6633A", SCPI_DIALECT_HP_COMP, 0, ARRAY_AND_SIZE(hp_6630a_devopts), ARRAY_AND_SIZE(hp_6630a_devopts_cg), ARRAY_AND_SIZE(hp_6633a_ch), @@ -785,7 +787,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* HP 6631B */ - { "HP", "6631B", PPS_OVP | PPS_OCP | PPS_OTP, + { "HP", "6631B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP, ARRAY_AND_SIZE(hp_6630b_devopts), ARRAY_AND_SIZE(hp_6630b_devopts_cg), ARRAY_AND_SIZE(hp_6631b_ch), @@ -795,7 +797,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* HP 6632B */ - { "HP", "6632B", PPS_OVP | PPS_OCP | PPS_OTP, + { "HP", "6632B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP, ARRAY_AND_SIZE(hp_6630b_devopts), ARRAY_AND_SIZE(hp_6630b_devopts_cg), ARRAY_AND_SIZE(hp_6632b_ch), @@ -805,7 +807,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* HP 66332A */ - { "HP", "66332A", PPS_OVP | PPS_OCP | PPS_OTP, + { "HP", "66332A", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP, ARRAY_AND_SIZE(hp_6630b_devopts), ARRAY_AND_SIZE(hp_6630b_devopts_cg), ARRAY_AND_SIZE(hp_66332a_ch), @@ -815,7 +817,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* HP 6633B */ - { "HP", "6633B", PPS_OVP | PPS_OCP | PPS_OTP, + { "HP", "6633B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP, ARRAY_AND_SIZE(hp_6630b_devopts), ARRAY_AND_SIZE(hp_6630b_devopts_cg), ARRAY_AND_SIZE(hp_6633b_ch), @@ -825,7 +827,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* HP 6634B */ - { "HP", "6634B", PPS_OVP | PPS_OCP | PPS_OTP, + { "HP", "6634B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP, ARRAY_AND_SIZE(hp_6630b_devopts), ARRAY_AND_SIZE(hp_6630b_devopts_cg), ARRAY_AND_SIZE(hp_6634b_ch), @@ -835,7 +837,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Rigol DP700 series */ - { "Rigol", "^DP711$", 0, + { "Rigol", "^DP711$", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(rigol_dp700_devopts), ARRAY_AND_SIZE(rigol_dp700_devopts_cg), ARRAY_AND_SIZE(rigol_dp711_ch), @@ -843,7 +845,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { rigol_dp700_cmd, .probe_channels = NULL, }, - { "Rigol", "^DP712$", 0, + { "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(rigol_dp700_devopts), ARRAY_AND_SIZE(rigol_dp700_devopts_cg), ARRAY_AND_SIZE(rigol_dp712_ch), @@ -853,7 +855,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Rigol DP800 series */ - { "Rigol", "^DP821A$", PPS_OTP, + { "Rigol", "^DP821A$", SCPI_DIALECT_UNKNOWN, PPS_OTP, ARRAY_AND_SIZE(rigol_dp800_devopts), ARRAY_AND_SIZE(rigol_dp800_devopts_cg), ARRAY_AND_SIZE(rigol_dp821a_ch), @@ -861,7 +863,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { rigol_dp800_cmd, .probe_channels = NULL, }, - { "Rigol", "^DP831A$", PPS_OTP, + { "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP, ARRAY_AND_SIZE(rigol_dp800_devopts), ARRAY_AND_SIZE(rigol_dp800_devopts_cg), ARRAY_AND_SIZE(rigol_dp831_ch), @@ -869,7 +871,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { rigol_dp800_cmd, .probe_channels = NULL, }, - { "Rigol", "^(DP832|DP832A)$", PPS_OTP, + { "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP, ARRAY_AND_SIZE(rigol_dp800_devopts), ARRAY_AND_SIZE(rigol_dp800_devopts_cg), ARRAY_AND_SIZE(rigol_dp832_ch), @@ -879,7 +881,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Philips/Fluke PM2800 series */ - { "Philips", "^PM28[13][123]/[01234]{1,2}$", 0, + { "Philips", "^PM28[13][123]/[01234]{1,2}$", SCPI_DIALECT_PHILIPS, 0, ARRAY_AND_SIZE(philips_pm2800_devopts), ARRAY_AND_SIZE(philips_pm2800_devopts_cg), NULL, 0, @@ -889,7 +891,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Rohde & Schwarz HMC8043 */ - { "Rohde&Schwarz", "HMC8043", 0, + { "Rohde&Schwarz", "HMC8043", SCPI_DIALECT_UNKNOWN, 0, ARRAY_AND_SIZE(rs_hmc8043_devopts), ARRAY_AND_SIZE(rs_hmc8043_devopts_cg), ARRAY_AND_SIZE(rs_hmc8043_ch),