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

hameg-hmo: Update the default serial port options. 

Update the default serial port options for Rohde&Schwarz and
Hameg mixed-signal oscilloscope devices connected through USB.

Also, remove misplaced and unused serial port configuration option.

This patch complements fa3d104f17
in terms of updating the USB PIDs for new devices (HMO series).

This fixes parts of bug #1321.
This commit is contained in:
Guido Trentalancia 2018-11-16 18:43:25 +01:00 committed by Uwe Hermann
parent 232eb33c67
commit 3308450089
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/hameg-hmo/api.c
View File

@ -22,8 +22,6 @@
#include "scpi.h" #include "scpi.h"
#include "protocol.h" #include "protocol.h"
#define SERIALCOMM "115200/8n1/flow=1"
static struct sr_dev_driver hameg_hmo_driver_info; static struct sr_dev_driver hameg_hmo_driver_info;
static const char *manufacturers[] = { static const char *manufacturers[] = {

5
src/scpi/scpi_serial.c
View File

@ -35,6 +35,7 @@ struct scpi_serial {
gboolean got_newline; gboolean got_newline;
}; };
/* Default serial port options for some known USB devices */
static const struct { static const struct {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t product_id; uint16_t product_id;
@ -42,7 +43,9 @@ static const struct {
} scpi_serial_usb_ids[] = { } scpi_serial_usb_ids[] = {
{ 0x0403, 0xed72, "115200/8n1/flow=1" }, /* Hameg HO720 */ { 0x0403, 0xed72, "115200/8n1/flow=1" }, /* Hameg HO720 */
{ 0x0403, 0xed73, "115200/8n1/flow=1" }, /* Hameg HO730 */ { 0x0403, 0xed73, "115200/8n1/flow=1" }, /* Hameg HO730 */
{ 0x0aad, 0x0118, "115200/8n1" }, /* R&S HMO1002 */ { 0x0aad, 0x0117, "115200/8n1" }, /* R&S HMO series, previously branded as Hameg HMO */
{ 0x0aad, 0x0118, "115200/8n1" }, /* R&S HMO series, previously branded as Hameg HMO */
{ 0x0aad, 0x0119, "115200/8n1" }, /* R&S HMO series, previously branded as Hameg HMO */
}; };
static GSList *scpi_serial_scan(struct drv_context *drvc) static GSList *scpi_serial_scan(struct drv_context *drvc)