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

d/vive/device: Replace old debug macros with new ones.

Browse source
This commit is contained in:
Lubosz Sarnecki 2020-07-09 12:37:55 +02:00
parent 7be5efbe82
commit 7121c260ae
3 changed files with 26 additions and 52 deletions

8
src/xrt/drivers/vive/vive_config.c
View file

@ -215,11 +215,11 @@ _print_vec3(const char *title, struct xrt_vec3 *vec)
bool
vive_config_parse(struct vive_device *d, char *json_string)
{
VIVE_DEBUG(d, "JSON config:\n%s\n", json_string);
VIVE_DEBUG(d, "JSON config:\n%s", json_string);
cJSON *json = cJSON_Parse(json_string);
if (!cJSON_IsObject(json)) {
VIVE_ERROR("Could not parse JSON data.");
U_LOG_E("Could not parse JSON data.");
return false;
}
@ -262,7 +262,7 @@ vive_config_parse(struct vive_device *d, char *json_string)
d->display.imuref = imu_to_head;
} break;
default: VIVE_ERROR("Unknown Vive variant.\n"); return false;
default: U_LOG_E("Unknown Vive variant."); return false;
}
JSON_STRING(json, "model_number", d->firmware.model_number);
@ -338,7 +338,7 @@ bool
vive_config_parse_controller(struct vive_controller_device *d,
char *json_string)
{
VIVE_CONTROLLER_DEBUG(d, "JSON config:\n%s\n", json_string);
VIVE_CONTROLLER_DEBUG(d, "JSON config:\n%s", json_string);
cJSON *json = cJSON_Parse(json_string);
if (!cJSON_IsObject(json)) {

38
src/xrt/drivers/vive/vive_device.c
View file

@ -80,7 +80,7 @@ static void
vive_device_update_inputs(struct xrt_device *xdev)
{
struct vive_device *d = vive_device(xdev);
VIVE_SPEW(d, "ENTER!");
VIVE_TRACE(d, "ENTER!");
}
static void
@ -93,7 +93,7 @@ vive_device_get_tracked_pose(struct xrt_device *xdev,
struct vive_device *d = vive_device(xdev);
if (name != XRT_INPUT_GENERIC_HEAD_POSE) {
VIVE_ERROR("unknown input name");
U_LOG_E("unknown input name");
return;
}
@ -172,7 +172,7 @@ vive_mainboard_get_device_info(struct vive_device *d)
type = __le16_to_cpu(report.type);
if (type != VIVE_HEADSET_MAINBOARD_DEVICE_INFO_REPORT_TYPE ||
report.len != 60) {
VIVE_ERROR("Unexpected device info!");
U_LOG_E("Unexpected device info!");
return -1;
}
@ -224,7 +224,7 @@ vive_mainboard_decode_message(struct vive_device *d,
if (__le16_to_cpu(report->unknown) != 0x2cd0 || report->len != 60 ||
report->reserved1 || report->reserved2[0]) {
VIVE_ERROR("Unexpected message content.");
U_LOG_E("Unexpected message content.");
}
ipd = __le16_to_cpu(report->ipd);
@ -234,18 +234,18 @@ vive_mainboard_decode_message(struct vive_device *d,
if (d->board.ipd != ipd) {
d->board.ipd = ipd;
d->board.lens_separation = lens_separation;
VIVE_SPEW(d, "IPD %4.1f mm. Lens separation %4.1f mm.",
VIVE_TRACE(d, "IPD %4.1f mm. Lens separation %4.1f mm.",
1e-2 * ipd, 1e-2 * lens_separation);
}
if (d->board.proximity != proximity) {
VIVE_SPEW(d, "Proximity %d", proximity);
VIVE_TRACE(d, "Proximity %d", proximity);
d->board.proximity = proximity;
}
if (d->board.button != report->button) {
d->board.button = report->button;
VIVE_SPEW(d, "Button %d.", report->button);
VIVE_TRACE(d, "Button %d.", report->button);
d->rot_filtered = (struct xrt_quat){0, 0, 0, 1};
}
}
@ -346,10 +346,10 @@ update_imu(struct vive_device *d, struct vive_imu_report *report)
scale * d->imu.gyro_scale.z * gyro[2] - d->imu.gyro_bias.z,
};
VIVE_SPEW(d, "ACC %f %f %f", acceleration.x, acceleration.y,
VIVE_TRACE(d, "ACC %f %f %f", acceleration.x, acceleration.y,
acceleration.z);
VIVE_SPEW(d, "GYRO %f %f %f", angular_velocity.x,
VIVE_TRACE(d, "GYRO %f %f %f", angular_velocity.x,
angular_velocity.y, angular_velocity.z);
switch (d->variant) {
@ -387,7 +387,7 @@ update_imu(struct vive_device *d, struct vive_imu_report *report)
angular_velocity_fixed.z = -angular_velocity.z;
angular_velocity = angular_velocity_fixed;
} break;
default: VIVE_ERROR("Unhandled Vive variant\n"); return;
default: U_LOG_E("Unhandled Vive variant"); return;
}
d->imu.time_ns += dt_ns;
@ -420,21 +420,21 @@ vive_mainboard_read_one_msg(struct vive_device *d)
return true;
}
if (ret < 0) {
VIVE_ERROR("Failed to read device '%i'!", ret);
U_LOG_E("Failed to read device '%i'!", ret);
return false;
}
switch (buffer[0]) {
case VIVE_MAINBOARD_STATUS_REPORT_ID:
if (ret != sizeof(struct vive_mainboard_status_report)) {
VIVE_ERROR("Mainboard status report has invalid size.");
U_LOG_E("Mainboard status report has invalid size.");
return false;
}
vive_mainboard_decode_message(
d, (struct vive_mainboard_status_report *)buffer);
break;
default:
VIVE_ERROR("Unknown mainboard message type %d", buffer[0]);
U_LOG_E("Unknown mainboard message type %d", buffer[0]);
break;
}
@ -479,19 +479,19 @@ vive_sensors_read_one_msg(struct vive_device *d)
return true;
}
if (ret < 0) {
VIVE_ERROR("Failed to read device '%i'!", ret);
U_LOG_E("Failed to read device '%i'!", ret);
return false;
}
switch (buffer[0]) {
case VIVE_IMU_REPORT_ID:
if (ret != 52) {
VIVE_ERROR("Wrong IMU report size: %d", ret);
U_LOG_E("Wrong IMU report size: %d", ret);
return false;
}
update_imu(d, (struct vive_imu_report *)buffer);
break;
default: VIVE_ERROR("Unknown sensor message type %d", buffer[0]); break;
default: U_LOG_E("Unknown sensor message type %d", buffer[0]); break;
}
return true;
@ -671,7 +671,7 @@ vive_device_create(struct os_hid_device *mainboard_dev,
fov, h_meters,
(double)d->base.hmd->views[eye].lens_center.y_meters, 0,
&d->base.hmd->views[eye].fov)) {
VIVE_ERROR(
U_LOG_E(
"Failed to compute the partial fields of view.");
free(d);
return NULL;
@ -699,7 +699,7 @@ vive_device_create(struct os_hid_device *mainboard_dev,
ret = os_thread_helper_start(&d->mainboard_thread,
vive_mainboard_run_thread, d);
if (ret != 0) {
VIVE_ERROR("Failed to start mainboard thread!");
U_LOG_E("Failed to start mainboard thread!");
vive_device_destroy((struct xrt_device *)d);
return NULL;
}
@ -708,7 +708,7 @@ vive_device_create(struct os_hid_device *mainboard_dev,
ret = os_thread_helper_start(&d->sensors_thread,
vive_sensors_run_thread, d);
if (ret != 0) {
VIVE_ERROR("Failed to start sensors thread!");
U_LOG_E("Failed to start sensors thread!");
vive_device_destroy((struct xrt_device *)d);
return NULL;
}

32
src/xrt/drivers/vive/vive_device.h
View file

@ -147,36 +147,10 @@ vive_device_create(struct os_hid_device *mainboard_dev,
*
*/
#define VIVE_SPEW(p, ...) \
do { \
if (p->ll <= U_LOGGING_TRACE) { \
fprintf(stderr, "%s - ", __func__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
} \
} while (false)
#define VIVE_DEBUG(p, ...) \
do { \
if (p->ll <= U_LOGGING_DEBUG) { \
fprintf(stderr, "%s - ", __func__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
} \
} while (false)
#define VIVE_ERROR(...) \
do { \
fprintf(stderr, "%s - ", __func__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
} while (false)
// clang-format off
//#define VIVE_TRACE(p, ...) U_LOG_XDEV_IFL_T(&p->base, p->log_level, __VA_ARGS__)
//#define VIVE_DEBUG(p, ...) U_LOG_XDEV_IFL_D(&p->base, p->log_level, __VA_ARGS__)
//#define VIVE_INFO (p, ...) U_LOG_XDEV_IFL_I(&p->base, p->log_level, __VA_ARGS__)
//#define VIVE_WARN (p, ...) U_LOG_XDEV_IFL_W(&p->base, p->log_level, __VA_ARGS__)
//#define VIVE_ERROR(p, ...) U_LOG_XDEV_IFL_E(&p->base, p->log_level, __VA_ARGS__)
#define VIVE_TRACE(d, ...) U_LOG_XDEV_IFL_T(&d->base, d->ll, __VA_ARGS__)
#define VIVE_DEBUG(d, ...) U_LOG_XDEV_IFL_D(&d->base, d->ll, __VA_ARGS__)
#define VIVE_ERROR(d, ...) U_LOG_XDEV_IFL_E(&d->base, d->ll, __VA_ARGS__)
// clang-format on
#ifdef __cplusplus