X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Finclude%2Flibsigrok%2Flibsigrok.hpp;h=1c99670360c5657a82b62f3f7c4866ecfbf54ce8;hb=57621c6d60b1eb31d0a3071fc362547c88c5d395;hp=2deb6175b7ae526868ca7765868e128cd6e6fb2d;hpb=4c7c4194cbd1d172a8ea37206d6aff9a09c1fb91;p=libsigrok.git

diff --git a/bindings/cxx/include/libsigrok/libsigrok.hpp b/bindings/cxx/include/libsigrok/libsigrok.hpp
index 2deb6175..1c996703 100644
--- a/bindings/cxx/include/libsigrok/libsigrok.hpp
+++ b/bindings/cxx/include/libsigrok/libsigrok.hpp
@@ -114,6 +114,7 @@ class SR_API InputDevice;
 class SR_API Output;
 class SR_API DataType;
 class SR_API Option;
+class SR_API UserDevice;
 
 /** Exception thrown when an error code is returned by any libsigrok call. */
 class SR_API Error: public exception
@@ -149,6 +150,12 @@ protected:
 	weak_ptr<Class> _weak_this;
 
 public:
+	/* Get parent object that owns this object. */
+	shared_ptr<Parent> parent()
+	{
+		return _parent;
+	}
+
 	/* Note, this implementation will create a new smart_ptr if none exists. */
 	shared_ptr<Class> shared_from_this()
 	{
@@ -257,6 +264,22 @@ public:
 	void set_log_callback_default();
 	/** Create a new session. */
 	shared_ptr<Session> create_session();
+	/** Create a new user device. */
+	shared_ptr<UserDevice> create_user_device(
+		string vendor, string model, string version);
+	/** Create a header packet. */
+	shared_ptr<Packet> create_header_packet(Glib::TimeVal start_time);
+	/** Create a meta packet. */
+	shared_ptr<Packet> create_meta_packet(
+		map<const ConfigKey *, Glib::VariantBase> config);
+	/** Create a logic packet. */
+	shared_ptr<Packet> create_logic_packet(
+		void *data_pointer, size_t data_length, unsigned int unit_size);
+	/** Create an analog packet. */
+	shared_ptr<Packet> create_analog_packet(
+		vector<shared_ptr<Channel> > channels,
+		float *data_pointer, unsigned int num_samples, const Quantity *mq,
+		const Unit *unit, vector<const QuantityFlag *> mqflags);
 	/** Load a saved session.
 	 * @param filename File name string. */
 	shared_ptr<Session> load_session(string filename);
@@ -346,14 +369,16 @@ protected:
 class SR_API Device : public Configurable
 {
 public:
-	/** Description identifying this device. */
-	string description();
 	/** Vendor name for this device. */
 	string vendor();
 	/** Model name for this device. */
 	string model();
 	/** Version string for this device. */
 	string version();
+	/** Serial number for this device. */
+	string serial_number();
+	/** Connection ID for this device. */
+	string connection_id();
 	/** List of the channels available on this device. */
 	vector<shared_ptr<Channel> > channels();
 	/** Channel groups available on this device, indexed by name. */
@@ -408,6 +433,28 @@ protected:
 	friend class ChannelGroup;
 };
 
+/** A virtual device, created by the user */
+class SR_API UserDevice :
+	public UserOwned<UserDevice, struct sr_dev_inst>,
+	public Device
+{
+public:
+	/** Add a new channel to this device. */
+	shared_ptr<Channel> add_channel(unsigned int index, const ChannelType *type, string name);
+protected:
+	UserDevice(string vendor, string model, string version);
+	~UserDevice();
+	shared_ptr<Device> get_shared_from_this();
+	/** Deleter needed to allow shared_ptr use with protected destructor. */
+	class Deleter
+	{
+	public:
+		void operator()(UserDevice *device) { delete device; }
+	};
+	friend class Context;
+	friend class Deleter;
+};
+
 /** A channel on a device */
 class SR_API Channel :
 	public ParentOwned<Channel, Device, struct sr_channel>
@@ -432,9 +479,11 @@ protected:
 	~Channel();
 	const ChannelType * const _type;
 	friend class Device;
+	friend class UserDevice;
 	friend class ChannelGroup;
 	friend class Session;
 	friend class TriggerStage;
+	friend class Context;
 };
 
 /** A group of channels on a device, which share some configuration */
@@ -660,14 +709,19 @@ public:
 	/** Set trigger setting.
 	 * @param trigger Trigger object to use. */
 	void set_trigger(shared_ptr<Trigger> trigger);
+	/** Get filename this session was loaded from. */
+	string filename();
 protected:
 	Session(shared_ptr<Context> context);
 	Session(shared_ptr<Context> context, string filename);
 	~Session();
+	shared_ptr<Device> get_device(const struct sr_dev_inst *sdi);
 	const shared_ptr<Context> _context;
-	map<const struct sr_dev_inst *, shared_ptr<Device> > _devices;
+	map<const struct sr_dev_inst *, SessionDevice *> _owned_devices;
+	map<const struct sr_dev_inst *, shared_ptr<Device> > _other_devices;
 	vector<DatafeedCallbackData *> _datafeed_callbacks;
 	map<shared_ptr<EventSource>, SourceCallbackData *> _source_callbacks;
+	string _filename;
 	bool _saving;
 	bool _save_initialized;
 	string _save_filename;
@@ -676,6 +730,7 @@ protected:
 	friend class Deleter;
 	friend class Context;
 	friend class DatafeedCallbackData;
+	friend class SessionDevice;
 };
 
 /** A packet on the session datafeed */
@@ -700,6 +755,7 @@ protected:
 	friend class Meta;
 	friend class Logic;
 	friend class Analog;
+	friend class Context;
 };
 
 /** Abstract base class for datafeed packet payloads */
@@ -921,17 +977,44 @@ protected:
 };
 
 /** Base class for objects which wrap an enumeration value from libsigrok */
-template <typename T> class SR_API EnumValue
+template <class Class, typename Enum> class SR_API EnumValue
 {
 public:
-	/** The enum constant associated with this value. */
-	T id() const { return _id; }
+	/** The integer constant associated with this value. */
+	int id() const
+	{
+		return static_cast<int>(_id);
+	}
 	/** The name associated with this value. */
-	string name() const { return _name; }
+	string name() const
+	{
+		return _name;
+	}
+	/** Get value associated with a given integer constant. */
+	static const Class *get(int id)
+	{
+		auto key = static_cast<Enum>(id);
+		if (_values.find(key) == _values.end())
+			throw Error(SR_ERR_ARG);
+		return _values.at(key);
+	}
+	/** Get possible values. */
+	static std::vector<const Class *> values()
+	{
+		std::vector<const Class *> result;
+		for (auto entry : _values)
+			result.push_back(entry.second);
+		return result;
+	}
 protected:
-	EnumValue(T id, const char name[]) : _id(id), _name(name) {}
-	~EnumValue() {}
-	const T _id;
+	EnumValue(Enum id, const char name[]) : _id(id), _name(name)
+	{
+	}
+	~EnumValue()
+	{
+	}
+	static const std::map<const Enum, const Class * const> _values;
+	const Enum _id;
 	const string _name;
 };