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

d/qwerty: Use u_logging.h with QWERTY_LOG env var

Browse source
This commit is contained in:
Mateo de Mayo 2021-03-11 17:13:58 -03:00
parent ef74e24abe
commit 582a287dd4
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/xrt/drivers/qwerty/qwerty_device.c
View file

@ -12,6 +12,7 @@
#include "util/u_device.h"
#include "util/u_distortion_mesh.h"
#include "util/u_var.h"
#include "util/u_logging.h"
#include "math/m_api.h"
#include "math/m_mathinclude.h"
@ -41,6 +42,12 @@
#define QWERTY_AIM 3
#define QWERTY_VIBRATION 0
#define QWERTY_TRACE(qd, ...) U_LOG_XDEV_IFL_T(&qd->base, qd->sys->ll, __VA_ARGS__)
#define QWERTY_DEBUG(qd, ...) U_LOG_XDEV_IFL_D(&qd->base, qd->sys->ll, __VA_ARGS__)
#define QWERTY_INFO(qd, ...) U_LOG_XDEV_IFL_I(&qd->base, qd->sys->ll, __VA_ARGS__)
#define QWERTY_WARN(qd, ...) U_LOG_XDEV_IFL_W(&qd->base, qd->sys->ll, __VA_ARGS__)
#define QWERTY_ERROR(qd, ...) U_LOG_XDEV_IFL_E(&qd->base, qd->sys->ll, __VA_ARGS__)
static void
qwerty_system_remove(struct qwerty_system *qs, struct qwerty_device *qd);
@ -104,7 +111,7 @@ qwerty_get_tracked_pose(struct xrt_device *xd,
struct qwerty_device *qd = qwerty_device(xd);
if (name != XRT_INPUT_GENERIC_HEAD_POSE && name != XRT_INPUT_SIMPLE_GRIP_POSE) {
printf("Unexpected input name = 0x%04X\n", name >> 8); // @todo: use u_logging.h
QWERTY_ERROR(qd, "Unexpected input name = 0x%04X", name >> 8);
return;
}
@ -205,7 +212,7 @@ qwerty_hmd_create(void)
info.views[1].fov = 85.0f * (M_PI / 180.0f);
if (!u_device_setup_split_side_by_side(xd, &info)) {
printf("Failed to setup HMD properties\n"); // @todo: Use u_logging.h
QWERTY_ERROR(qd, "Failed to setup HMD properties");
qwerty_destroy(xd);
assert(false);
return NULL;
@ -274,6 +281,7 @@ qwerty_setup_var_tracking(struct qwerty_system *qs)
struct qwerty_device *qd_right = &qs->rctrl->base;
u_var_add_root(qs, "Qwerty System", true);
u_var_add_log_level(qs, &qs->ll, "log_level");
u_var_add_bool(qs, &qs->process_keys, "process_keys");
u_var_add_ro_text(qs, "", "Focused Device");
@ -315,7 +323,8 @@ qwerty_setup_var_tracking(struct qwerty_system *qs)
struct qwerty_system *
qwerty_system_create(struct qwerty_hmd *qhmd,
struct qwerty_controller *qleft,
struct qwerty_controller *qright)
struct qwerty_controller *qright,
enum u_logging_level log_level)
{
assert(qleft && "Cannot create a qwerty system when Left controller is NULL");
assert(qright && "Cannot create a qwerty system when Right controller is NULL");
@ -324,6 +333,7 @@ qwerty_system_create(struct qwerty_hmd *qhmd,
qs->hmd = qhmd;
qs->lctrl = qleft;
qs->rctrl = qright;
qs->ll = log_level;
qs->process_keys = true;
if (qhmd) {

5
src/xrt/drivers/qwerty/qwerty_device.h
View file

@ -8,6 +8,7 @@
*/
#pragma once
#include "util/u_logging.h"
#include "xrt/xrt_device.h"
#define QWERTY_HMD_STR "Qwerty HMD"
@ -32,6 +33,7 @@ struct qwerty_system
struct qwerty_hmd *hmd; //!< Can be NULL
struct qwerty_controller *lctrl; //!< Cannot be NULL
struct qwerty_controller *rctrl; //!< Cannot be NULL
enum u_logging_level ll;
bool process_keys; //!< If false disable keyboard and mouse input
bool hmd_focused; //!< For gui var tracking only, true if hmd is the focused device
bool lctrl_focused; //!< Same as `hmd_focused` but for the left controller
@ -88,7 +90,8 @@ struct qwerty_controller
struct qwerty_system *
qwerty_system_create(struct qwerty_hmd *qhmd,
struct qwerty_controller *qleft,
struct qwerty_controller *qright);
struct qwerty_controller *qright,
enum u_logging_level log_level);
/*!
* @}

7
src/xrt/drivers/qwerty/qwerty_prober.c
View file

@ -10,8 +10,12 @@
#include "qwerty_device.h"
#include "util/u_misc.h"
#include "util/u_debug.h"
#include "util/u_logging.h"
#include "xrt/xrt_prober.h"
// Using INFO as default to inform events real devices could report physically
DEBUG_GET_ONCE_LOG_OPTION(qwerty_log, "QWERTY_LOG", U_LOGGING_INFO)
// Driver disabled by default for being experimental
DEBUG_GET_ONCE_BOOL_OPTION(qwerty_enable, "QWERTY_ENABLE", false)
@ -51,7 +55,8 @@ qwerty_prober_autoprobe(struct xrt_auto_prober *xap,
struct qwerty_controller *qleft = qwerty_controller_create(true, qhmd);
struct qwerty_controller *qright = qwerty_controller_create(false, qhmd);
qwerty_system_create(qhmd, qleft, qright);
enum u_logging_level log_level = debug_get_log_option_qwerty_log();
qwerty_system_create(qhmd, qleft, qright, log_level);
struct xrt_device *xd_hmd = &qhmd->base.base;
struct xrt_device *xd_left = &qleft->base.base;