X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=e4340fdf8f164d9db5d80bc98f9c4beb683912ed;hb=1ee70746165561e20ad9ef8552c9a6b2bc44d4a0;hp=cfc2dafbfa4b10d32cf5d6ac9ace9f395b0f4121;hpb=116670b15d1facd756cb97525b3fea51d11d28a4;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index cfc2dafb..e4340fdf 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -509,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;
 }
@@ -767,7 +768,7 @@ vector<shared_ptr<Channel>> ChannelGroup::channels()
 	return result;
 }
 
-Trigger::Trigger(shared_ptr<Context> context, string name) : 
+Trigger::Trigger(shared_ptr<Context> context, string name) :
 	_structure(sr_trigger_new(name.c_str())),
 	_context(move(context))
 {
@@ -811,7 +812,7 @@ TriggerStage::TriggerStage(struct sr_trigger_stage *structure) :
 TriggerStage::~TriggerStage()
 {
 }
-	
+
 int TriggerStage::number() const
 {
 	return _structure->stage;
@@ -1211,6 +1212,11 @@ void *Analog::data_pointer()
 	return _structure->data;
 }
 
+void Analog::get_data_as_float(float *dest)
+{
+	check(sr_analog_to_float(_structure, dest));
+}
+
 unsigned int Analog::num_samples() const
 {
 	return _structure->num_samples;
@@ -1226,6 +1232,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);
@@ -1241,6 +1299,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)
 {
@@ -1319,7 +1407,7 @@ void Input::send(void *data, size_t length)
 {
 	auto gstr = g_string_new_len(static_cast<char *>(data), length);
 	auto ret = sr_input_send(_structure, gstr);
-	g_string_free(gstr, false);
+	g_string_free(gstr, true);
 	check(ret);
 }
 
@@ -1328,6 +1416,11 @@ void Input::end()
 	check(sr_input_end(_structure));
 }
 
+void Input::reset()
+{
+	check(sr_input_reset(_structure));
+}
+
 Input::~Input()
 {
 	sr_input_free(_structure);