BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

korad-kaxxxxp: add config_get() support for SR_CONF_CONN 

Let applications query the device instance's conn= key. This lets users
recognize individual devices if multiple of them are connected.

  $ sigrok-cli -d korad-kaxxxxp:conn=/dev/ttyACM0 --show
  ...
  korad-kaxxxxp:conn=/dev/ttyACM0 - Korad KA3005P with 2 channels: V I
  ...
This commit is contained in:
Gerhard Sittig 2020-08-02 12:01:45 +02:00
parent 860ee00ab1
commit 048250d0e0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/korad-kaxxxxp/api.c
View File

@ -31,6 +31,7 @@ static const uint32_t drvopts[] = {
}; };
static const uint32_t devopts[] = { static const uint32_t devopts[] = {
SR_CONF_CONN | SR_CONF_GET,
SR_CONF_CONTINUOUS, SR_CONF_CONTINUOUS,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@ -174,6 +175,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->model = g_strdup(models[model_id].name); sdi->model = g_strdup(models[model_id].name);
sdi->inst_type = SR_INST_SERIAL; sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial; sdi->conn = serial;
sdi->connection_id = g_strdup(conn);
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V"); sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V");
sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I"); sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I");
@ -222,6 +224,9 @@ static int config_get(uint32_t key, GVariant **data,
case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_SAMPLES:
case SR_CONF_LIMIT_MSEC: case SR_CONF_LIMIT_MSEC:
return sr_sw_limits_config_get(&devc->limits, key, data); return sr_sw_limits_config_get(&devc->limits, key, data);
case SR_CONF_CONN:
*data = g_variant_new_string(sdi->connection_id);
break;
case SR_CONF_VOLTAGE: case SR_CONF_VOLTAGE:
korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE, devc); korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE, devc);
*data = g_variant_new_double(devc->voltage); *data = g_variant_new_double(devc->voltage);