X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fconrad-digi-35-cpu%2Fapi.c;h=bab100dc441b08ecb724315ddc7ac3883258e5d4;hb=d1d3b7dff9881acfce0923be9e66b3bddaa48221;hp=8407b3a058ab3060421a86ac314b894b51927db7;hpb=823b4e5817af106e88ab4be2bdb999ac9d1ee50b;p=libsigrok.git
diff --git a/hardware/conrad-digi-35-cpu/api.c b/hardware/conrad-digi-35-cpu/api.c
index 8407b3a0..bab100dc 100644
--- a/hardware/conrad-digi-35-cpu/api.c
+++ b/hardware/conrad-digi-35-cpu/api.c
@@ -17,8 +17,28 @@
* along with this program. If not, see .
*/
+/** @file
+ * Conrad DIGI 35 CPU power supply driver
+ * @internal
+ */
+
#include "protocol.h"
+#define SERIALCOMM "9600/8n1"
+
+static const int32_t hwopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+};
+
+static const int32_t hwcaps[] = {
+ SR_CONF_POWER_SUPPLY,
+ SR_CONF_OUTPUT_VOLTAGE,
+ SR_CONF_OUTPUT_CURRENT,
+ /* There's no SR_CONF_OUTPUT_ENABLED; can't know/set status remotely. */
+ SR_CONF_OVER_CURRENT_PROTECTION,
+};
+
SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
static struct sr_dev_driver *di = &conrad_digi_35_cpu_driver_info;
@@ -29,87 +49,84 @@ static int init(struct sr_context *sr_ctx)
static GSList *scan(GSList *options)
{
+ struct sr_dev_inst *sdi;
struct drv_context *drvc;
- GSList *devices;
-
- (void)options;
+ struct sr_config *src;
+ struct sr_probe *probe;
+ struct sr_serial_dev_inst *serial;
+ GSList *l, *devices;
+ const char *conn, *serialcomm;
devices = NULL;
drvc = di->priv;
drvc->instances = NULL;
+ conn = serialcomm = NULL;
+
+ for (l = options; l; l = l->next) {
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = g_variant_get_string(src->data, NULL);
+ break;
+ case SR_CONF_SERIALCOMM:
+ serialcomm = g_variant_get_string(src->data, NULL);
+ break;
+ }
+ }
+ if (!conn)
+ return NULL;
+ if (!serialcomm)
+ serialcomm = SERIALCOMM;
- /* TODO: scan for devices, either based on a SR_CONF_CONN option
- * or on a USB scan. */
-
- return devices;
-}
-
-static GSList *dev_list(void)
-{
- return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int dev_clear(void)
-{
- return std_dev_clear(di, NULL);
-}
+ /*
+ * We cannot scan for this device because it is write-only.
+ * So just check that the port parameters are valid and assume that
+ * the device is there.
+ */
-static int dev_open(struct sr_dev_inst *sdi)
-{
- (void)sdi;
+ if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
+ return NULL;
- /* TODO: get handle from sdi->conn and open it. */
+ if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ return NULL;
- sdi->status = SR_ST_ACTIVE;
+ serial_flush(serial);
+ serial_close(serial);
- return SR_OK;
-}
+ sr_spew("Conrad DIGI 35 CPU assumed at %s.", conn);
-static int dev_close(struct sr_dev_inst *sdi)
-{
- (void)sdi;
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "Conrad", "DIGI 35 CPU", "")))
+ return NULL;
- /* TODO: get handle from sdi->conn and close it. */
+ sdi->conn = serial;
+ sdi->priv = NULL;
+ sdi->driver = di;
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "CH1")))
+ return NULL;
+ sdi->probes = g_slist_append(sdi->probes, probe);
- sdi->status = SR_ST_INACTIVE;
+ drvc->instances = g_slist_append(drvc->instances, sdi);
+ devices = g_slist_append(devices, sdi);
- return SR_OK;
+ return devices;
}
-static int cleanup(void)
+static GSList *dev_list(void)
{
- dev_clear();
-
- /* TODO: free other driver resources, if any. */
-
- return SR_OK;
+ return ((struct drv_context *)(di->priv))->instances;
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+static int cleanup(void)
{
- int ret;
-
- (void)sdi;
- (void)data;
- (void)probe_group;
-
- ret = SR_OK;
- switch (key) {
- /* TODO */
- default:
- return SR_ERR_NA;
- }
-
- return ret;
+ return std_dev_clear(di, NULL);
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group)
{
int ret;
+ double dblval;
- (void)data;
(void)probe_group;
if (sdi->status != SR_ST_ACTIVE)
@@ -117,7 +134,29 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
ret = SR_OK;
switch (key) {
- /* TODO */
+ case SR_CONF_OUTPUT_VOLTAGE:
+ dblval = g_variant_get_double(data);
+ if ((dblval < 0.0) || (dblval > 35.0)) {
+ sr_err("Voltage out of range (0 - 35.0)!");
+ return SR_ERR_ARG;
+ }
+ ret = send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
+ break;
+ case SR_CONF_OUTPUT_CURRENT:
+ dblval = g_variant_get_double(data);
+ if ((dblval < 0.01) || (dblval > 2.55)) {
+ sr_err("Current out of range (0 - 2.55)!");
+ return SR_ERR_ARG;
+ }
+ ret = send_msg1(sdi, 'C', (int) (dblval * 100 + 0.5));
+ break;
+ /* No SR_CONF_OUTPUT_ENABLED :-( . */
+ case SR_CONF_OVER_CURRENT_PROTECTION:
+ if (g_variant_get_boolean(data))
+ ret = send_msg1(sdi, 'V', 900);
+ else /* Constant current mode */
+ ret = send_msg1(sdi, 'V', 901);
+ break;
default:
ret = SR_ERR_NA;
}
@@ -131,12 +170,18 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
int ret;
(void)sdi;
- (void)data;
(void)probe_group;
ret = SR_OK;
switch (key) {
- /* TODO */
+ case SR_CONF_SCAN_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+ break;
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+ break;
default:
return SR_ERR_NA;
}
@@ -144,18 +189,13 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
return ret;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
- (void)sdi;
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- /* TODO: configure hardware, reset acquisition state, set up
- * callbacks and send header packet. */
-
return SR_OK;
}
@@ -166,8 +206,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- /* TODO: stop acquisition. */
-
return SR_OK;
}
@@ -179,12 +217,12 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
- .config_get = config_get,
+ .dev_clear = NULL,
+ .config_get = NULL,
.config_set = config_set,
.config_list = config_list,
- .dev_open = dev_open,
- .dev_close = dev_close,
+ .dev_open = std_serial_dev_open,
+ .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,