mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

t/psvr: Fix some truncation warnings.

Browse source
This commit is contained in:
Ryan Pavlik 2021-09-20 10:34:48 -05:00
parent b62fb33e36
commit 05ed361601
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/xrt/drivers/psvr/psvr_device.c
View file

@ -266,13 +266,13 @@ read_sample_and_apply_calibration(struct psvr_device *psvr,
raw_gyro.z * 0.00105f, raw_gyro.z * 0.00105f,
}; };
float ax = 2.0 / (psvr->calibration.accel_pos_x.x - psvr->calibration.accel_neg_x.x); float ax = 2.0f / (psvr->calibration.accel_pos_x.x - psvr->calibration.accel_neg_x.x);
float ay = 2.0 / (psvr->calibration.accel_pos_y.y - psvr->calibration.accel_neg_y.y); float ay = 2.0f / (psvr->calibration.accel_pos_y.y - psvr->calibration.accel_neg_y.y);
float az = 2.0 / (psvr->calibration.accel_pos_z.z - psvr->calibration.accel_neg_z.z); float az = 2.0f / (psvr->calibration.accel_pos_z.z - psvr->calibration.accel_neg_z.z);
float ox = (psvr->calibration.accel_pos_x.x + psvr->calibration.accel_neg_x.x) / 2.0; float ox = (psvr->calibration.accel_pos_x.x + psvr->calibration.accel_neg_x.x) / 2.0f;
float oy = (psvr->calibration.accel_pos_y.y + psvr->calibration.accel_neg_y.y) / 2.0; float oy = (psvr->calibration.accel_pos_y.y + psvr->calibration.accel_neg_y.y) / 2.0f;
float oz = (psvr->calibration.accel_pos_z.z + psvr->calibration.accel_neg_z.z) / 2.0; float oz = (psvr->calibration.accel_pos_z.z + psvr->calibration.accel_neg_z.z) / 2.0f;
accel.x -= ox; accel.x -= ox;
accel.y -= oy; accel.y -= oy;
@ -282,9 +282,9 @@ read_sample_and_apply_calibration(struct psvr_device *psvr,
accel.z *= az; accel.z *= az;
// Go from Gs to m/s2 and flip the Z-axis. // Go from Gs to m/s2 and flip the Z-axis.
accel.x *= +MATH_GRAVITY_M_S2; accel.x *= (float)+MATH_GRAVITY_M_S2;
accel.y *= +MATH_GRAVITY_M_S2; accel.y *= (float)+MATH_GRAVITY_M_S2;
accel.z *= -MATH_GRAVITY_M_S2; accel.z *= (float)-MATH_GRAVITY_M_S2;
// Flip the Z-axis. // Flip the Z-axis.
gyro.x *= +1.0; gyro.x *= +1.0;
@ -461,7 +461,7 @@ handle_calibration_msg(struct psvr_device *psvr, const unsigned char *buffer, si
return; return;
} }
size_t which = buffer[1]; uint16_t which = buffer[1];
size_t dst = data_length * which; size_t dst = data_length * which;
for (size_t src = data_start; src < size; src++, dst++) { for (size_t src = data_start; src < size; src++, dst++) {
psvr->calibration.data[dst] = buffer[src]; psvr->calibration.data[dst] = buffer[src];
@ -984,19 +984,19 @@ psvr_device_create(struct hid_device_info *sensor_hid_info,
{ {
struct u_panotools_values vals = {0}; struct u_panotools_values vals = {0};
vals.distortion_k[0] = 0.75; vals.distortion_k[0] = 0.75f;
vals.distortion_k[1] = -0.01; vals.distortion_k[1] = -0.01f;
vals.distortion_k[2] = 0.75; vals.distortion_k[2] = 0.75f;
vals.distortion_k[3] = 0.0; vals.distortion_k[3] = 0.0f;
vals.distortion_k[4] = 3.8; vals.distortion_k[4] = 3.8f;
vals.aberration_k[0] = 0.999; vals.aberration_k[0] = 0.999f;
vals.aberration_k[1] = 1.008; vals.aberration_k[1] = 1.008f;
vals.aberration_k[2] = 1.018; vals.aberration_k[2] = 1.018f;
vals.scale = 1.2 * (1980 / 2.0f); vals.scale = 1.2f * (1980 / 2.0f);
vals.viewport_size.x = (1980 / 2.0f); vals.viewport_size.x = (1980 / 2.0f);
vals.viewport_size.y = (1080); vals.viewport_size.y = (1080);
vals.lens_center.x = vals.viewport_size.x / 2.0; vals.lens_center.x = vals.viewport_size.x / 2.0f;
vals.lens_center.y = vals.viewport_size.y / 2.0; vals.lens_center.y = vals.viewport_size.y / 2.0f;
psvr->vals = vals; psvr->vals = vals;