The open source OpenXR runtime
u/vive: Be more verbose if we fail to parse model_[name|number]
+5
-2
+5
-2
src/xrt/auxiliary/vive/vive_config.c
+5
-2
src/xrt/auxiliary/vive/vive_config.c
···
397
397
398
398
if (u_json_get(json, "model_number")) {
399
399
JSON_STRING(json, "model_number", d->firmware.model_number);
400
-
} else {
400
+
} else if (u_json_get(json, "model_number")) {
401
401
JSON_STRING(json, "model_name", d->firmware.model_number);
402
+
} else {
403
+
VIVE_ERROR(d, "Could not find either 'model_number' or 'model_name' fields!");
402
404
}
403
405
404
406
VIVE_DEBUG(d, "Parsing model number: %s", d->firmware.model_number);
···
415
417
d->variant = VIVE_VARIANT_PRO;
416
418
VIVE_DEBUG(d, "Found HTC Vive Pro HMD");
417
419
} else {
418
-
VIVE_ERROR(d, "Failed to parse Vive HMD variant");
420
+
VIVE_ERROR(d, "Failed to parse Vive HMD variant!\n\tfirmware.model_[number|name]: '%s'",
421
+
d->firmware.model_number);
419
422
}
420
423
421
424
switch (d->variant) {