X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=96217051f8433819cb9e0b575d8be28cc5a7e242;hb=fe1e6ad6ae644edd29ab226573e40561c9974694;hp=3ebc9f9f41839b67d0d6fac1b8cb4d26f7b5ff33;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;p=pulseview.git

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 3ebc9f9f..96217051 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -32,7 +32,6 @@
 using boost::optional;
 
 using std::function;
-using std::make_pair;
 using std::pair;
 using std::set;
 using std::shared_ptr;
@@ -62,19 +61,22 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 
 		auto capabilities = configurable->config_capabilities(key);
 
-		if (!capabilities.count(Capability::GET) ||
-			!capabilities.count(Capability::SET))
-			continue;
-
 		string name_str;
 		try {
 			name_str = key->description();
-		} catch (Error e) {
+		} catch (Error& e) {
 			name_str = key->name();
 		}
 
 		const QString name = QString::fromStdString(name_str);
 
+		if (!capabilities.count(Capability::GET) ||
+			!capabilities.count(Capability::SET)) {
+			qDebug() << QString(tr("Note for device developers: Ignoring device configuration capability '%1' " \
+				"as it is missing GET and/or SET")).arg(name);
+			continue;
+		}
+
 		const Property::Getter get = [&, key]() {
 			return configurable_->config_get(key); };
 		const Property::Setter set = [&, key](Glib::VariantBase value) {
@@ -89,8 +91,13 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 			break;
 
 		case SR_CONF_CAPTURE_RATIO:
-			bind_int(name, "%", pair<int64_t, int64_t>(0, 100),
-				get, set);
+			bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100), get, set);
+			break;
+
+		case SR_CONF_LIMIT_FRAMES:
+			// Value 0 means that there is no limit
+			bind_int(name, "", "", pair<int64_t, int64_t>(0, 1000000), get, set,
+				tr("No Limit"));
 			break;
 
 		case SR_CONF_PATTERN_MODE:
@@ -99,33 +106,43 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 		case SR_CONF_TRIGGER_SLOPE:
 		case SR_CONF_COUPLING:
 		case SR_CONF_CLOCK_EDGE:
-			bind_enum(name, key, capabilities, get, set);
+		case SR_CONF_DATA_SOURCE:
+		case SR_CONF_EXTERNAL_CLOCK_SOURCE:
+			bind_enum(name, "", key, capabilities, get, set);
 			break;
 
 		case SR_CONF_FILTER:
 		case SR_CONF_EXTERNAL_CLOCK:
 		case SR_CONF_RLE:
 		case SR_CONF_POWER_OFF:
-			bind_bool(name, get, set);
+		case SR_CONF_AVERAGING:
+			bind_bool(name, "", get, set);
 			break;
 
 		case SR_CONF_TIMEBASE:
-			bind_enum(name, key, capabilities, get, set, print_timebase);
+			bind_enum(name, "", key, capabilities, get, set, print_timebase);
 			break;
 
 		case SR_CONF_VDIV:
-			bind_enum(name, key, capabilities, get, set, print_vdiv);
+			bind_enum(name, "", key, capabilities, get, set, print_vdiv);
 			break;
 
 		case SR_CONF_VOLTAGE_THRESHOLD:
-			bind_enum(name, key, capabilities, get, set, print_voltage_threshold);
+			bind_enum(name, "", key, capabilities, get, set, print_voltage_threshold);
 			break;
 
 		case SR_CONF_PROBE_FACTOR:
 			if (capabilities.count(Capability::LIST))
-				bind_enum(name, key, capabilities, get, set, print_probe_factor);
+				bind_enum(name, "", key, capabilities, get, set, print_probe_factor);
+			else
+				bind_int(name, "", "", pair<int64_t, int64_t>(1, 500), get, set);
+			break;
+
+		case SR_CONF_AVG_SAMPLES:
+			if (capabilities.count(Capability::LIST))
+				bind_enum(name, "", key, capabilities, get, set, print_averages);
 			else
-				bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
+				bind_int(name, "", "", pair<int64_t, int64_t>(0, INT32_MAX), get, set);
 			break;
 
 		default:
@@ -134,43 +151,49 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 	}
 }
 
-void Device::bind_bool(const QString &name,
+void Device::bind_bool(const QString &name, const QString &desc,
 	Property::Getter getter, Property::Setter setter)
 {
 	assert(configurable_);
 	properties_.push_back(shared_ptr<Property>(new Bool(
-		name, getter, setter)));
+		name, desc, getter, setter)));
 }
 
-void Device::bind_enum(const QString &name,
+void Device::bind_enum(const QString &name, const QString &desc,
 	const ConfigKey *key, set<const Capability *> capabilities,
 	Property::Getter getter,
 	Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
-	Glib::VariantBase gvar;
-	vector< pair<Glib::VariantBase, QString> > values;
-
 	assert(configurable_);
 
 	if (!capabilities.count(Capability::LIST))
 		return;
 
-	Glib::VariantIter iter(configurable_->config_list(key));
-	while ((iter.next_value(gvar)))
-		values.push_back(make_pair(gvar, printer(gvar)));
+	try {
+		Glib::VariantContainerBase gvar = configurable_->config_list(key);
+		Glib::VariantIter iter(gvar);
 
-	properties_.push_back(shared_ptr<Property>(new Enum(name, values,
-		getter, setter)));
+		vector< pair<Glib::VariantBase, QString> > values;
+		while ((iter.next_value(gvar)))
+			values.emplace_back(gvar, printer(gvar));
+
+		properties_.push_back(shared_ptr<Property>(new Enum(name, desc, values,
+			getter, setter)));
+
+	} catch (sigrok::Error& e) {
+		qDebug() << "Error: Listing device key" << name << "failed!";
+		return;
+	}
 }
 
-void Device::bind_int(const QString &name, QString suffix,
-	optional< pair<int64_t, int64_t> > range,
-	Property::Getter getter, Property::Setter setter)
+void Device::bind_int(const QString &name, const QString &desc, QString suffix,
+	optional< pair<int64_t, int64_t> > range, Property::Getter getter,
+	Property::Setter setter, QString special_value_text)
 {
 	assert(configurable_);
 
-	properties_.push_back(shared_ptr<Property>(new Int(name, suffix, range,
-		getter, setter)));
+	properties_.push_back(shared_ptr<Property>(new Int(name, desc, suffix,
+		range, getter, setter, special_value_text)));
 }
 
 QString Device::print_timebase(Glib::VariantBase gvar)
@@ -201,5 +224,12 @@ QString Device::print_probe_factor(Glib::VariantBase gvar)
 	return QString("%1x").arg(factor);
 }
 
+QString Device::print_averages(Glib::VariantBase gvar)
+{
+	uint64_t avg;
+	avg = g_variant_get_uint64(gvar.gobj());
+	return QString("%1").arg(avg);
+}
+
 }  // namespace binding
 }  // namespace pv