X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=855052cddc7e909a7c77c62783f50154ea702dd1;hb=a00c1b6edc840564eea6bb22d292892970f0071e;hp=084d46511f64c6b2efedea9806220b57f2a27bdc;hpb=6275a6681d2f6fc4200c53a9e576cd0f0e07837f;p=pulseview.git

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 084d4651..855052cd 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -59,20 +59,30 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 
 	for (auto key : keys) {
 
+		string descr_str;
+		try {
+			descr_str = key->description();
+		} catch (Error& e) {
+			descr_str = key->name();
+		}
+		const QString descr = QString::fromStdString(descr_str);
+
 		auto capabilities = configurable->config_capabilities(key);
 
 		if (!capabilities.count(Capability::GET) ||
-			!capabilities.count(Capability::SET))
-			continue;
+			!capabilities.count(Capability::SET)) {
 
-		string name_str;
-		try {
-			name_str = key->description();
-		} catch (Error& e) {
-			name_str = key->name();
-		}
+			// Ignore common read-only keys
+			if ((key->id() == SR_CONF_CONTINUOUS) || (key->id() == SR_CONF_TRIGGER_MATCH) ||
+			    (key->id() == SR_CONF_CONN) || (key->id() == SR_CONF_SERIALCOMM) || (key->id() == SR_CONF_NUM_LOGIC_CHANNELS) ||
+			    (key->id() == SR_CONF_NUM_ANALOG_CHANNELS) || (key->id() == SR_CONF_SESSIONFILE) || (key->id() == SR_CONF_CAPTUREFILE) ||
+			    (key->id() == SR_CONF_CAPTURE_UNITSIZE))
+				continue;
 
-		const QString name = QString::fromStdString(name_str);
+			qDebug() << QString(tr("Note for device developers: Ignoring device configuration capability '%1' " \
+				"as it is missing GET and/or SET")).arg(descr);
+			continue;
+		}
 
 		const Property::Getter get = [&, key]() {
 			return configurable_->config_get(key); };
@@ -88,12 +98,12 @@ 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(descr, "", "%", 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,
+			bind_int(descr, "", "", pair<int64_t, int64_t>(0, 1000000), get, set,
 				tr("No Limit"));
 			break;
 
@@ -105,7 +115,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 		case SR_CONF_CLOCK_EDGE:
 		case SR_CONF_DATA_SOURCE:
 		case SR_CONF_EXTERNAL_CLOCK_SOURCE:
-			bind_enum(name, "", key, capabilities, get, set);
+			bind_enum(descr, "", key, capabilities, get, set);
 			break;
 
 		case SR_CONF_FILTER:
@@ -113,33 +123,34 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 		case SR_CONF_RLE:
 		case SR_CONF_POWER_OFF:
 		case SR_CONF_AVERAGING:
-			bind_bool(name, "", get, set);
+		case SR_CONF_CONTINUOUS:
+			bind_bool(descr, "", get, set);
 			break;
 
 		case SR_CONF_TIMEBASE:
-			bind_enum(name, "", key, capabilities, get, set, print_timebase);
+			bind_enum(descr, "", key, capabilities, get, set, print_timebase);
 			break;
 
 		case SR_CONF_VDIV:
-			bind_enum(name, "", key, capabilities, get, set, print_vdiv);
+			bind_enum(descr, "", key, capabilities, get, set, print_vdiv);
 			break;
 
 		case SR_CONF_VOLTAGE_THRESHOLD:
-			bind_enum(name, "", key, capabilities, get, set, print_voltage_threshold);
+			bind_enum(descr, "", 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(descr, "", key, capabilities, get, set, print_probe_factor);
 			else
-				bind_int(name, "", "", pair<int64_t, int64_t>(1, 500), get, set);
+				bind_int(descr, "", "", 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);
+				bind_enum(descr, "", key, capabilities, get, set, print_averages);
 			else
-				bind_int(name, "", "", pair<int64_t, int64_t>(0, INT32_MAX), get, set);
+				bind_int(descr, "", "", pair<int64_t, int64_t>(0, INT32_MAX), get, set);
 			break;
 
 		default: