X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fprotocol.c;h=848279d7c941311ff1bd946adf736d640f230900;hb=599f9e1deb6b6a4a75e00e29d86935845164eeed;hp=a95e78dff4c01834de53b7cf13999b5ee5a242be;hpb=8f39d5698d613630599f28cd8a674d5679629dc1;p=libsigrok.git diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c index a95e78df..848279d7 100644 --- a/src/hardware/korad-kaxxxxp/protocol.c +++ b/src/hardware/korad-kaxxxxp/protocol.c @@ -2,7 +2,7 @@ * This file is part of the libsigrok project. * * Copyright (C) 2015 Hannu Vuolasaho - * Copyright (C) 2018 Frank Stettner + * Copyright (C) 2018-2019 Frank Stettner * * 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 @@ -96,29 +96,35 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial, sr_err("Can't set measurable parameter %d.", target); g_mutex_unlock(&devc->rw_mutex); return SR_ERR; - case KAXXXXP_CURRENT_MAX: + case KAXXXXP_CURRENT_LIMIT: cmd = "ISET1:%05.3f"; - value = devc->current_max; + value = devc->set_current_limit; break; - case KAXXXXP_VOLTAGE_MAX: + case KAXXXXP_VOLTAGE_TARGET: cmd = "VSET1:%05.2f"; - value = devc->voltage_max; + value = devc->set_voltage_target; break; case KAXXXXP_OUTPUT: cmd = "OUT%01.0f"; - value = (devc->output_enabled) ? 1 : 0; + value = (devc->set_output_enabled) ? 1 : 0; + /* Set value back to recognize changes */ + devc->output_enabled = devc->set_output_enabled; break; case KAXXXXP_BEEP: cmd = "BEEP%01.0f"; - value = (devc->beep_enabled) ? 1 : 0; + value = (devc->set_beep_enabled) ? 1 : 0; break; case KAXXXXP_OCP: cmd = "OCP%01.0f"; - value = (devc->ocp_enabled) ? 1 : 0; + value = (devc->set_ocp_enabled) ? 1 : 0; + /* Set value back to recognize changes */ + devc->ocp_enabled = devc->set_ocp_enabled; break; case KAXXXXP_OVP: cmd = "OVP%01.0f"; - value = (devc->ovp_enabled) ? 1 : 0; + value = (devc->set_ovp_enabled) ? 1 : 0; + /* Set value back to recognize changes */ + devc->ovp_enabled = devc->set_ovp_enabled; break; case KAXXXXP_SAVE: cmd = "SAV%01.0f"; @@ -166,6 +172,7 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial, char reply[6]; float *value; char status_byte; + gboolean prev_status; g_mutex_lock(&devc->rw_mutex); give_device_time_to_process(devc); @@ -179,20 +186,20 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial, ret = korad_kaxxxxp_send_cmd(serial, "IOUT1?"); value = &(devc->current); break; - case KAXXXXP_CURRENT_MAX: + case KAXXXXP_CURRENT_LIMIT: /* Read set current from device. */ ret = korad_kaxxxxp_send_cmd(serial, "ISET1?"); - value = &(devc->current_max); + value = &(devc->current_limit); break; case KAXXXXP_VOLTAGE: /* Read voltage from device. */ ret = korad_kaxxxxp_send_cmd(serial, "VOUT1?"); value = &(devc->voltage); break; - case KAXXXXP_VOLTAGE_MAX: + case KAXXXXP_VOLTAGE_TARGET: /* Read set voltage from device. */ ret = korad_kaxxxxp_send_cmd(serial, "VSET1?"); - value = &(devc->voltage_max); + value = &(devc->voltage_target); break; case KAXXXXP_STATUS: case KAXXXXP_OUTPUT: @@ -223,37 +230,58 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial, } else { /* We have status reply. */ status_byte = reply[0]; - /* Constant current */ - devc->cc_mode[0] = !(status_byte & (1 << 0)); /* Channel one */ - devc->cc_mode[1] = !(status_byte & (1 << 1)); /* Channel two */ + + /* Constant current channel one. */ + prev_status = devc->cc_mode[0]; + devc->cc_mode[0] = !(status_byte & (1 << 0)); + devc->cc_mode_1_changed = devc->cc_mode[0] != prev_status; + /* Constant current channel two. */ + prev_status = devc->cc_mode[1]; + devc->cc_mode[1] = !(status_byte & (1 << 1)); + devc->cc_mode_2_changed = devc->cc_mode[1] != prev_status; + /* - * Tracking + * Tracking: * status_byte & ((1 << 2) | (1 << 3)) * 00 independent 01 series 11 parallel */ - devc->beep_enabled = (1 << 4); - devc->ocp_enabled = (status_byte & (1 << 5)); - devc->output_enabled = (status_byte & (1 << 6)); - /* Velleman LABPS3005 quirk */ - if (devc->output_enabled) - devc->ovp_enabled = (status_byte & (1 << 7)); + devc->beep_enabled = status_byte & (1 << 4); + + /* OCP enabled. */ + prev_status = devc->ocp_enabled; + devc->ocp_enabled = status_byte & (1 << 5); + devc->ocp_enabled_changed = devc->ocp_enabled != prev_status; + + /* Output status. */ + prev_status = devc->output_enabled; + devc->output_enabled = status_byte & (1 << 6); + devc->output_enabled_changed = devc->output_enabled != prev_status; + + /* OVP enabled, special handling for Velleman LABPS3005 quirk. */ + if ((devc->model->model_id == VELLEMAN_LABPS3005D && devc->output_enabled) || + devc->model->model_id != VELLEMAN_LABPS3005D) { + + prev_status = devc->ovp_enabled; + devc->ovp_enabled = status_byte & (1 << 7); + devc->ovp_enabled_changed = devc->ovp_enabled != prev_status; + } + sr_dbg("Status: 0x%02x", status_byte); sr_spew("Status: CH1: constant %s CH2: constant %s. " - "Tracking would be %s. Device is " - "%s and %s. Buttons are %s. Output is %s " - "and extra byte is %s.", + "Tracking would be %s and %s. Output is %s. " + "OCP is %s, OVP is %s. Device is %s.", (status_byte & (1 << 0)) ? "voltage" : "current", (status_byte & (1 << 1)) ? "voltage" : "current", (status_byte & (1 << 2)) ? "parallel" : "series", (status_byte & (1 << 3)) ? "tracking" : "independent", - (status_byte & (1 << 4)) ? "beeping" : "silent", - (status_byte & (1 << 5)) ? "locked" : "unlocked", (status_byte & (1 << 6)) ? "enabled" : "disabled", - (status_byte & (1 << 7)) ? "true" : "false"); + (status_byte & (1 << 5)) ? "enabled" : "disabled", + (status_byte & (1 << 7)) ? "enabled" : "disabled", + (status_byte & (1 << 4)) ? "beeping" : "silent"); } /* Read the sixth byte from ISET? BUG workaround. */ - if (target == KAXXXXP_CURRENT_MAX) + if (target == KAXXXXP_CURRENT_LIMIT) serial_read_blocking(serial, &status_byte, 1, 10); g_mutex_unlock(&devc->rw_mutex); @@ -306,6 +334,7 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data) GSList *l; (void)fd; + (void)revents; if (!(sdi = cb_data)) return TRUE; @@ -315,43 +344,66 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data) serial = sdi->conn; - if (revents == G_IO_IN) { - /* Get the value. */ - korad_kaxxxxp_get_value(serial, devc->acquisition_target, devc); - - /* Note: digits/spec_digits will be overridden later. */ - sr_analog_init(&analog, &encoding, &meaning, &spec, 0); - - /* Send the value forward. */ - packet.type = SR_DF_ANALOG; - packet.payload = &analog; - analog.num_samples = 1; - l = g_slist_copy(sdi->channels); - if (devc->acquisition_target == KAXXXXP_CURRENT) { - l = g_slist_remove_link(l, g_slist_nth(l, 0)); - analog.meaning->channels = l; - analog.meaning->mq = SR_MQ_CURRENT; - analog.meaning->unit = SR_UNIT_AMPERE; - analog.meaning->mqflags = 0; - analog.encoding->digits = 3; - analog.spec->spec_digits = 3; - analog.data = &devc->current; - sr_session_send(sdi, &packet); + /* Get the value. */ + korad_kaxxxxp_get_value(serial, devc->acquisition_target, devc); + + /* Note: digits/spec_digits will be overridden later. */ + sr_analog_init(&analog, &encoding, &meaning, &spec, 0); + + /* Send the value forward. */ + packet.type = SR_DF_ANALOG; + packet.payload = &analog; + analog.num_samples = 1; + l = g_slist_copy(sdi->channels); + if (devc->acquisition_target == KAXXXXP_CURRENT) { + l = g_slist_remove_link(l, g_slist_nth(l, 0)); + analog.meaning->channels = l; + analog.meaning->mq = SR_MQ_CURRENT; + analog.meaning->unit = SR_UNIT_AMPERE; + analog.meaning->mqflags = SR_MQFLAG_DC; + analog.encoding->digits = 3; + analog.spec->spec_digits = 3; + analog.data = &devc->current; + sr_session_send(sdi, &packet); + } else if (devc->acquisition_target == KAXXXXP_VOLTAGE) { + l = g_slist_remove_link(l, g_slist_nth(l, 1)); + analog.meaning->channels = l; + analog.meaning->mq = SR_MQ_VOLTAGE; + analog.meaning->unit = SR_UNIT_VOLT; + analog.meaning->mqflags = SR_MQFLAG_DC; + analog.encoding->digits = 2; + analog.spec->spec_digits = 2; + analog.data = &devc->voltage; + sr_session_send(sdi, &packet); + sr_sw_limits_update_samples_read(&devc->limits, 1); + } else if (devc->acquisition_target == KAXXXXP_STATUS) { + if (devc->cc_mode_1_changed) { + sr_session_send_meta(sdi, SR_CONF_REGULATION, + g_variant_new_string((devc->cc_mode[0]) ? "CC" : "CV")); + devc->cc_mode_1_changed = FALSE; + } + if (devc->cc_mode_2_changed) { + sr_session_send_meta(sdi, SR_CONF_REGULATION, + g_variant_new_string((devc->cc_mode[1]) ? "CC" : "CV")); + devc->cc_mode_2_changed = FALSE; + } + if (devc->output_enabled_changed) { + sr_session_send_meta(sdi, SR_CONF_ENABLED, + g_variant_new_boolean(devc->output_enabled)); + devc->output_enabled_changed = FALSE; + } + if (devc->ocp_enabled_changed) { + sr_session_send_meta(sdi, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED, + g_variant_new_boolean(devc->ocp_enabled)); + devc->ocp_enabled_changed = FALSE; } - else if (devc->acquisition_target == KAXXXXP_VOLTAGE) { - l = g_slist_remove_link(l, g_slist_nth(l, 1)); - analog.meaning->channels = l; - analog.meaning->mq = SR_MQ_VOLTAGE; - analog.meaning->unit = SR_UNIT_VOLT; - analog.meaning->mqflags = SR_MQFLAG_DC; - analog.encoding->digits = 2; - analog.spec->spec_digits = 2; - analog.data = &devc->voltage; - sr_session_send(sdi, &packet); - sr_sw_limits_update_samples_read(&devc->limits, 1); + if (devc->ovp_enabled_changed) { + sr_session_send_meta(sdi, SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED, + g_variant_new_boolean(devc->ovp_enabled)); + devc->ovp_enabled_changed = FALSE; } - next_measurement(devc); } + next_measurement(devc); if (sr_sw_limits_check(&devc->limits)) sr_dev_acquisition_stop(sdi);