* This file is part of the libsigrok project.
*
* Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2017,2019 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
#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,
SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION,
SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE,
SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE,
+ SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE,
SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED,
SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE,
SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE,
SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
};
+/* Defines the SCPI dialect */
+enum pps_scpi_dialect {
+ SCPI_DIALECT_UNKNOWN = 1,
+ SCPI_DIALECT_HP_COMP,
+ SCPI_DIALECT_HP_66XXB,
+ SCPI_DIALECT_PHILIPS,
+ SCPI_DIALECT_HMP,
+};
+
/*
* These are bit values denoting features a device can have either globally,
* in scpi_pps.features, or on a per-channel-group basis in
struct scpi_pps {
const char *vendor;
const char *model;
+ const enum pps_scpi_dialect dialect;
uint64_t features;
const uint32_t *devopts;
unsigned int num_devopts;
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);
+ int (*init_acquisition) (const struct sr_dev_inst *sdi);
+ int (*update_status) (const struct sr_dev_inst *sdi);
};
struct channel_spec {
const char *name;
- /* Min, max, programming resolution. */
- float voltage[3];
- float current[3];
- float frequency[3];
+ /* 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 {
const char *name;
uint64_t channel_index_mask;
uint64_t features;
+ /* The mqflags will only be applied to voltage and current channels! */
+ enum sr_mqflag mqflags;
};
struct pps_channel {
- int mq;
+ enum sr_mq mq;
+ enum sr_mqflag mqflags;
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;
};
SR_PRIV extern unsigned int num_pps_profiles;