* This file is part of the libsigrok project.
*
* Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
*
* 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
#include <stdint.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
+#include "scpi.h"
#define LOG_PREFIX "scpi-pps"
enum pps_scpi_cmds {
- SCPI_CMD_REMOTE,
+ SCPI_CMD_REMOTE = 1,
SCPI_CMD_LOCAL,
SCPI_CMD_BEEPER,
SCPI_CMD_BEEPER_ENABLE,
const struct channel_group_spec *channel_groups;
unsigned int num_channel_groups;
const struct scpi_command *commands;
- unsigned int num_commands;
int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo,
struct channel_spec **channels, unsigned int *num_channels,
struct channel_group_spec **channel_groups, unsigned int *num_channel_groups);
struct channel_spec {
const char *name;
- /* Min, max, programming resolution. */
- float voltage[3];
- float current[3];
- float frequency[3];
-};
-
-struct scpi_command {
- int command;
- const char *string;
+ /* Min, max, programming resolution, spec digits, encoding digits. */
+ double voltage[5];
+ double current[5];
+ double power[5];
+ double frequency[5];
+ double ovp[5];
+ double ocp[5];
};
struct channel_group_spec {
};
struct pps_channel {
- int mq;
+ enum sr_mq mq;
unsigned int hw_output_idx;
const char *hwname;
+ int digits;
};
struct pps_channel_instance {
- int mq;
+ enum sr_mq mq;
int command;
const char *prefix;
};
STATE_STOP,
};
-/** Private, per-device-instance driver context. */
struct dev_context {
- /* Model-specific information */
const struct scpi_pps *device;
- /* Acquisition settings */
- void *cb_data;
-
- /* Operational state */
gboolean beeper_was_set;
struct channel_spec *channels;
struct channel_group_spec *channel_groups;
- /* Temporary state across callbacks */
- struct sr_channel *cur_channel;
+ struct sr_channel *cur_acquisition_channel;
+ struct sr_sw_limits limits;
};
-const char *get_vendor(const char *raw_vendor);
-SR_PRIV const char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command);
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...);
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
- const GVariantType *gvtype, int command, ...);
+SR_PRIV extern unsigned int num_pps_profiles;
+SR_PRIV extern const struct scpi_pps pps_profiles[];
+
SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch);
-SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
- struct sr_channel *cur_channel);
SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data);
#endif