Fix 1000 hz on new Windows versions

Author: Devocub

TabletDriverGUI/MainWindow.xaml.cs

@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.1.5.5 Devocub Edition";
+        public string Version = "0.1.5.6 Devocub Edition";
 
         // Console stuff
         private List<string> commandHistory;

TabletDriverService/Main.cpp

@@ -16,6 +16,7 @@
 #pragma comment(lib, "hid.lib")
 #pragma comment(lib, "setupapi.lib")
 #pragma comment(lib, "winusb.lib")
+#pragma comment(lib, "winmm.lib")
 
 
 // Global variables...
@@ -24,6 +25,8 @@ VMulti *vmulti;
 ScreenMapper *mapper;
 thread *tabletThread;
 chrono::high_resolution_clock::time_point timeBegin = chrono::high_resolution_clock::now();
+chrono::high_resolution_clock::time_point lastMovement = chrono::high_resolution_clock::now();
+Vector2D prevPos;
 
 //
 // Init console parameters
@@ -212,7 +215,9 @@ void RunTabletThread() {
 //
 // Tablet filter timer callback
 //
-VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
+
+static VOID CALLBACK FilterTimerCallback(UINT wTimerID, UINT msg, DWORD_PTR dwUser, DWORD dw1, DWORD dw2)
+{
 	Vector2D position, position_prev;
 	double z;
 	TabletFilter *filter;
@@ -225,6 +230,18 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 	// For debug
 	tablet->filterTimed[0]->GetPosition(&position_prev);
 
+	// Detect absence of movement
+	double noMovement = 0.0;
+	if (position.Distance(prevPos) > 0.000001)
+	{
+		lastMovement = timeNow;
+		prevPos = position;
+	}
+	else
+	{
+		noMovement = (timeNow - lastMovement).count() / 1000000.0;
+	}
+
 	// Loop through filters
 	for (int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
 
@@ -234,6 +251,13 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 		// Filter enabled?
 		if (!filter->isEnabled) return;
 
+
+		if (noMovement > 35)
+		{
+			filter->Reset(position);
+			return;
+		}
+
 		// Set filter targets
 		filter->SetTarget(position, z);
 		//filter->z = tablet->state.z;

TabletDriverService/TabletDriverService.vcxproj

@@ -23,7 +23,7 @@
     <ProjectGuid>{3101CEC2-8F39-45FD-943B-79A488AD05EA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TabletDriverService</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

TabletDriverService/TabletFilter.cpp

@@ -13,14 +13,23 @@ TabletFilter::TabletFilter() {
 // Start Timer
 //
 bool TabletFilter::StartTimer() {
-	return CreateTimerQueueTimer(
-		&timer,
-		NULL, callback,
-		NULL,
-		0,
-		(int)timerInterval,
-		WT_EXECUTEDEFAULT
-	);
+	if (timer == NULL) {
+		MMRESULT result = timeSetEvent(
+			(UINT)timerInterval,//UINT           uDelay,
+			0,//UINT           uResolution,
+			callback, //LPTIMECALLBACK lpTimeProc,
+			NULL, //DWORD_PTR      dwUser,
+			TIME_PERIODIC | TIME_KILL_SYNCHRONOUS //UINT           fuEvent
+		);
+		if (result == NULL) {
+			return false;
+		}
+		else {
+			timer = (HANDLE)1; // for code compatibility purposes
+			uTimerID = result;
+		}
+	}
+	return true;
 }
 
 
@@ -29,9 +38,13 @@ bool TabletFilter::StartTimer() {
 //
 bool TabletFilter::StopTimer() {
 	if (timer == NULL) return false;
-	bool result = DeleteTimerQueueTimer(NULL, timer, NULL);
-	if (result) {
+
+	MMRESULT result = timeKillEvent(uTimerID);
+	// Returns TIMERR_NOERROR if successful or MMSYSERR_INVALPARAM if the specified timer event does not exist.
+	if (result == TIMERR_NOERROR)
+	{
 		timer = NULL;
+		return true;
 	}
-	return result;
+	return false;
 }

TabletDriverService/TabletFilter.h

@@ -2,12 +2,14 @@
 class TabletFilter {
 public:
 	virtual void SetTarget(Vector2D vector, double h) = 0;
+	virtual void Reset(Vector2D vector) = 0;
 	virtual void SetPosition(Vector2D vector, double h) = 0;
 	virtual bool GetPosition(Vector2D *vector) = 0;
 	virtual void Update() = 0;
 
 	HANDLE timer;
-	WAITORTIMERCALLBACK callback;
+	UINT uTimerID;
+	LPTIMECALLBACK callback;
 	double timerInterval;
 
 	bool isEnabled;

TabletDriverService/TabletFilterNoiseReduction.cpp

@@ -20,6 +20,12 @@ TabletFilterNoiseReduction::~TabletFilterNoiseReduction() {
 // TabletFilter methods
 //
 
+// Reset
+void TabletFilterNoiseReduction::Reset(Vector2D position) {
+	lastTarget.Set(position);
+	buffer.Reset();
+}
+
 // Set target position
 void TabletFilterNoiseReduction::SetTarget(Vector2D targetVector, double h) {
 	lastTarget.Set(targetVector);

TabletDriverService/TabletFilterNoiseReduction.h

@@ -12,6 +12,7 @@ class TabletFilterNoiseReduction : public TabletFilter {
 	int iterations;
 	double distanceThreshold;
 
+	void Reset(Vector2D position);
 	void SetTarget(Vector2D targetVector, double h);
 	void SetPosition(Vector2D vector, double h);
 	bool GetPosition(Vector2D *outputVector);

TabletDriverService/TabletFilterPeak.cpp

@@ -27,6 +27,10 @@ TabletFilterPeak::~TabletFilterPeak() {
 //
 // TabletFilter methods
 //
+// reset
+void TabletFilterPeak::Reset(Vector2D targetVector) {
+	buffer.Reset();
+}
 // Set target position
 void TabletFilterPeak::SetTarget(Vector2D targetVector, double h) {
 	buffer.Add(targetVector);

TabletDriverService/TabletFilterPeak.h

@@ -10,6 +10,7 @@ class TabletFilterPeak : public TabletFilter {
 	Vector2D position;
 	double distanceThreshold;
 
+	void Reset(Vector2D targetVector);
 	void SetTarget(Vector2D targetVector, double h);
 	void SetPosition(Vector2D vector, double h);
 	bool GetPosition(Vector2D *outputVector);

TabletDriverService/TabletFilterSmoothing.cpp

@@ -37,6 +37,14 @@ TabletFilterSmoothing::~TabletFilterSmoothing() {
 // TabletFilter methods
 //
 
+// Reset
+void TabletFilterSmoothing::Reset(Vector2D position) {
+	target.Set(position);
+	prev_target.Set(position);
+	calculated_target.Set(position);
+	position.Set(position);
+}
+
 // Set target position
 void TabletFilterSmoothing::SetTarget(Vector2D vector, double h) {
 	this->target.x = vector.x;