diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index bf46a3bb..56b95c38 100644 --- a/src/hardware/hameg-hmo/api.c +++ b/src/hardware/hameg-hmo/api.c @@ -22,8 +22,6 @@ #include "scpi.h" #include "protocol.h" -#define SERIALCOMM "115200/8n1/flow=1" - static struct sr_dev_driver hameg_hmo_driver_info; static const char *manufacturers[] = { diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c index 8690d6f1..90c01424 100644 --- a/src/scpi/scpi_serial.c +++ b/src/scpi/scpi_serial.c @@ -35,6 +35,7 @@ struct scpi_serial { gboolean got_newline; }; +/* Default serial port options for some known USB devices */ static const struct { uint16_t vendor_id; uint16_t product_id; @@ -42,7 +43,9 @@ static const struct { } scpi_serial_usb_ids[] = { { 0x0403, 0xed72, "115200/8n1/flow=1" }, /* Hameg HO720 */ { 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)