]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/scpi-pps/profiles.c
projects / libsigrok.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
scpi-pps: Fix "aquisition" typo everywhere.
[libsigrok.git] / src / hardware / scpi-pps / profiles.c
diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index b539b3ed32223f4199cd8bdd9b8c176eb208b3b6..c9e8632c7b0ed1001dcb122241c8edbce081be5f 100644 (file)
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -450,10 +450,18 @@ static const uint32_t hp_6630a_devopts_cg[] = {
        SR_CONF_REGULATION | SR_CONF_GET,
 };
 
+static const struct channel_spec hp_6632a_ch[] = {
+       { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00125, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
+};
+
 static const struct channel_spec hp_6633a_ch[] = {
        { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS },
 };
 
+static const struct channel_spec hp_6634a_ch[] = {
+       { "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 1.0238, 0.00025, 4, 5 }, { 0, 104.81664 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS },
+};
+
 static const struct channel_group_spec hp_6630a_cg[] = {
        { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
@@ -475,7 +483,7 @@ static const struct scpi_command hp_6630a_cmd[] = {
        ALL_ZERO
 };
 
-static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630a_init_acquisition(const struct sr_dev_inst *sdi)
 {
        struct sr_scpi_dev_inst *scpi;
        int ret;
@@ -589,6 +597,22 @@ static const uint32_t hp_6630b_devopts_cg[] = {
        SR_CONF_REGULATION | SR_CONF_GET,
 };
 
+static const struct channel_spec hp_6611c_ch[] = {
+       { "1", { 0, 8.19, 0.002, 3, 4 }, { 0, 5.1188, 0.00125, 4, 5 }, { 0, 41.92297 }, FREQ_DC_ONLY, { 0, 12, 0.06 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6612c_ch[] = {
+       { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 41.92256 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6613c_ch[] = {
+       { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 1.0238, 0.00025, 4, 5 }, { 0, 52.40627 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6614c_ch[] = {
+       { "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 0.5118, 0.000125, 4, 5 }, { 0, 52.39808 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS },
+};
+
 static const struct channel_spec hp_6631b_ch[] = {
        { "1", { 0, 8.19, 0.002, 3, 4 }, { 0, 10.237, 0.00263, 4, 5 }, { 0, 83.84103 }, FREQ_DC_ONLY, { 0, 12, 0.06 }, NO_OCP_LIMITS },
 };
@@ -614,6 +638,10 @@ static const struct channel_group_spec hp_6630b_cg[] = {
 };
 
 static const struct scpi_command hp_6630b_cmd[] = {
+       /*
+        * SCPI_CMD_REMOTE and SCPI_CMD_LOCAL are not used when GPIB is used,
+        * otherwise the device will report (non critical) error 602.
+        */
        { SCPI_CMD_REMOTE, "SYST:REM" },
        { SCPI_CMD_LOCAL, "SYST:LOC" },
        { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
@@ -637,7 +665,7 @@ static const struct scpi_command hp_6630b_cmd[] = {
        ALL_ZERO
 };
 
-static int hp_6630b_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi)
 {
        struct sr_scpi_dev_inst *scpi;
        int ret;
@@ -1019,7 +1047,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(agilent_n5700a_cg),
                agilent_n5700a_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1031,7 +1059,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(agilent_n5700a_cg),
                agilent_n5700a_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1043,7 +1071,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(bk_9130_cg),
                bk_9130_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1055,7 +1083,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(chroma_61604_cg),
                chroma_61604_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1067,10 +1095,40 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                NULL, 0,
                chroma_62000_cmd,
                .probe_channels = chroma_62000p_probe_channels,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
+       /*
+        * This entry is for testing the HP COMP language with a HP 6632B power
+        * supply switched to the COMP language ("SYST:LANG COMP"). When used,
+        * disable the entry for the HP 6632B below!
+        */
+       /*
+       { "HP", "6632B", SCPI_DIALECT_HP_COMP, 0,
+               ARRAY_AND_SIZE(hp_6630a_devopts),
+               ARRAY_AND_SIZE(hp_6630a_devopts_cg),
+               ARRAY_AND_SIZE(hp_6632a_ch),
+               ARRAY_AND_SIZE(hp_6630a_cg),
+               hp_6630a_cmd,
+               .probe_channels = NULL,
+               hp_6630a_init_acquisition,
+               hp_6630a_update_status,
+       },
+       */
+
+       /* HP 6632A */
+       { "HP", "6632A", SCPI_DIALECT_HP_COMP, 0,
+               ARRAY_AND_SIZE(hp_6630a_devopts),
+               ARRAY_AND_SIZE(hp_6630a_devopts_cg),
+               ARRAY_AND_SIZE(hp_6632a_ch),
+               ARRAY_AND_SIZE(hp_6630a_cg),
+               hp_6630a_cmd,
+               .probe_channels = NULL,
+               hp_6630a_init_acquisition,
+               hp_6630a_update_status,
+       },
+
        /* HP 6633A */
        { "HP", "6633A", SCPI_DIALECT_HP_COMP, 0,
                ARRAY_AND_SIZE(hp_6630a_devopts),
@@ -1079,10 +1137,70 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630a_cg),
                hp_6630a_cmd,
                .probe_channels = NULL,
-               hp_6630a_init_aquisition,
+               hp_6630a_init_acquisition,
+               hp_6630a_update_status,
+       },
+
+       /* HP 6634A */
+       { "HP", "6634A", SCPI_DIALECT_HP_COMP, 0,
+               ARRAY_AND_SIZE(hp_6630a_devopts),
+               ARRAY_AND_SIZE(hp_6630a_devopts_cg),
+               ARRAY_AND_SIZE(hp_6634a_ch),
+               ARRAY_AND_SIZE(hp_6630a_cg),
+               hp_6630a_cmd,
+               .probe_channels = NULL,
+               hp_6630a_init_acquisition,
                hp_6630a_update_status,
        },
 
+       /* HP 6611C */
+       { "HP", "6611C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6611c_ch),
+               ARRAY_AND_SIZE(hp_6630b_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+               hp_6630b_init_acquisition,
+               hp_6630b_update_status,
+       },
+
+       /* HP 6612C */
+       { "HP", "6612C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6612c_ch),
+               ARRAY_AND_SIZE(hp_6630b_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+               hp_6630b_init_acquisition,
+               hp_6630b_update_status,
+       },
+
+       /* HP 6613C */
+       { "HP", "6613C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6613c_ch),
+               ARRAY_AND_SIZE(hp_6630b_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+               hp_6630b_init_acquisition,
+               hp_6630b_update_status,
+       },
+
+       /* HP 6614C */
+       { "HP", "6614C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6614c_ch),
+               ARRAY_AND_SIZE(hp_6630b_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+               hp_6630b_init_acquisition,
+               hp_6630b_update_status,
+       },
+
        /* HP 6631B */
        { "HP", "6631B", SCPI_DIALECT_HP_66XXB, PPS_OTP,
                ARRAY_AND_SIZE(hp_6630b_devopts),
@@ -1091,7 +1209,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1103,7 +1221,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1115,7 +1233,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1127,7 +1245,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1139,7 +1257,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1151,7 +1269,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp700_cg),
                rigol_dp700_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
        { "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0,
@@ -1161,7 +1279,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp700_cg),
                rigol_dp700_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1173,7 +1291,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp820_cg),
                rigol_dp800_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
        { "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@@ -1183,7 +1301,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp830_cg),
                rigol_dp800_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
        { "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@@ -1193,7 +1311,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp830_cg),
                rigol_dp800_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1205,7 +1323,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                NULL, 0,
                philips_pm2800_cmd,
                philips_pm2800_probe_channels,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1217,7 +1335,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rs_hmc8043_cg),
                rs_hmc8043_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 };
Hardware access and backend lib