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

korad-kdxxxxp: Rename driver to korad-kaxxxxp. 

This matches the supported / supportable devices better.
This commit is contained in:
Uwe Hermann 2015-11-27 00:16:05 +01:00
parent 89b3a0d8d1
commit 16fc7ee29f
6 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -323,11 +323,11 @@ libsigrok_la_SOURCES += \
src/hardware/kern-scale/protocol.c \ src/hardware/kern-scale/protocol.c \
src/hardware/kern-scale/api.c src/hardware/kern-scale/api.c
endif endif
if HW_KORAD_KDXXXXP if HW_KORAD_KAXXXXP
libsigrok_la_SOURCES += \ libsigrok_la_SOURCES += \
src/hardware/korad-kdxxxxp/protocol.h \ src/hardware/korad-kaxxxxp/protocol.h \
src/hardware/korad-kdxxxxp/protocol.c \ src/hardware/korad-kaxxxxp/protocol.c \
src/hardware/korad-kdxxxxp/api.c src/hardware/korad-kaxxxxp/api.c
endif endif
if HW_LASCAR_EL_USB if HW_LASCAR_EL_USB
libsigrok_la_SOURCES += \ libsigrok_la_SOURCES += \

2
configure.ac
View File

@ -239,7 +239,7 @@ SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb])
SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi]) SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi])
SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb]) SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb])
SR_DRIVER([KERN scale], [kern-scale], [libserialport]) SR_DRIVER([KERN scale], [kern-scale], [libserialport])
SR_DRIVER([Korad KDxxxxP], [korad-kdxxxxp], [libserialport]) SR_DRIVER([Korad KAxxxxP], [korad-kaxxxxp], [libserialport])
SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb]) SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb])
SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport]) SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport])
SR_DRIVER([maynuo-m97], [maynuo-m97]) SR_DRIVER([maynuo-m97], [maynuo-m97])

8
src/drivers.c
View File

@ -102,8 +102,8 @@ extern SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
#ifdef HAVE_HW_KERN_SCALE #ifdef HAVE_HW_KERN_SCALE
extern SR_PRIV struct sr_dev_driver *kern_scale_drivers[]; extern SR_PRIV struct sr_dev_driver *kern_scale_drivers[];
#endif #endif
#ifdef HAVE_HW_KORAD_KDXXXXP #ifdef HAVE_HW_KORAD_KAXXXXP
extern SR_PRIV struct sr_dev_driver korad_kdxxxxp_driver_info; extern SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info;
#endif #endif
#ifdef HAVE_HW_LASCAR_EL_USB #ifdef HAVE_HW_LASCAR_EL_USB
extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
@ -263,8 +263,8 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
#ifdef HAVE_HW_KERN_SCALE #ifdef HAVE_HW_KERN_SCALE
kern_scale_drivers, kern_scale_drivers,
#endif #endif
#ifdef HAVE_HW_KORAD_KDXXXXP #ifdef HAVE_HW_KORAD_KAXXXXP
(DRVS) {&korad_kdxxxxp_driver_info, NULL}, (DRVS) {&korad_kaxxxxp_driver_info, NULL},
#endif #endif
#ifdef HAVE_HW_LASCAR_EL_USB #ifdef HAVE_HW_LASCAR_EL_USB
(DRVS) {&lascar_el_usb_driver_info, NULL}, (DRVS) {&lascar_el_usb_driver_info, NULL},

40
src/hardware/korad-kdxxxxp/api.c → src/hardware/korad-kaxxxxp/api.c
View File

