Skip to content

Commit f1680fd

Browse files
committed
Corrected sensor axes
1 parent c99a9d4 commit f1680fd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/joystick/hidapi/SDL_hidapi_flydigi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -777,14 +777,14 @@ static void HIDAPI_DriverFlydigi_HandleStatePacketV2(SDL_Joystick *joystick, SDL
777777

778778
const float flGyroScale = ctx->gyroScale;
779779
values[0] = HIDAPI_RemapVal((float)LOAD16(data[17], data[18]), INT16_MIN, INT16_MAX, -flGyroScale, flGyroScale);
780-
values[1] = HIDAPI_RemapVal((float)LOAD16(data[19], data[20]), INT16_MIN, INT16_MAX, -flGyroScale, flGyroScale);
781-
values[2] = HIDAPI_RemapVal((float)LOAD16(data[21], data[22]), INT16_MIN, INT16_MAX, -flGyroScale, flGyroScale);
780+
values[1] = HIDAPI_RemapVal((float)LOAD16(data[21], data[22]), INT16_MIN, INT16_MAX, -flGyroScale, flGyroScale);
781+
values[2] = HIDAPI_RemapVal(-(float)LOAD16(data[19], data[20]), INT16_MIN, INT16_MAX, -flGyroScale, flGyroScale);
782782
SDL_SendJoystickSensor(timestamp, joystick, SDL_SENSOR_GYRO, sensor_timestamp, values, 3);
783783

784784
const float flAccelScale = ctx->accelScale;
785785
values[0] = LOAD16(data[23], data[24]) * flAccelScale; // Acceleration along pitch axis
786-
values[1] = LOAD16(data[25], data[26]) * flAccelScale; // Acceleration along yaw axis
787-
values[2] = -LOAD16(data[27], data[28]) * flAccelScale; // Acceleration along roll axis
786+
values[1] = LOAD16(data[27], data[28]) * flAccelScale; // Acceleration along yaw axis
787+
values[2] = -LOAD16(data[25], data[26]) * flAccelScale; // Acceleration along roll axis
788788
SDL_SendJoystickSensor(timestamp, joystick, SDL_SENSOR_ACCEL, sensor_timestamp, values, 3);
789789
}
790790

0 commit comments

Comments
 (0)