From: poljar (Damir Jelić) <redacted>
Date: Tue, 25 Mar 2014 16:44:38 +0000 (+0100)
Subject: hameg-hmo: Add missing cases in config_get().
X-Git-Tag: libsigrok-0.3.0~114
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=3fd2dca2072fb0b205db22df8b686917a3298e99;p=libsigrok.git

hameg-hmo: Add missing cases in config_get().
---

diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c
index 1d3ea5ab..fb2548af 100644
--- a/hardware/hameg-hmo/api.c
+++ b/hardware/hameg-hmo/api.c
@@ -231,6 +231,11 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_new_int32(model->num_xdivs);
 		ret = SR_OK;
 		break;
+	case SR_CONF_TIMEBASE:
+		*data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0],
+				      (*model->timebases)[state->timebase][1]);
+		ret = SR_OK;
+		break;
 	case SR_CONF_NUM_VDIV:
 		if (pg_type == PG_NONE) {
 			sr_err("No probe group specified.");
@@ -244,6 +249,25 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 				break;
 			}
 
+		} else {
+			ret = SR_ERR_NA;
+		}
+		break;
+	case SR_CONF_VDIV:
+		if (pg_type == PG_NONE) {
+			sr_err("No probe group specified.");
+			return SR_ERR_PROBE_GROUP;
+		} else if (pg_type == PG_ANALOG) {
+			for (i = 0; i < model->analog_channels; ++i) {
+				if (probe_group != &devc->analog_groups[i])
+					continue;
+				*data = g_variant_new("(tt)",
+						      (*model->vdivs)[state->analog_channels[i].vdiv][0],
+						      (*model->vdivs)[state->analog_channels[i].vdiv][1]);
+				ret = SR_OK;
+				break;
+			}
+
 		} else {
 			ret = SR_ERR_NA;
 		}
@@ -252,6 +276,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
 		ret = SR_OK;
 		break;
+	case SR_CONF_TRIGGER_SLOPE:
+		*data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
+		ret = SR_OK;
+		break;
+	case SR_CONF_HORIZ_TRIGGERPOS:
+		*data = g_variant_new_double(state->horiz_triggerpos);
+		ret = SR_OK;
+		break;
 	case SR_CONF_COUPLING:
 		if (pg_type == PG_NONE) {
 			sr_err("No probe group specified.");