@ -48,14 +48,14 @@ static const uint32_t devopts[] = {
SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
}; };
static const struct korad_kdxxxxp_model models[] = { static const struct korad_kaxxxxp_model models[] = {
/* Device enum, vendor, model, ID reply, channels, voltage, current */ /* Device enum, vendor, model, ID reply, channels, voltage, current */
{VELLEMAN_LABPS_3005D, "Velleman", "LABPS3005D", {VELLEMAN_LABPS_3005D, "Velleman", "LABPS3005D",
"VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, "VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
{0, NULL, NULL, NULL, 0, {0, 0, 0}, {0, 0, 0}} {0, NULL, NULL, NULL, 0, {0, 0, 0}, {0, 0, 0}}
}; };
SR_PRIV struct sr_dev_driver korad_kdxxxxp_driver_info; SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info;
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{ {
@ -115,11 +115,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
} }
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
sr_dbg("Want max %d bytes.", len); sr_dbg("Want max %d bytes.", len);
if ((korad_kdxxxxp_send_cmd(serial, "*IDN?") < 0)) if ((korad_kaxxxxp_send_cmd(serial, "*IDN?") < 0))
return NULL; return NULL;
/* i is used here for debug purposes only. */ /* i is used here for debug purposes only. */
if ((i = korad_kdxxxxp_read_chars(serial, len, reply)) < 0) if ((i = korad_kaxxxxp_read_chars(serial, len, reply)) < 0)
return NULL; return NULL;
sr_dbg("Received: %d, %s", i, reply); sr_dbg("Received: %d, %s", i, reply);
model_id = -1; model_id = -1;
@ -151,7 +151,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->priv = devc; sdi->priv = devc;
/* Get current status of device. */ /* Get current status of device. */
if (korad_kdxxxxp_get_all_values(serial, devc) < 0) if (korad_kaxxxxp_get_all_values(serial, devc) < 0)
goto exit_err; goto exit_err;
drvc->instances = g_slist_append(drvc->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
@ -267,8 +267,8 @@ static int config_set(uint32_t key, GVariant *data,
if (dval < devc->model->voltage[0] || dval > devc->model->voltage[1]) if (dval < devc->model->voltage[0] || dval > devc->model->voltage[1])
return SR_ERR_ARG; return SR_ERR_ARG;
devc->voltage_max = dval; devc->voltage_max = dval;
devc->target = KDXXXXP_VOLTAGE_MAX; devc->target = KAXXXXP_VOLTAGE_MAX;
if (korad_kdxxxxp_set_value(sdi->conn, devc) < 0) if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0)
return SR_ERR; return SR_ERR;
break; break;
case SR_CONF_CURRENT_LIMIT: case SR_CONF_CURRENT_LIMIT:
@ -276,30 +276,30 @@ static int config_set(uint32_t key, GVariant *data,
if (dval < devc->model->current[0] || dval > devc->model->current[1]) if (dval < devc->model->current[0] || dval > devc->model->current[1])
return SR_ERR_ARG; return SR_ERR_ARG;
devc->current_max = dval; devc->current_max = dval;
devc->target = KDXXXXP_CURRENT_MAX; devc->target = KAXXXXP_CURRENT_MAX;
if (korad_kdxxxxp_set_value(sdi->conn, devc) < 0) if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0)
return SR_ERR; return SR_ERR;
break; break;
case SR_CONF_ENABLED: case SR_CONF_ENABLED:
bval = g_variant_get_boolean(data); bval = g_variant_get_boolean(data);
/* Set always so it is possible turn off with sigrok-cli. */ /* Set always so it is possible turn off with sigrok-cli. */
devc->output_enabled = bval; devc->output_enabled = bval;
devc->target = KDXXXXP_OUTPUT; devc->target = KAXXXXP_OUTPUT;
if (korad_kdxxxxp_set_value(sdi->conn, devc) < 0) if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0)
return SR_ERR; return SR_ERR;
break; break;
case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED: case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
bval = g_variant_get_boolean(data); bval = g_variant_get_boolean(data);
devc->ocp_enabled = bval; devc->ocp_enabled = bval;
devc->target = KDXXXXP_OCP; devc->target = KAXXXXP_OCP;
if (korad_kdxxxxp_set_value(sdi->conn, devc) < 0) if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0)
return SR_ERR; return SR_ERR;
break; break;
case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED: case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
bval = g_variant_get_boolean(data); bval = g_variant_get_boolean(data);
devc->ovp_enabled = bval; devc->ovp_enabled = bval;
devc->target = KDXXXXP_OVP; devc->target = KAXXXXP_OVP;
if (korad_kdxxxxp_set_value(sdi->conn, devc) < 0) if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0)
return SR_ERR; return SR_ERR;
break; break;
default: default:
@ -393,8 +393,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
devc->req_sent_at = 0; devc->req_sent_at = 0;
serial = sdi->conn; serial = sdi->conn;
serial_source_add(sdi->session, serial, G_IO_IN, serial_source_add(sdi->session, serial, G_IO_IN,
KDXXXXP_POLL_INTERVAL_MS, KAXXXXP_POLL_INTERVAL_MS,
korad_kdxxxxp_receive_data, (void *)sdi); korad_kaxxxxp_receive_data, (void *)sdi);
return SR_OK; return SR_OK;
} }
@ -408,9 +408,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
std_serial_dev_close, sdi->conn, LOG_PREFIX); std_serial_dev_close, sdi->conn, LOG_PREFIX);
} }
SR_PRIV struct sr_dev_driver korad_kdxxxxp_driver_info = { SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = {
.name = "korad-kdxxxxp", .name = "korad-kaxxxxp",
.longname = "Korad KDxxxxP", .longname = "Korad KAxxxxP",
.api_version = 1, .api_version = 1,
.init = init, .init = init,
.cleanup = cleanup, .cleanup = cleanup,

124
src/hardware/korad-kdxxxxp/protocol.c → src/hardware/korad-kaxxxxp/protocol.c
View File

@ -23,7 +23,7 @@
#define REQ_TIMEOUT_MS 500 #define REQ_TIMEOUT_MS 500
#define DEVICE_PROCESSING_TIME_MS 80 #define DEVICE_PROCESSING_TIME_MS 80
SR_PRIV int korad_kdxxxxp_send_cmd(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
const char *cmd) const char *cmd)
{ {
int ret; int ret;
@ -37,7 +37,7 @@ SR_PRIV int korad_kdxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
return ret; return ret;
} }
SR_PRIV int korad_kdxxxxp_read_chars(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_read_chars(struct sr_serial_dev_inst *serial,
int count, char *buf) int count, char *buf)
{ {
int ret, received, turns; int ret, received, turns;
@ -77,7 +77,7 @@ static void give_device_time_to_process(struct dev_context *devc)
} }
} }
SR_PRIV int korad_kdxxxxp_set_value(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
struct dev_context *devc) struct dev_context *devc)
{ {
char msg[21]; char msg[21];
@ -89,36 +89,36 @@ SR_PRIV int korad_kdxxxxp_set_value(struct sr_serial_dev_inst *serial,
msg[20] = 0; msg[20] = 0;
switch(devc->target){ switch(devc->target){
case KDXXXXP_CURRENT: case KAXXXXP_CURRENT:
case KDXXXXP_VOLTAGE: case KAXXXXP_VOLTAGE:
case KDXXXXP_STATUS: case KAXXXXP_STATUS:
sr_err("Can't set measurable parameter."); sr_err("Can't set measurable parameter.");
return SR_ERR; return SR_ERR;
case KDXXXXP_CURRENT_MAX: case KAXXXXP_CURRENT_MAX:
cmd = "ISET1:%05.3f"; cmd = "ISET1:%05.3f";
value = devc->current_max; value = devc->current_max;
break; break;
case KDXXXXP_VOLTAGE_MAX: case KAXXXXP_VOLTAGE_MAX:
cmd = "VSET1:%05.2f"; cmd = "VSET1:%05.2f";
value = devc->voltage_max; value = devc->voltage_max;
break; break;
case KDXXXXP_OUTPUT: case KAXXXXP_OUTPUT:
cmd = "OUT%01.0f"; cmd = "OUT%01.0f";
value = (devc->output_enabled) ? 1 : 0; value = (devc->output_enabled) ? 1 : 0;
break; break;
case KDXXXXP_BEEP: case KAXXXXP_BEEP:
cmd = "BEEP%01.0f"; cmd = "BEEP%01.0f";
value = (devc->beep_enabled) ? 1 : 0; value = (devc->beep_enabled) ? 1 : 0;
break; break;
case KDXXXXP_OCP: case KAXXXXP_OCP:
cmd = "OCP%01.0f"; cmd = "OCP%01.0f";
value = (devc->ocp_enabled) ? 1 : 0; value = (devc->ocp_enabled) ? 1 : 0;
break; break;
case KDXXXXP_OVP: case KAXXXXP_OVP:
cmd = "OVP%01.0f"; cmd = "OVP%01.0f";
value = (devc->ovp_enabled) ? 1 : 0; value = (devc->ovp_enabled) ? 1 : 0;
break; break;
case KDXXXXP_SAVE: case KAXXXXP_SAVE:
cmd = "SAV%01.0f"; cmd = "SAV%01.0f";
if (devc->program < 1 || devc->program > 5) { if (devc->program < 1 || devc->program > 5) {
sr_err("Only programs 1-5 supported and %d isn't " sr_err("Only programs 1-5 supported and %d isn't "
@ -127,7 +127,7 @@ SR_PRIV int korad_kdxxxxp_set_value(struct sr_serial_dev_inst *serial,
} }
value = devc->program; value = devc->program;
break; break;
case KDXXXXP_RECALL: case KAXXXXP_RECALL:
cmd = "RCL%01.0f"; cmd = "RCL%01.0f";
if (devc->program < 1 || devc->program > 5) { if (devc->program < 1 || devc->program > 5) {
sr_err("Only programs 1-5 supported and %d isn't " sr_err("Only programs 1-5 supported and %d isn't "
@ -144,14 +144,14 @@ SR_PRIV int korad_kdxxxxp_set_value(struct sr_serial_dev_inst *serial,
if (cmd) if (cmd)
snprintf(msg, 20, cmd, value); snprintf(msg, 20, cmd, value);
ret = korad_kdxxxxp_send_cmd(serial, msg); ret = korad_kaxxxxp_send_cmd(serial, msg);
devc->req_sent_at = g_get_monotonic_time(); devc->req_sent_at = g_get_monotonic_time();
devc->reply_pending = FALSE; devc->reply_pending = FALSE;
return ret; return ret;
} }
SR_PRIV int korad_kdxxxxp_query_value(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_query_value(struct sr_serial_dev_inst *serial,
struct dev_context *devc) struct dev_context *devc)
{ {
int ret; int ret;
@ -159,26 +159,26 @@ SR_PRIV int korad_kdxxxxp_query_value(struct sr_serial_dev_inst *serial,
give_device_time_to_process(devc); give_device_time_to_process(devc);
switch(devc->target){ switch(devc->target){
case KDXXXXP_CURRENT: case KAXXXXP_CURRENT:
/* Read current from device. */ /* Read current from device. */
ret = korad_kdxxxxp_send_cmd(serial, "IOUT1?"); ret = korad_kaxxxxp_send_cmd(serial, "IOUT1?");
break; break;
case KDXXXXP_CURRENT_MAX: case KAXXXXP_CURRENT_MAX:
/* Read set current from device. */ /* Read set current from device. */
ret = korad_kdxxxxp_send_cmd(serial, "ISET1?"); ret = korad_kaxxxxp_send_cmd(serial, "ISET1?");
break; break;
case KDXXXXP_VOLTAGE: case KAXXXXP_VOLTAGE:
/* Read voltage from device. */ /* Read voltage from device. */
ret = korad_kdxxxxp_send_cmd(serial, "VOUT1?"); ret = korad_kaxxxxp_send_cmd(serial, "VOUT1?");
break; break;
case KDXXXXP_VOLTAGE_MAX: case KAXXXXP_VOLTAGE_MAX:
/* Read set voltage from device. */ /* Read set voltage from device. */
ret = korad_kdxxxxp_send_cmd(serial, "VSET1?"); ret = korad_kaxxxxp_send_cmd(serial, "VSET1?");
break; break;
case KDXXXXP_STATUS: case KAXXXXP_STATUS:
case KDXXXXP_OUTPUT: case KAXXXXP_OUTPUT:
/* Read status from device. */ /* Read status from device. */
ret = korad_kdxxxxp_send_cmd(serial, "STATUS?"); ret = korad_kaxxxxp_send_cmd(serial, "STATUS?");
break; break;
default: default:
sr_err("Don't know how to query %d.", devc->target); sr_err("Don't know how to query %d.", devc->target);
@ -191,23 +191,23 @@ SR_PRIV int korad_kdxxxxp_query_value(struct sr_serial_dev_inst *serial,
return ret; return ret;
} }
SR_PRIV int korad_kdxxxxp_get_all_values(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_get_all_values(struct sr_serial_dev_inst *serial,
struct dev_context *devc) struct dev_context *devc)
{ {
int ret; int ret;
for (devc->target = KDXXXXP_CURRENT; for (devc->target = KAXXXXP_CURRENT;
devc->target <= KDXXXXP_STATUS; devc->target++) { devc->target <= KAXXXXP_STATUS; devc->target++) {
if ((ret = korad_kdxxxxp_query_value(serial, devc)) < 0) if ((ret = korad_kaxxxxp_query_value(serial, devc)) < 0)
return ret; return ret;
if ((ret = korad_kdxxxxp_get_reply(serial, devc)) < 0) if ((ret = korad_kaxxxxp_get_reply(serial, devc)) < 0)
return ret; return ret;
} }
return ret; return ret;
} }
SR_PRIV int korad_kdxxxxp_get_reply(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_get_reply(struct sr_serial_dev_inst *serial,
struct dev_context *devc) struct dev_context *devc)
{ {
double value; double value;
@ -219,24 +219,24 @@ SR_PRIV int korad_kdxxxxp_get_reply(struct sr_serial_dev_inst *serial,
count = 5; count = 5;
switch (devc->target) { switch (devc->target) {
case KDXXXXP_CURRENT: case KAXXXXP_CURRENT:
/* Read current from device. */ /* Read current from device. */
target = &(devc->current); target = &(devc->current);
break; break;
case KDXXXXP_CURRENT_MAX: case KAXXXXP_CURRENT_MAX:
/* Read set current from device. */ /* Read set current from device. */
target = &(devc->current_max); target = &(devc->current_max);
break; break;
case KDXXXXP_VOLTAGE: case KAXXXXP_VOLTAGE:
/* Read voltage from device. */ /* Read voltage from device. */
target = &(devc->voltage); target = &(devc->voltage);
break; break;
case KDXXXXP_VOLTAGE_MAX: case KAXXXXP_VOLTAGE_MAX:
/* Read set voltage from device. */ /* Read set voltage from device. */
target = &(devc->voltage_max); target = &(devc->voltage_max);
break; break;
case KDXXXXP_STATUS: case KAXXXXP_STATUS:
case KDXXXXP_OUTPUT: case KAXXXXP_OUTPUT:
/* Read status from device. */ /* Read status from device. */
count = 1; count = 1;
break; break;
@ -244,7 +244,7 @@ SR_PRIV int korad_kdxxxxp_get_reply(struct sr_serial_dev_inst *serial,
sr_err("Don't know where to put repply %d.", devc->target); sr_err("Don't know where to put repply %d.", devc->target);
} }
if ((ret = korad_kdxxxxp_read_chars(serial, count, devc->reply)) < 0) if ((ret = korad_kaxxxxp_read_chars(serial, count, devc->reply)) < 0)
return ret; return ret;
devc->reply[count] = 0; devc->reply[count] = 0;
@ -255,7 +255,7 @@ SR_PRIV int korad_kdxxxxp_get_reply(struct sr_serial_dev_inst *serial,
for (i = 1; i < count; i++) for (i = 1; i < count; i++)
devc->reply[i - 1] = devc->reply[i]; devc->reply[i - 1] = devc->reply[i];
/* Get the last character. */ /* Get the last character. */
if ((i = korad_kdxxxxp_read_chars(serial, 1, if ((i = korad_kaxxxxp_read_chars(serial, 1,
&(devc->reply[count]))) < 0) &(devc->reply[count]))) < 0)
return i; return i;
} }
@ -302,34 +302,34 @@ SR_PRIV int korad_kdxxxxp_get_reply(struct sr_serial_dev_inst *serial,
static void next_measurement(struct dev_context *devc) static void next_measurement(struct dev_context *devc)
{ {
switch (devc->target) { switch (devc->target) {
case KDXXXXP_CURRENT: case KAXXXXP_CURRENT:
devc->target = KDXXXXP_VOLTAGE; devc->target = KAXXXXP_VOLTAGE;
break; break;
case KDXXXXP_CURRENT_MAX: case KAXXXXP_CURRENT_MAX:
devc->target = KDXXXXP_CURRENT; devc->target = KAXXXXP_CURRENT;
break; break;
case KDXXXXP_VOLTAGE: case KAXXXXP_VOLTAGE:
devc->target = KDXXXXP_STATUS; devc->target = KAXXXXP_STATUS;
break; break;
case KDXXXXP_VOLTAGE_MAX: case KAXXXXP_VOLTAGE_MAX:
devc->target = KDXXXXP_CURRENT; devc->target = KAXXXXP_CURRENT;
break; break;
/* Read back what was set. */ /* Read back what was set. */
case KDXXXXP_BEEP: case KAXXXXP_BEEP:
case KDXXXXP_OCP: case KAXXXXP_OCP:
case KDXXXXP_OVP: case KAXXXXP_OVP:
case KDXXXXP_OUTPUT: case KAXXXXP_OUTPUT:
devc->target = KDXXXXP_STATUS; devc->target = KAXXXXP_STATUS;
break; break;
case KDXXXXP_STATUS: case KAXXXXP_STATUS:
devc->target = KDXXXXP_CURRENT; devc->target = KAXXXXP_CURRENT;
break; break;
default: default:
devc->target = KDXXXXP_CURRENT; devc->target = KAXXXXP_CURRENT;
} }
} }
SR_PRIV int korad_kdxxxxp_receive_data(int fd, int revents, void *cb_data) SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
@ -350,21 +350,21 @@ SR_PRIV int korad_kdxxxxp_receive_data(int fd, int revents, void *cb_data)
if (revents == G_IO_IN) { if (revents == G_IO_IN) {
/* Get the value. */ /* Get the value. */
korad_kdxxxxp_get_reply(serial, devc); korad_kaxxxxp_get_reply(serial, devc);
/* Send the value forward. */ /* Send the value forward. */
packet.type = SR_DF_ANALOG_OLD; packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog; packet.payload = &analog;
analog.channels = sdi->channels; analog.channels = sdi->channels;
analog.num_samples = 1; analog.num_samples = 1;
if (devc->target == KDXXXXP_CURRENT) { if (devc->target == KAXXXXP_CURRENT) {
analog.mq = SR_MQ_CURRENT; analog.mq = SR_MQ_CURRENT;
analog.unit = SR_UNIT_AMPERE; analog.unit = SR_UNIT_AMPERE;
analog.mqflags = 0; analog.mqflags = 0;
analog.data = &devc->current; analog.data = &devc->current;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
} }
if (devc->target == KDXXXXP_VOLTAGE) { if (devc->target == KAXXXXP_VOLTAGE) {
analog.mq = SR_MQ_VOLTAGE; analog.mq = SR_MQ_VOLTAGE;
analog.unit = SR_UNIT_VOLT; analog.unit = SR_UNIT_VOLT;
analog.mqflags = SR_MQFLAG_DC; analog.mqflags = SR_MQFLAG_DC;
@ -376,7 +376,7 @@ SR_PRIV int korad_kdxxxxp_receive_data(int fd, int revents, void *cb_data)
} else { } else {
/* Time out */ /* Time out */
if (!devc->reply_pending) { if (!devc->reply_pending) {
if (korad_kdxxxxp_query_value(serial, devc) < 0) if (korad_kaxxxxp_query_value(serial, devc) < 0)
return TRUE; return TRUE;
devc->req_sent_at = g_get_monotonic_time(); devc->req_sent_at = g_get_monotonic_time();
devc->reply_pending = TRUE; devc->reply_pending = TRUE;

50
src/hardware/korad-kdxxxxp/protocol.h → src/hardware/korad-kaxxxxp/protocol.h
View File

@ -19,12 +19,12 @@
/** /**
* @file * @file
* Korad KDxxxxP power supply driver * Korad KAxxxxP power supply driver
* @internal * @internal
*/ */
#ifndef LIBSIGROK_HARDWARE_KORAD_KDXXXXP_PROTOCOL_H #ifndef LIBSIGROK_HARDWARE_KORAD_KAXXXXP_PROTOCOL_H
#define LIBSIGROK_HARDWARE_KORAD_KDXXXXP_PROTOCOL_H #define LIBSIGROK_HARDWARE_KORAD_KAXXXXP_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -32,9 +32,9 @@
#include <libsigrok/libsigrok.h> #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "korad-kdxxxxp" #define LOG_PREFIX "korad-kaxxxxp"
#define KDXXXXP_POLL_INTERVAL_MS 80 #define KAXXXXP_POLL_INTERVAL_MS 80
enum { enum {
VELLEMAN_LABPS_3005D, VELLEMAN_LABPS_3005D,
@ -42,7 +42,7 @@ enum {
}; };
/* Information on single model */ /* Information on single model */
struct korad_kdxxxxp_model { struct korad_kaxxxxp_model {
int model_id; /**< Model info */ int model_id; /**< Model info */
const char *vendor; /**< Vendor name */ const char *vendor; /**< Vendor name */
const char *name; /**< Model name */ const char *name; /**< Model name */
@ -54,23 +54,23 @@ struct korad_kdxxxxp_model {
/* Reply targets */ /* Reply targets */
enum { enum {
KDXXXXP_CURRENT, KAXXXXP_CURRENT,
KDXXXXP_CURRENT_MAX, KAXXXXP_CURRENT_MAX,
KDXXXXP_VOLTAGE, KAXXXXP_VOLTAGE,
KDXXXXP_VOLTAGE_MAX, KAXXXXP_VOLTAGE_MAX,
KDXXXXP_STATUS, KAXXXXP_STATUS,
KDXXXXP_OUTPUT, KAXXXXP_OUTPUT,
KDXXXXP_BEEP, KAXXXXP_BEEP,
KDXXXXP_OCP, KAXXXXP_OCP,
KDXXXXP_OVP, KAXXXXP_OVP,
KDXXXXP_SAVE, KAXXXXP_SAVE,
KDXXXXP_RECALL, KAXXXXP_RECALL,
}; };
/** Private, per-device-instance driver context. */ /** Private, per-device-instance driver context. */
struct dev_context { struct dev_context {
/* Model-specific information */ /* Model-specific information */
const struct korad_kdxxxxp_model *model; /**< Model information. */ const struct korad_kaxxxxp_model *model; /**< Model information. */
/* Acquisition settings */ /* Acquisition settings */
uint64_t limit_samples; uint64_t limit_samples;
@ -100,18 +100,18 @@ struct dev_context {
char reply[6]; char reply[6];
}; };
SR_PRIV int korad_kdxxxxp_send_cmd(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
const char *cmd); const char *cmd);
SR_PRIV int korad_kdxxxxp_read_chars(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_read_chars(struct sr_serial_dev_inst *serial,
int count, char *buf); int count, char *buf);
SR_PRIV int korad_kdxxxxp_set_value(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
struct dev_context *devc); struct dev_context *devc);
SR_PRIV int korad_kdxxxxp_query_value(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_query_value(struct sr_serial_dev_inst *serial,
struct dev_context *devc); struct dev_context *devc);
SR_PRIV int korad_kdxxxxp_get_reply(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_get_reply(struct sr_serial_dev_inst *serial,
struct dev_context *devc); struct dev_context *devc);
SR_PRIV int korad_kdxxxxp_get_all_values(struct sr_serial_dev_inst *serial, SR_PRIV int korad_kaxxxxp_get_all_values(struct sr_serial_dev_inst *serial,
struct dev_context *devc); struct dev_context *devc);
SR_PRIV int korad_kdxxxxp_receive_data(int fd, int revents, void *cb_data); SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data);
#endif #endif