X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=02f6940a70f0595ac27981e952dfc19f942df969;hb=c80cf3e02eaa8e3154a69a7cae48c361d45ebb4f;hp=5be14127b9020e62ffeaace7b96b9e4e6435045f;hpb=c3eadb0760121c2ab3c34aedba92d477d222dce9;p=libsigrok.git diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c index 5be14127..02f6940a 100644 --- a/src/hardware/scpi-pps/profiles.c +++ b/src/hardware/scpi-pps/profiles.c @@ -2,6 +2,8 @@ * This file is part of the libsigrok project. * * Copyright (C) 2014 Bert Vermeulen + * Copyright (C) 2015 Google, Inc. + * (Written by Alexandru Gagniuc for Google, Inc.) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,14 +20,18 @@ */ #include +#include #include "protocol.h" #define CH_IDX(x) (1 << x) +#define FREQ_DC_ONLY {0, 0, 0} -const char *pps_vendors[][2] = { +static const char *pps_vendors[][2] = { { "RIGOL TECHNOLOGIES", "Rigol" }, { "HEWLETT-PACKARD", "HP" }, { "PHILIPS", "Philips" }, + { "Chroma ATE", "Chroma" }, + { "Agilent Technologies", "Agilent" }, }; const char *get_vendor(const char *raw_vendor) @@ -42,10 +48,103 @@ const char *get_vendor(const char *raw_vendor) static const uint32_t devopts_none[] = { }; +/* Agilent/Keysight N5700A series */ +static const uint32_t agilent_n5700a_devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, +}; + +static const uint32_t agilent_n5700a_devopts_cg[] = { + SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, + SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, + SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, +}; + +static const struct channel_spec agilent_n5767a_ch[] = { + { "1", { 0, 60, 0.0001 }, { 0, 25, 0.1 }, FREQ_DC_ONLY }, +}; + +static const struct channel_group_spec agilent_n5767a_cg[] = { + { "1", CH_IDX(0), PPS_OVP | PPS_OCP }, +}; + +/* + * TODO: OVER_CURRENT_PROTECTION_ACTIVE status can be determined by the OC bit + * in STAT:QUES:EVEN?, but this is not implemented + */ +static const struct scpi_command agilent_n5700a_cmd[] = { + { SCPI_CMD_REMOTE, "SYST:COMM:RLST REM" }, + { SCPI_CMD_LOCAL, "SYST:COMM:RLST LOC" }, + { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, + { SCPI_CMD_GET_MEAS_CURRENT, "MEAS:CURR?" }, + { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, + { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, + { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, + { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, + { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP:STAT?" }, + { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, + { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, + { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT?" }, + { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT %.6f" }, + { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":CURR:PROT:STAT?" }, + { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":CURR:PROT:STAT ON?"}, + { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":CURR:PROT:STAT OFF?"}, + /* Current limit (CC mode) and OCP are set using the same cmd. sad */ + { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR?" }, + { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR %.6f" }, +}; + +/* Chroma 61600 series AC source */ +static const uint32_t chroma_61604_devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, +}; + +static const uint32_t chroma_61604_devopts_cg[] = { + SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, + SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_FREQUENCY | SR_CONF_GET, + SR_CONF_OUTPUT_FREQUENCY_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, + SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, +}; + +static const struct channel_spec chroma_61604_ch[] = { + { "1", { 0, 300, 0.1 }, { 0, 16, 0.1 }, { 1.0, 1000.0, 0.01 } }, +}; + +static const struct channel_group_spec chroma_61604_cg[] = { + { "1", CH_IDX(0), PPS_OVP | PPS_OCP }, +}; + +static const struct scpi_command chroma_61604_cmd[] = { + { SCPI_CMD_REMOTE, "SYST:REM" }, + { SCPI_CMD_LOCAL, "SYST:LOC" }, + { SCPI_CMD_GET_MEAS_VOLTAGE, ":FETC:VOLT:ACDC?" }, + { SCPI_CMD_GET_MEAS_FREQUENCY, ":FETC:FREQ?" }, + { SCPI_CMD_GET_MEAS_CURRENT, ":FETC:CURR:AC?" }, + { SCPI_CMD_GET_MEAS_POWER, ":FETC:POW:AC?" }, + { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT:AC?" }, + { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT:AC %.1f" }, + { SCPI_CMD_GET_FREQUENCY_TARGET, ":SOUR:FREQ?" }, + { SCPI_CMD_SET_FREQUENCY_TARGET, ":SOUR:FREQ %.2f" }, + { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" }, + { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, + { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, + { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:LIM:AC?" }, + { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:LIM:AC %.1f" }, + /* This is not a current limit mode. It is overcurrent protection */ + { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:LIM?" }, + { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:LIM %.2f" }, +}; + /* Rigol DP800 series */ static const uint32_t rigol_dp800_devopts[] = { - SR_CONF_POWER_SUPPLY, - SR_CONF_CONTINUOUS, + SR_CONF_CONTINUOUS | SR_CONF_SET, SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET, }; @@ -64,25 +163,35 @@ static const uint32_t rigol_dp800_devopts_cg[] = { SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, }; -struct channel_spec rigol_dp831_ch[] = { - { "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 } }, - { "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 } }, - { "3", { 0, -30, 0.001 }, { 0, 2, 0.0001 } }, +static const struct channel_spec rigol_dp821a_ch[] = { + { "1", { 0, 60, 0.001 }, { 0, 1, 0.0001 }, FREQ_DC_ONLY }, + { "2", { 0, 8, 0.001 }, { 0, 10, 0.001 }, FREQ_DC_ONLY }, +}; + +static const struct channel_spec rigol_dp831_ch[] = { + { "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 }, FREQ_DC_ONLY }, + { "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 }, FREQ_DC_ONLY }, + { "3", { 0, -30, 0.001 }, { 0, 2, 0.0001 }, FREQ_DC_ONLY }, }; -struct channel_spec rigol_dp832_ch[] = { - { "1", { 0, 30, 0.001 }, { 0, 3, 0.001 } }, - { "2", { 0, 30, 0.001 }, { 0, 3, 0.001 } }, - { "3", { 0, 5, 0.001 }, { 0, 3, 0.001 } }, +static const struct channel_spec rigol_dp832_ch[] = { + { "1", { 0, 30, 0.001 }, { 0, 3, 0.001 }, FREQ_DC_ONLY }, + { "2", { 0, 30, 0.001 }, { 0, 3, 0.001 }, FREQ_DC_ONLY }, + { "3", { 0, 5, 0.001 }, { 0, 3, 0.001 }, FREQ_DC_ONLY }, }; -struct channel_group_spec rigol_dp800_cg[] = { +static const struct channel_group_spec rigol_dp820_cg[] = { + { "1", CH_IDX(0), PPS_OVP | PPS_OCP }, + { "2", CH_IDX(1), PPS_OVP | PPS_OCP }, +}; + +static const struct channel_group_spec rigol_dp830_cg[] = { { "1", CH_IDX(0), PPS_OVP | PPS_OCP }, { "2", CH_IDX(1), PPS_OVP | PPS_OCP }, { "3", CH_IDX(2), PPS_OVP | PPS_OCP }, }; -struct scpi_command rigol_dp800_cmd[] = { +static const struct scpi_command rigol_dp800_cmd[] = { { SCPI_CMD_REMOTE, "SYST:REMOTE" }, { SCPI_CMD_LOCAL, "SYST:LOCAL" }, { SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" }, @@ -119,8 +228,7 @@ struct scpi_command rigol_dp800_cmd[] = { /* HP 663xx series */ static const uint32_t hp_6632b_devopts[] = { - SR_CONF_POWER_SUPPLY, - SR_CONF_CONTINUOUS, + SR_CONF_CONTINUOUS | SR_CONF_SET, SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, @@ -128,15 +236,15 @@ static const uint32_t hp_6632b_devopts[] = { SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; -struct channel_spec hp_6632b_ch[] = { - { "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 } }, +static const struct channel_spec hp_6632b_ch[] = { + { "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 }, FREQ_DC_ONLY }, }; -struct channel_group_spec hp_6632b_cg[] = { +static const struct channel_group_spec hp_6632b_cg[] = { { "1", CH_IDX(0), 0 }, }; -struct scpi_command hp_6632b_cmd[] = { +static const struct scpi_command hp_6632b_cmd[] = { { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" }, { SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" }, { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" }, @@ -150,8 +258,7 @@ struct scpi_command hp_6632b_cmd[] = { /* Philips/Fluke PM2800 series */ static const uint32_t philips_pm2800_devopts[] = { - SR_CONF_POWER_SUPPLY, - SR_CONF_CONTINUOUS, + SR_CONF_CONTINUOUS | SR_CONF_SET, }; static const uint32_t philips_pm2800_devopts_cg[] = { @@ -176,7 +283,7 @@ enum philips_pm2800_modules { PM2800_MOD_120V_1A, }; -static struct philips_pm2800_module_spec { +static const struct philips_pm2800_module_spec { /* Min, max, programming resolution. */ float voltage[3]; float current[3]; @@ -191,7 +298,7 @@ static struct philips_pm2800_module_spec { [PM2800_MOD_120V_1A] = { { 0, 120, 0.030 }, { -1, 1, 0.00025 } }, }; -static struct philips_pm2800_model { +static const struct philips_pm2800_model { unsigned int chassis; unsigned int num_modules; unsigned int set; @@ -219,15 +326,15 @@ static struct philips_pm2800_model { { 3, 2, 3, { PM2800_MOD_8V_15A, PM2800_MOD_8V_15A, 0 } }, }; -static char *philips_pm2800_names[] = { "1", "2", "3" }; +static const char *philips_pm2800_names[] = { "1", "2", "3" }; static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hw_info, struct channel_spec **channels, unsigned int *num_channels, struct channel_group_spec **channel_groups, unsigned int *num_channel_groups) { - struct philips_pm2800_model *model; - struct philips_pm2800_module_spec *spec; + const struct philips_pm2800_model *model; + const struct philips_pm2800_module_spec *spec; unsigned int chassis, num_modules, set, module, m, i; (void)sdi; @@ -263,9 +370,9 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi, sr_dbg("output %d: %.0f - %.0fV, %.0f - %.0fA", i + 1, spec->voltage[0], spec->voltage[1], spec->current[0], spec->current[1]); - (*channels)[i].name = philips_pm2800_names[i]; + (*channels)[i].name = (char *)philips_pm2800_names[i]; memcpy(&((*channels)[i].voltage), spec, sizeof(float) * 6); - (*channel_groups)[i].name = philips_pm2800_names[i]; + (*channel_groups)[i].name = (char *)philips_pm2800_names[i]; (*channel_groups)[i].channel_index_mask = 1 << i; (*channel_groups)[i].features = PPS_OTP | PPS_OVP | PPS_OCP; } @@ -274,7 +381,7 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi, return SR_OK; } -struct scpi_command philips_pm2800_cmd[] = { +static const struct scpi_command philips_pm2800_cmd[] = { { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" }, { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, @@ -295,8 +402,25 @@ struct scpi_command philips_pm2800_cmd[] = { { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":SOUR:CURR:PROT:TRIP?" }, }; - SR_PRIV const struct scpi_pps pps_profiles[] = { + /* Agilent N5767A */ + { "Agilent", "N5767A", 0, + ARRAY_AND_SIZE(agilent_n5700a_devopts), + ARRAY_AND_SIZE(agilent_n5700a_devopts_cg), + ARRAY_AND_SIZE(agilent_n5767a_ch), + ARRAY_AND_SIZE(agilent_n5767a_cg), + ARRAY_AND_SIZE(agilent_n5700a_cmd), + .probe_channels = NULL, + }, + /* Chroma 61604 */ + { "Chroma", "61604", 0, + ARRAY_AND_SIZE(chroma_61604_devopts), + ARRAY_AND_SIZE(chroma_61604_devopts_cg), + ARRAY_AND_SIZE(chroma_61604_ch), + ARRAY_AND_SIZE(chroma_61604_cg), + ARRAY_AND_SIZE(chroma_61604_cmd), + .probe_channels = NULL, + }, /* HP 6632B */ { "HP", "6632B", 0, ARRAY_AND_SIZE(hp_6632b_devopts), @@ -308,11 +432,19 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { }, /* Rigol DP800 series */ + { "Rigol", "^DP821A$", PPS_OTP, + ARRAY_AND_SIZE(rigol_dp800_devopts), + ARRAY_AND_SIZE(rigol_dp800_devopts_cg), + ARRAY_AND_SIZE(rigol_dp821a_ch), + ARRAY_AND_SIZE(rigol_dp820_cg), + ARRAY_AND_SIZE(rigol_dp800_cmd), + .probe_channels = NULL, + }, { "Rigol", "^DP831A$", PPS_OTP, ARRAY_AND_SIZE(rigol_dp800_devopts), ARRAY_AND_SIZE(rigol_dp800_devopts_cg), ARRAY_AND_SIZE(rigol_dp831_ch), - ARRAY_AND_SIZE(rigol_dp800_cg), + ARRAY_AND_SIZE(rigol_dp830_cg), ARRAY_AND_SIZE(rigol_dp800_cmd), .probe_channels = NULL, }, @@ -320,7 +452,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { ARRAY_AND_SIZE(rigol_dp800_devopts), ARRAY_AND_SIZE(rigol_dp800_devopts_cg), ARRAY_AND_SIZE(rigol_dp832_ch), - ARRAY_AND_SIZE(rigol_dp800_cg), + ARRAY_AND_SIZE(rigol_dp830_cg), ARRAY_AND_SIZE(rigol_dp800_cmd), .probe_channels = NULL, }, @@ -335,5 +467,5 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { philips_pm2800_probe_channels, }, }; -SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles); +SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);