"Number of analog channels", NULL},
{SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage",
"Current output voltage", NULL},
- {SR_CONF_OUTPUT_VOLTAGE_MAX, SR_T_FLOAT, "output_voltage_max",
- "Maximum output voltage", NULL},
+ {SR_CONF_OUTPUT_VOLTAGE_TARGET, SR_T_FLOAT, "output_voltage_target",
+ "Output voltage target", NULL},
{SR_CONF_OUTPUT_CURRENT, SR_T_FLOAT, "output_current",
"Current output current", NULL},
- {SR_CONF_OUTPUT_CURRENT_MAX, SR_T_FLOAT, "output_current_max",
- "Maximum output current", NULL},
+ {SR_CONF_OUTPUT_CURRENT_LIMIT, SR_T_FLOAT, "output_current_limit",
+ "Output current limit", NULL},
{SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled",
"Output enabled", NULL},
{SR_CONF_OUTPUT_CHANNEL_CONFIG, SR_T_STRING, "output_channel_config",
"Over-temperature protection", NULL},
{SR_CONF_OUTPUT_REGULATION, SR_T_STRING, "output_regulation",
"Output channel regulation", NULL},
+ {SR_CONF_OUTPUT_FREQUENCY, SR_T_UINT64, "output_frequency",
+ "Output frequency", NULL},
+ {SR_CONF_MEASURED_QUANTITY, SR_T_STRING, "measured_quantity",
+ "Measured quantity", NULL},
+ {SR_CONF_MEASURED_2ND_QUANTITY, SR_T_STRING, "measured_2nd_quantity",
+ "Measured secondary quantity", NULL},
+ {SR_CONF_EQUIV_CIRCUIT_MODEL, SR_T_STRING, "equiv_circuit_model",
+ "Equivalent circuit model", NULL},
{0, 0, NULL, NULL, NULL},
};
}
}
-SR_PRIV int sr_variant_type_check(int key, GVariant *value)
+SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value)
{
const struct sr_config_info *info;
const GVariantType *type, *expected;
+ char *expected_string, *type_string;
+
info = sr_config_info_get(key);
if (!info)
return SR_OK;
+
expected = sr_variant_type_get(info->datatype);
type = g_variant_get_type(value);
- if (!g_variant_type_equal(type, expected)) {
- gchar *expected_string = g_variant_type_dup_string(expected);
- gchar *type_string = g_variant_type_dup_string(type);
+ if (!g_variant_type_equal(type, expected)
+ && !g_variant_type_is_subtype_of(type, expected)) {
+ expected_string = g_variant_type_dup_string(expected);
+ type_string = g_variant_type_dup_string(type);
sr_err("Wrong variant type for key '%s': expected '%s', got '%s'",
info->name, expected_string, type_string);
g_free(expected_string);
g_free(type_string);
return SR_ERR_ARG;
}
+
return SR_OK;
}
* A floating reference can be passed in for data.
* @private
*/
-SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
+SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data)
{
struct sr_config *src;
SR_API int sr_config_get(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg,
- int key, GVariant **data)
+ uint32_t key, GVariant **data)
{
int ret;
*/
SR_API int sr_config_set(const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg,
- int key, GVariant *data)
+ uint32_t key, GVariant *data)
{
int ret;
SR_API int sr_config_list(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg,
- int key, GVariant **data)
+ uint32_t key, GVariant **data)
{
int ret;
*
* @since 0.2.0
*/
-SR_API const struct sr_config_info *sr_config_info_get(int key)
+SR_API const struct sr_config_info *sr_config_info_get(uint32_t key)
{
int i;