BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi: Support devices that omit serial number in *IDN? command responses.

This commit is contained in:
Timo Kokkonen 2020-06-02 00:42:54 -07:00 committed by Gerhard Sittig
parent a0ade2f933
commit 47e7a6395e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scpi/scpi.c
View File

@ -1117,8 +1117,8 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
*/ */
tokens = g_strsplit(response, ",", 0); tokens = g_strsplit(response, ",", 0);
num_tokens = g_strv_length(tokens); num_tokens = g_strv_length(tokens);
if (num_tokens < 4) { if (num_tokens < 3) {
sr_dbg("IDN response not according to spec: %80.s.", response); sr_dbg("IDN response not according to spec: '%s'", response);
g_strfreev(tokens); g_strfreev(tokens);
g_free(response); g_free(response);
return SR_ERR_DATA; return SR_ERR_DATA;
@ -1134,8 +1134,13 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
hw_info->manufacturer = g_strstrip(g_strdup(idn_substr + 4)); hw_info->manufacturer = g_strstrip(g_strdup(idn_substr + 4));
hw_info->model = g_strstrip(g_strdup(tokens[1])); hw_info->model = g_strstrip(g_strdup(tokens[1]));
hw_info->serial_number = g_strstrip(g_strdup(tokens[2])); if (num_tokens < 4) {
hw_info->firmware_version = g_strstrip(g_strdup(tokens[3])); hw_info->serial_number = g_strdup("Unknown");
hw_info->firmware_version = g_strstrip(g_strdup(tokens[2]));
} else {
hw_info->serial_number = g_strstrip(g_strdup(tokens[2]));
hw_info->firmware_version = g_strstrip(g_strdup(tokens[3]));
}
g_strfreev(tokens); g_strfreev(tokens);