remove the /100 to the haptic scale so 1 is normal

mm0zct · Jun 23, 2023 · 4506dc4 · 4506dc4
1 parent a2c5784
commit 4506dc4
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 4 deletions.
diff --git a/ReleasePackage/OculusTouchLink.7z b/ReleasePackage/OculusTouchLink.7z
diff --git a/ReleasePackage/OculusTouchLink/config.dat b/ReleasePackage/OculusTouchLink/config.dat
@@ -0,0 +1,24 @@
+31
+0
+10
+oculus_link
+Oculus_link
+0
+0
+0
+64
+100
+0
+1
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
diff --git a/ReleasePackage/OculusTouchLink/ovr_test.exe b/ReleasePackage/OculusTouchLink/ovr_test.exe
diff --git a/ovr_test/.vs/ovr_test/v16/.suo b/ovr_test/.vs/ovr_test/v16/.suo
diff --git a/ovr_test/.vs/ovr_test/v16/Browse.VC.db b/ovr_test/.vs/ovr_test/v16/Browse.VC.db
diff --git a/ovr_test/ovr_test.cpp b/ovr_test/ovr_test.cpp
@@ -48,7 +48,7 @@ void main_loop(ovrSession mSession, HANDLE comm_mutex, shared_buffer* comm_buffe
         if ((ovr_pose.ThePose.Orientation.x != 0) && (ovr_pose.ThePose.Orientation.y != 0) && (ovr_pose.ThePose.Orientation.z != 0)){
             comm_buffer->object_poses[i] = ovr_pose;
         }
-        if ((frame_count & 0x7FF) == 0) {
+        if (0){//(frame_count & 0x7FF) == 0) {
             std::cout.precision(4);
 
             std::cout << "Object" << i << std::dec << " x " <<
@@ -125,7 +125,7 @@ void main_loop(ovrSession mSession, HANDLE comm_mutex, shared_buffer* comm_buffe
 #endif
         }
         ReleaseMutex(comm_mutex);
-        if ((frame_count & 0x7FF) == 0) {
+        if (0){//(frame_count & 0x7FF) == 0) {
             std::cout.precision(4);
 
             std::cout << (i == 0 ? "lhand" : "rhand") << " 0x" << std::fixed <<
@@ -533,7 +533,7 @@ void add_vibration(bool isRightHand, float frequency, float amplitude, float dur
 
     if ((amplitude <= 0) || (frequency <= 0) /*|| (duration <= 0)*/) return;
     if (frequency > 1.0)frequency = 1.0;
-    float amp = amplitude/100.0f;
+    float amp = amplitude;
     float freq = frequency * 320.0f;
     uint32_t requested_duration = duration * 160; // 320 Hz processing rate? seems to be 160
     //if (requested_duration < 2) requested_duration = 2;

diff --git a/ovr_test/x64/Release/config.dat b/ovr_test/x64/Release/config.dat
@@ -7,7 +7,7 @@ Oculus_link
 0
 0
 64
-1
+100
 0
 1
 0

diff --git a/ovr_test/x64/Release/ovr_test.exe b/ovr_test/x64/Release/ovr_test.exe
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,24 @@
		31
		0
		10
		oculus_link
		Oculus_link
		0
		0
		0
		64
		100
		0
		1
		0
		0
		0
		0
		0
		1
		0
		0
		0
		0
		0
		0