Skip to content

Commit

Permalink
fluke-45: drop serial port echo test, was disabled for years
Browse files Browse the repository at this point in the history
The Fluke 45 driver's ECHO_TEST broke other people's SCPI device
identification and was disabled in 2018-11. Remove the dead code which
is impossible to resurrect. Its purpose was questionable to begin with.

Should users be affected, then the echo would break the identification
phase. The check cannot be done before identification without affecting
other connected devices, cannot be done after the identification either
when that very identification systematically fails. Should a user meet
this condition then applications' logs are available to see why *IDN?
fails, assuming that users are not aware of their serial port or device
configuration. The request's reflection in the place of a response gives
a strong hint.
  • Loading branch information
gsigh committed Jun 1, 2021
1 parent 6949804 commit a36b21f
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/hardware/fluke-45/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
#include "scpi.h"
#include "protocol.h"

/*
* This test violates the SCPI protocol, and confuses other devices.
* Disable it for now, until a better location was found.
*/
#define ECHO_TEST 0

static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
Expand Down Expand Up @@ -68,21 +62,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
unsigned int i;
const struct fluke_scpi_dmm_model *model = NULL;
gchar *channel_name;
#if ECHO_TEST
char *response;
#endif

#if ECHO_TEST
/* Test for serial port ECHO enabled. */
response = NULL;
sr_scpi_get_string(scpi, "ECHO-TEST", &response);
if (response && strcmp(response, "ECHO-TEST") == 0) {
sr_err("Serial port ECHO is ON. Please turn it OFF!");
g_free(response);
return NULL;
}
g_free(response);
#endif

/* Get device IDN. */
if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
Expand Down

0 comments on commit a36b21f

Please sign in to comment.