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 from the hameg-hmo driver.
This patch complements the following commit:
fa3d104f17966dd66664f5ee1cccd05856a7e312
in terms of updating the USB PIDs for new devices (HMO series).
However, in order to make full use of such default serial
port options for USB connections and to avoid data corruption
or even worse connection problems, the following patch is also
required:
Use appropriate default serial port options for USB connections
This second version (v2) of the patch simply fixes a comment
describing the device models.
Signed-off-by: Guido Trentalancia <gu...@trentalancia.com>
---
src/hardware/hameg-hmo/api.c | 2 --
src/scpi/scpi_serial.c | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff -pru libsigrok-git-20102018-orig/src/hardware/hameg-hmo/api.c
libsigrok-git-20102018-fix-hameg-hmo-default-usb-serial-port-options-update-PIDs/src/hardware/hameg-hmo/api.c
--- libsigrok-git-20102018-orig/src/hardware/hameg-hmo/api.c 2018-10-20
13:12:30.894966966 +0200
+++
libsigrok-git-20102018-fix-hameg-hmo-default-usb-serial-port-options-update-PIDs/src/hardware/hameg-hmo/api.c
2018-11-07 22:25:22.567887406 +0100
@@ -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 -pru libsigrok-git-20102018-orig/src/scpi/scpi_serial.c
libsigrok-git-20102018-fix-hameg-hmo-default-usb-serial-port-options-update-PIDs/src/scpi/scpi_serial.c
--- libsigrok-git-20102018-orig/src/scpi/scpi_serial.c 2018-10-20
13:12:30.983966965 +0200
+++
libsigrok-git-20102018-fix-hameg-hmo-default-usb-serial-port-options-update-PIDs/src/scpi/scpi_serial.c
2018-11-07 22:26:30.905884971 +0100
@@ -33,6 +33,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;
@@ -40,7 +41,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)
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
