X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=5c0ae3d0a0fc7ccbdc3756f49aaa511cdfa6d45c;hb=0cee3a3ea5d9808c000def569887e5f18b82df71;hp=4b4de2d30e1a9039a9b16777e488d32236fca449;hpb=32ba0d80054df01767ec323c621ab1c6bc5f310c;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 4b4de2d3..5c0ae3d0 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -317,15 +317,39 @@ shared_ptr<Packet> Context::create_analog_packet(
 {
 	auto analog = g_new0(struct sr_datafeed_analog, 1);
 	auto meaning = g_new0(struct sr_analog_meaning, 1);
+	auto encoding = g_new0(struct sr_analog_encoding, 1);
+	auto spec = g_new0(struct sr_analog_spec, 1);
 
 	analog->meaning = meaning;
 
 	for (const auto &channel : channels)
 		meaning->channels = g_slist_append(meaning->channels, channel->_structure);
-	analog->num_samples = num_samples;
 	meaning->mq = static_cast<sr_mq>(mq->id());
 	meaning->unit = static_cast<sr_unit>(unit->id());
 	meaning->mqflags = static_cast<sr_mqflag>(QuantityFlag::mask_from_flags(move(mqflags)));
+
+	analog->encoding = encoding;
+
+	encoding->unitsize = sizeof(float);
+	encoding->is_signed = TRUE;
+	encoding->is_float = TRUE;
+#ifdef WORDS_BIGENDIAN
+	encoding->is_bigendian = TRUE;
+#else
+	encoding->is_bigendian = FALSE;
+#endif
+	encoding->digits = 0;
+	encoding->is_digits_decimal = FALSE;
+	encoding->scale.p = 1;
+	encoding->scale.q = 1;
+	encoding->offset.p = 0;
+	encoding->offset.q = 1;
+
+	analog->spec = spec;
+
+	spec->spec_digits = 0;
+
+	analog->num_samples = num_samples;
 	analog->data = data_pointer;
 	auto packet = g_new(struct sr_datafeed_packet, 1);
 	packet->type = SR_DF_ANALOG;
@@ -410,9 +434,11 @@ set<const ConfigKey *> Driver::scan_options() const
 {
 	GArray *opts = sr_driver_scan_options_list(_structure);
 	set<const ConfigKey *> result;
-	for (guint i = 0; i < opts->len; i++)
-		result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
-	g_array_free(opts, TRUE);
+	if (opts) {
+		for (guint i = 0; i < opts->len; i++)
+			result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
+		g_array_free(opts, TRUE);
+	}
 	return result;
 }
 
@@ -483,10 +509,11 @@ set<const ConfigKey *> Configurable::config_keys() const
 
 	opts = sr_dev_options(config_driver, config_sdi, config_channel_group);
 
-	for (guint i = 0; i < opts->len; i++)
-		result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
-
-	g_array_free(opts, TRUE);
+	if (opts) {
+		for (guint i = 0; i < opts->len; i++)
+			result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
+		g_array_free(opts, TRUE);
+	}
 
 	return result;
 }
@@ -1200,6 +1227,58 @@ vector<shared_ptr<Channel>> Analog::channels()
 	return result;
 }
 
+unsigned int Analog::unitsize() const
+{
+	return _structure->encoding->unitsize;
+}
+
+bool Analog::is_signed() const
+{
+	return _structure->encoding->is_signed;
+}
+
+bool Analog::is_float() const
+{
+	return _structure->encoding->is_float;
+}
+
+bool Analog::is_bigendian() const
+{
+	return _structure->encoding->is_bigendian;
+}
+
+int Analog::digits() const
+{
+	return _structure->encoding->digits;
+}
+
+bool Analog::is_digits_decimal() const
+{
+	return _structure->encoding->is_digits_decimal;
+}
+
+shared_ptr<Rational> Analog::scale()
+{
+	unique_ptr<Rational> scale;
+	scale.reset(new Rational(&(_structure->encoding->scale)));
+
+	if (scale)
+		return scale->share_owned_by(shared_from_this());
+	else
+		throw Error(SR_ERR_NA);
+}
+
+shared_ptr<Rational> Analog::offset()
+{
+	unique_ptr<Rational> offset;
+	offset.reset(new Rational(&(_structure->encoding->offset)));
+
+	if (offset)
+		return offset->share_owned_by(shared_from_this());
+	else
+		throw Error(SR_ERR_NA);
+}
+
 const Quantity *Analog::mq() const
 {
 	return Quantity::get(_structure->meaning->mq);
@@ -1215,6 +1294,36 @@ vector<const QuantityFlag *> Analog::mq_flags() const
 	return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
 }
 
+Rational::Rational(const struct sr_rational *structure) :
+	_structure(structure)
+{
+}
+
+Rational::~Rational()
+{
+}
+
+shared_ptr<Rational> Rational::share_owned_by(shared_ptr<Analog> _parent)
+{
+	return static_pointer_cast<Rational>(
+		ParentOwned::share_owned_by(_parent));
+}
+
+int64_t Rational::numerator() const
+{
+	return _structure->p;
+}
+
+uint64_t Rational::denominator() const
+{
+	return _structure->q;
+}
+
+float Rational::value() const
+{
+	return (float)(_structure->p) / (float)(_structure->q);
+}
+
 InputFormat::InputFormat(const struct sr_input_module *structure) :
 	_structure(structure)
 {
@@ -1302,6 +1411,11 @@ void Input::end()
 	check(sr_input_end(_structure));
 }
 
+void Input::reset()
+{
+	check(sr_input_reset(_structure));
+}
+
 Input::~Input()
 {
 	sr_input_free(_structure);