Now works with proper gyro input

Gericom · Dec 28, 2019 · ee7f6a0 · ee7f6a0
1 parent c7c78d0
commit ee7f6a0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/arm7/source/main.cpp b/arm7/source/main.cpp
@@ -31,13 +31,13 @@ extern "C" void rtcomIrq()
 		{
 			//sSampleGyro = true;
 			s16 gyro0 = rtcom_getData();
-			rtcom_requestNext(4);
+			rtcom_requestNext(8);
 			vram_cd->gyroZ = gyro0 | (rtcom_getData() << 8);
 			rtcom_requestKill();
 			if(sGyroEnabled)
 			{
 				sRtcomState = RTCOM_STATE_EXEC_UCODE3_ACK;
-				rtcom_requestAsync(RTCOM_REQ_EXECUTE_UCODE, 3);
+				rtcom_requestAsync(RTCOM_REQ_EXECUTE_UCODE, 7);
 			}
 			else
 			{
@@ -325,7 +325,7 @@ int main()
 					rtcom_beginComm();
 					REG_IE |= IRQ_NETWORK;
 					sRtcomState = RTCOM_STATE_EXEC_UCODE3_ACK;
-					rtcom_requestAsync(RTCOM_REQ_EXECUTE_UCODE, 3);
+					rtcom_requestAsync(RTCOM_REQ_EXECUTE_UCODE, 7);
 				}
 				break;
 			case 0xAA550102: //disable gyro sampling

diff --git a/arm9/data/a11ucode.uc11 b/arm9/data/a11ucode.uc11
diff --git a/arm9/source/emu/romGpioGyro.vram.cpp b/arm9/source/emu/romGpioGyro.vram.cpp
@@ -23,7 +23,7 @@ void rio_gyroUpdate()
     if(gRioGpioData & 1)
     {
         vram_cd_t* vramcd_uncached = (vram_cd_t*)(((u32)vram_cd) + UNCACHED_OFFSET);
-        sGyroSample = (vramcd_uncached->gyroZ >> 5) + 0x6C0;
+        sGyroSample = ((vramcd_uncached->gyroZ * 79) >> 12) + 0x6C0;//(vramcd_uncached->gyroZ >> 6) + 0x6C0;
     }
 
     if(sGyroEdge && !(gRioGpioData & 2))