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

korad-kaxxxxp: Add support for RND 320-KD3005P (PR #35) 

Since this model replies with a serial number, truncate before that
This commit is contained in:
Peter Åstrand 2019-11-17 07:27:47 +01:00 committed by Uwe Hermann
parent 24931412ee
commit cf6beeb20d
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hardware/korad-kaxxxxp/api.c
View File

@ -62,6 +62,8 @@ static const struct korad_kaxxxxp_model models[] = {
"KORAD KD3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, "KORAD KD3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
{KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P", {KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P",
"KORADKD3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, "KORADKD3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
{RND_320_KD3005P, "RND", "KD3005P",
"RND 320-KD3005P V4.2", 1, {0, 31, 0.01}, {0, 5, 0.001}},
{RND_320K30PV, "RND", "KA3005P", {RND_320K30PV, "RND", "KA3005P",
"RND 320-KA3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, "RND 320-KA3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
{TENMA_72_2540_V20, "Tenma", "72-2540", {TENMA_72_2540_V20, "Tenma", "72-2540",
@ -124,6 +126,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
if (strlen(models[i].id) > len) if (strlen(models[i].id) > len)
len = strlen(models[i].id); len = strlen(models[i].id);
} }
/*
* Some models also include the serial number:
* RND 320-KD3005P V4.2 SN:59834414
*/
len += 12;
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
sr_dbg("Want max %d bytes.", len); sr_dbg("Want max %d bytes.", len);
if ((korad_kaxxxxp_send_cmd(serial, "*IDN?") < 0)) if ((korad_kaxxxxp_send_cmd(serial, "*IDN?") < 0))
@ -134,6 +143,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
return NULL; return NULL;
sr_dbg("Received: %d, %s", i, reply); sr_dbg("Received: %d, %s", i, reply);
model_id = -1; model_id = -1;
/* Truncate before serial number. */
char *sn = g_strrstr(reply, " SN:");
if (sn)
*sn = '\0';
for (i = 0; models[i].id; i++) { for (i = 0; models[i].id; i++) {
if (!g_strcmp0(models[i].id, reply)) if (!g_strcmp0(models[i].id, reply))
model_id = i; model_id = i;

1
src/hardware/korad-kaxxxxp/protocol.h
View File

@ -39,6 +39,7 @@ enum {
KORAD_KA3005P_0XBC, KORAD_KA3005P_0XBC,
KORAD_KD3005P, KORAD_KD3005P,
KORAD_KD3005P_V20_NOSP, KORAD_KD3005P_V20_NOSP,
RND_320_KD3005P,
RND_320K30PV, RND_320K30PV,
TENMA_72_2540_V20, TENMA_72_2540_V20,
TENMA_72_2540_V21, TENMA_72_2540_V21,