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

d/survive: Allow users to set wait time through config_v0.json

Browse source 
Necessary for Moses - for some reason, with no controllers, his headset takes forever to probe
This commit is contained in:
Moses Turner 2021-09-01 20:18:28 -05:00 committed by Moses Turner
parent a1b683385f
commit efbc4cd9e5
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/xrt/drivers/survive/survive_driver.c
View file

@ -24,6 +24,7 @@
#include "util/u_time.h" #include "util/u_time.h"
#include "util/u_device.h" #include "util/u_device.h"
#include "util/u_distortion_mesh.h" #include "util/u_distortion_mesh.h"
#include "util/u_config_json.h"
#include "os/os_threading.h" #include "os/os_threading.h"
@ -46,7 +47,7 @@
// reading usb config takes libsurvive about 50ms per device // reading usb config takes libsurvive about 50ms per device
// to be safe, we wait 500 ms after the last device has been initialized // to be safe, we wait 500 ms after the last device has been initialized
#define WAIT_TIMEOUT .75f #define DEFAULT_WAIT_TIMEOUT .75f
// index in sys->controllers[] array // index in sys->controllers[] array
#define SURVIVE_LEFT_CONTROLLER_INDEX 0 #define SURVIVE_LEFT_CONTROLLER_INDEX 0
@ -160,6 +161,8 @@ struct survive_system
struct survive_device *controllers[MAX_TRACKED_DEVICE_COUNT]; struct survive_device *controllers[MAX_TRACKED_DEVICE_COUNT];
enum u_logging_level ll; enum u_logging_level ll;
float wait_timeout;
struct os_thread_helper event_thread; struct os_thread_helper event_thread;
struct os_mutex lock; struct os_mutex lock;
}; };
@ -1197,7 +1200,7 @@ add_connected_devices(struct survive_system *ss)
} }
} }
if (time_ns_to_s(os_monotonic_get_ns() - start) > WAIT_TIMEOUT) { if (time_ns_to_s(os_monotonic_get_ns() - start) > ss->wait_timeout) {
break; break;
} }
os_nanosleep(1000); os_nanosleep(1000);
@ -1231,6 +1234,38 @@ run_event_thread(void *ptr)
return NULL; return NULL;
} }
static void
survive_get_user_config(struct survive_system *ss)
{
// Set defaults
ss->wait_timeout = DEFAULT_WAIT_TIMEOUT;
// Open and parse file
struct u_config_json wrap = {0};
u_config_json_open_or_create_main_file(&wrap);
if (!wrap.file_loaded) {
return;
}
// Find the dict we care about in the file. It might not be there; if so return early.
cJSON *config_json = cJSON_GetObjectItemCaseSensitive(wrap.root, "config_survive");
if (config_json == NULL) {
return;
}
// Get wait timeout key. No need to null-check - read u_json_get_float.
cJSON *wait_timeout = cJSON_GetObjectItemCaseSensitive(config_json, "wait_timeout");
u_json_get_float(wait_timeout, &ss->wait_timeout);
// Log
U_LOG_D("Wait timeout is %f seconds!", ss->wait_timeout);
// Clean up after ourselves
cJSON_Delete(wrap.root);
return;
}
int int
survive_device_autoprobe(struct xrt_auto_prober *xap, survive_device_autoprobe(struct xrt_auto_prober *xap,
cJSON *attached_data, cJSON *attached_data,
@ -1277,6 +1312,8 @@ survive_device_autoprobe(struct xrt_auto_prober *xap,
ss->ll = debug_get_log_option_survive_log(); ss->ll = debug_get_log_option_survive_log();
survive_get_user_config(ss);
while (!add_connected_devices(ss)) { while (!add_connected_devices(ss)) {
U_LOG_IFL_E(ss->ll, "Failed to get device config from survive"); U_LOG_IFL_E(ss->ll, "Failed to get device config from survive");
continue; continue;