mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-03 12:28:07 +00:00
a/vive: Also correctly error on unknown controller warnings
This commit is contained in:
parent
aace8ff62d
commit
94ad966e4d
|
@ -549,10 +549,13 @@ vive_config_parse_controller(struct vive_controller_config *d, char *json_string
|
|||
|
||||
if (u_json_get(json, "model_number")) {
|
||||
JSON_STRING(json, "model_number", d->firmware.model_number);
|
||||
} else {
|
||||
} else if (u_json_get(json, "model_name")) {
|
||||
JSON_STRING(json, "model_name", d->firmware.model_number);
|
||||
} else {
|
||||
VIVE_ERROR(d, "Could not find either 'model_number' or 'model_name' fields!");
|
||||
}
|
||||
|
||||
|
||||
VIVE_DEBUG(d, "Parsing model number: %s", d->firmware.model_number);
|
||||
|
||||
if (strcmp(d->firmware.model_number, "Vive. Controller MV") == 0 ||
|
||||
|
@ -576,7 +579,8 @@ vive_config_parse_controller(struct vive_controller_config *d, char *json_string
|
|||
d->variant = CONTROLLER_TRACKER_GEN2;
|
||||
VIVE_DEBUG(d, "Found Gen 2 tracker.");
|
||||
} else {
|
||||
VIVE_ERROR(d, "Failed to parse controller variant");
|
||||
VIVE_ERROR(d, "Failed to parse controller variant!\n\tfirmware.model_[number|name]: '%s'",
|
||||
d->firmware.model_number);
|
||||
}
|
||||
|
||||
switch (d->variant) {
|
||||
|
|
Loading…
Reference in a new issue