remove PEN_EPOCH mistake and get usertime from the pen

1 files changed, 12 insertions, 6 deletions

diff --git a/smartpen.h b/smartpen.h
index c75c494..2ff64e3 100644
--- a/smartpen.h
+++ b/smartpen.h
@@ -27,7 +27,7 @@
 #define SMARTPEN_DPI_X (677.3333)
 #define SMARTPEN_DPI_Y (677.3333)
 
-// TODO: These values are mostly random.
+// TODO: These values are obtained by observation and may be wrong
 #define SMARTPEN_BLEED_X 333.3
 #define SMARTPEN_BLEED_Y 333.3
 
@@ -40,19 +40,26 @@ public:
 	~Smartpen();
 
 	typedef QPair<unsigned int, unsigned int> Address;
-	typedef qint64 PenTime;
 	typedef quint64 PenId;
+	typedef quint64 PenTime;
 
 	bool isConnected() const;
 
-	enum Parameters : quint16 {
+	enum Parameter : quint16 {
+		/// The offset between the PenTime (see below) and the user's configured time. This value is static.
+		PenUserTime = 0x8003,
+		/// The current time as reported by the pen's rtc
+		PenRtcTime = 0x8004,
+		PenType = 0x8006,
 		PenName = 0x8011
 	};
 
 	QByteArray getObject(const QString& name);
-	QString getParameter(Parameters parameter);
+	QByteArray getParameter(Parameter parameter);
 
 	QString getPenName();
+	PenTime getPenTime(Parameter parameter);
+
 	QVariantMap getPenInfo();
 
 	struct ChangeReport {
@@ -67,8 +74,7 @@ public:
 	QByteArray getLspData(const QString &name, PenTime from = 0);
 	QByteArray getPaperReplay(PenTime from = 0);
 
-	static PenTime toPenTime(const QDateTime &dt);
-	static QDateTime fromPenTime(PenTime t);
+	static QDateTime fromPenTime(PenTime userTime, PenTime penTime);
 
 	static QString toPenSerial(PenId id);
 	static PenId toPenId(const QString &serial);