X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fprotocol.c;h=5b1a0daaa0083764f2ae46de780dbf78cb2b40ec;hb=a7e48f3c0665c18d901f7491823bbefda2c8555e;hp=8bc8935246e7b1f69959c68828f2ca3749382c01;hpb=803db07a1af036a5da65581ddbac23b7f84a4388;p=libsigrok.git
diff --git a/src/hardware/arachnid-labs-re-load-pro/protocol.c b/src/hardware/arachnid-labs-re-load-pro/protocol.c
index 8bc89352..5b1a0daa 100644
--- a/src/hardware/arachnid-labs-re-load-pro/protocol.c
+++ b/src/hardware/arachnid-labs-re-load-pro/protocol.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -89,6 +88,21 @@ SR_PRIV int reloadpro_set_current_limit(const struct sr_dev_inst *sdi,
return SR_OK;
}
+SR_PRIV int reloadpro_set_on_off(const struct sr_dev_inst *sdi, gboolean on)
+{
+ int ret;
+ char buf[100];
+ const char *cmd;
+
+ cmd = (on) ? "on\n" : "off\n";
+ if ((ret = send_cmd(sdi, cmd, (char *)&buf, sizeof(buf))) < 0) {
+ sr_err("Error sending on/off command: %d.", ret);
+ return SR_ERR;
+ }
+
+ return SR_OK;
+}
+
SR_PRIV int reloadpro_get_current_limit(const struct sr_dev_inst *sdi,
float *current)
{
@@ -129,11 +143,39 @@ SR_PRIV int reloadpro_get_voltage_current(const struct sr_dev_inst *sdi,
return SR_OK;
}
+static int send_config_update_key(const struct sr_dev_inst *sdi,
+ uint32_t key, GVariant *var)
+{
+ struct sr_config *cfg;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_meta meta;
+ int ret;
+
+ cfg = sr_config_new(key, var);
+ if (!cfg)
+ return SR_ERR;
+
+ memset(&meta, 0, sizeof(meta));
+
+ packet.type = SR_DF_META;
+ packet.payload = &meta;
+
+ meta.config = g_slist_append(meta.config, cfg);
+
+ ret = sr_session_send(sdi, &packet);
+ sr_config_free(cfg);
+
+ return ret;
+}
+
static void handle_packet(const struct sr_dev_inst *sdi)
{
float voltage, current;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog_old analog;
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct dev_context *devc;
char **tokens;
GSList *l;
@@ -141,8 +183,32 @@ static void handle_packet(const struct sr_dev_inst *sdi)
devc = sdi->priv;
if (g_str_has_prefix((const char *)devc->buf, "overtemp")) {
- sr_dbg("Overtemperature condition!");
+ sr_warn("Overtemperature condition!");
devc->otp_active = TRUE;
+ send_config_update_key(sdi, SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE,
+ g_variant_new_boolean(TRUE));
+ return;
+ }
+
+ if (g_str_has_prefix((const char *)devc->buf, "undervolt")) {
+ sr_warn("Undervoltage condition!");
+ devc->uvc_active = TRUE;
+ send_config_update_key(sdi, SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE,
+ g_variant_new_boolean(TRUE));
+ return;
+ }
+
+ if (g_str_has_prefix((const char *)devc->buf, "err ")) {
+ sr_err("Device replied with an error: '%s'.", devc->buf);
+ return;
+ }
+
+ if (g_str_has_prefix((const char *)devc->buf, "set ")) {
+ tokens = g_strsplit((const char *)devc->buf, " ", 2);
+ current = g_ascii_strtod(tokens[1], NULL) / 1000;
+ g_strfreev(tokens);
+ send_config_update_key(sdi, SR_CONF_CURRENT_LIMIT,
+ g_variant_new_double(current));
return;
}
@@ -156,23 +222,24 @@ static void handle_packet(const struct sr_dev_inst *sdi)
current = g_ascii_strtod(tokens[1], NULL) / 1000;
g_strfreev(tokens);
- memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
-
/* Begin frame. */
packet.type = SR_DF_FRAME_BEGIN;
+ packet.payload = NULL;
sr_session_send(sdi, &packet);
- packet.type = SR_DF_ANALOG_OLD;
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
+
+ packet.type = SR_DF_ANALOG;
packet.payload = &analog;
analog.num_samples = 1;
/* Voltage */
l = g_slist_copy(sdi->channels);
l = g_slist_remove_link(l, g_slist_nth(l, 1));
- analog.channels = l;
- analog.mq = SR_MQ_VOLTAGE;
- analog.mqflags = SR_MQFLAG_DC;
- analog.unit = SR_UNIT_VOLT;
+ meaning.channels = l;
+ meaning.mq = SR_MQ_VOLTAGE;
+ meaning.mqflags = SR_MQFLAG_DC;
+ meaning.unit = SR_UNIT_VOLT;
analog.data = &voltage;
sr_session_send(sdi, &packet);
g_slist_free(l);
@@ -180,19 +247,20 @@ static void handle_packet(const struct sr_dev_inst *sdi)
/* Current */
l = g_slist_copy(sdi->channels);
l = g_slist_remove_link(l, g_slist_nth(l, 0));
- analog.channels = l;
- analog.mq = SR_MQ_CURRENT;
- analog.mqflags = SR_MQFLAG_DC;
- analog.unit = SR_UNIT_AMPERE;
+ meaning.channels = l;
+ meaning.mq = SR_MQ_CURRENT;
+ meaning.mqflags = SR_MQFLAG_DC;
+ meaning.unit = SR_UNIT_AMPERE;
analog.data = ¤t;
sr_session_send(sdi, &packet);
g_slist_free(l);
/* End frame. */
packet.type = SR_DF_FRAME_END;
+ packet.payload = NULL;
sr_session_send(sdi, &packet);
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
static void handle_new_data(const struct sr_dev_inst *sdi)
@@ -226,7 +294,6 @@ SR_PRIV int reloadpro_receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- int64_t t;
(void)fd;
@@ -238,20 +305,8 @@ SR_PRIV int reloadpro_receive_data(int fd, int revents, void *cb_data)
handle_new_data(sdi);
- if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
-
- if (devc->limit_msec) {
- t = (g_get_monotonic_time() - devc->starttime) / 1000;
- if (t > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->limits))
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}