X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=47d87528c37932b6276f2cbd347f7a43cb149294;hb=ee1b6054d6d6a00698ddae421eae63019c452b6d;hp=bcf68ebb7ce1dda9316c7a17271c553cea2e96c8;hpb=8fff75196f79d60369cc05545409fc567c6b7bf4;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c index bcf68ebb..47d87528 100644 --- a/src/hardware/hameg-hmo/protocol.c +++ b/src/hardware/hameg-hmo/protocol.c @@ -18,6 +18,8 @@ */ #include +#include +#include #include "scpi.h" #include "protocol.h" @@ -76,6 +78,7 @@ static const char *hmo_coupling_options[] = { static const char *scope_trigger_slopes[] = { "POS", "NEG", + "EITH", NULL, }; @@ -84,6 +87,9 @@ static const char *hmo_compact2_trigger_sources[] = { "CH2", "LINE", "EXT", + "PATT", + "BUS1", + "BUS2", "D0", "D1", "D2", @@ -102,6 +108,9 @@ static const char *hmo_compact4_trigger_sources[] = { "CH4", "LINE", "EXT", + "PATT", + "BUS1", + "BUS2", "D0", "D1", "D2", @@ -168,6 +177,8 @@ static const uint64_t hmo_vdivs[][2] = { { 2, 1 }, { 5, 1 }, { 10, 1 }, + { 20, 1 }, + { 50, 1 }, }; static const char *scope_analog_channel_names[] = { @@ -198,7 +209,9 @@ static const char *scope_digital_channel_names[] = { static const struct scope_config scope_models[] = { { - .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL}, + /* HMO2522/3032/3042/3052 support 16 digital channels but they're not supported yet. */ + .name = {"HMO1002", "HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522", + "HMO3032", "HMO3042", "HMO3052", NULL}, .analog_channels = 2, .digital_channels = 8, .digital_pods = 1, @@ -228,7 +241,9 @@ static const struct scope_config scope_models[] = { .scpi_dialect = &hameg_scpi_dialect, }, { - .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL}, + /* HMO2524/3034/3044/3054 support 16 digital channels but they're not supported yet. */ + .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", "HMO2524", + "HMO3034", "HMO3044", "HMO3054", NULL}, .analog_channels = 4, .digital_channels = 8, .digital_pods = 1, @@ -345,9 +360,10 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi, * @return SR_ERR on any parsing error, SR_OK otherwise. */ static int array_float_get(gchar *value, const uint64_t array[][2], - int array_len, int *result) + int array_len, unsigned int *result) { - int i; + int i, e; + size_t pos; uint64_t f; float s; unsigned int s_int; @@ -356,16 +372,19 @@ static int array_float_get(gchar *value, const uint64_t array[][2], memset(ss, 0, sizeof(ss)); memset(es, 0, sizeof(es)); - strncpy(ss, value, 5); - strncpy(es, &(value[6]), 3); + /* Get index of the separating 'E' character and break up the string. */ + pos = strcspn(value, "E"); + + strncpy(ss, value, pos); + strncpy(es, &(value[pos+1]), 3); if (sr_atof_ascii(ss, &s) != SR_OK) return SR_ERR; - if (sr_atoi(es, &i) != SR_OK) + if (sr_atoi(es, &e) != SR_OK) return SR_ERR; /* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */ - f = pow(10, abs(i)); + f = pow(10, abs(e)); /* * Adjust the significand/factor pair to make sure @@ -373,7 +392,11 @@ static int array_float_get(gchar *value, const uint64_t array[][2], */ while ((int)fmod(log10(f), 3) > 0) { s *= 10; - f *= 10; + + if (e < 0) + f *= 10; + else + f /= 10; } /* Truncate s to circumvent rounding errors. */ @@ -542,6 +565,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi) const struct scope_config *config; float tmp_float; unsigned int i; + char *tmp_str; devc = sdi->priv; config = devc->model_config; @@ -560,18 +584,20 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi) &tmp_float) != SR_OK) return SR_ERR; - for (i = 0; i < config->num_timebases; i++) { - if (tmp_float == ((float) (*config->timebases)[i][0] / - (*config->timebases)[i][1])) { - state->timebase = i; - break; - } - } - if (i == config->num_timebases) { + if (sr_scpi_get_string(sdi->conn, + (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE], + &tmp_str) != SR_OK) + return SR_ERR; + + if (array_float_get(tmp_str, hmo_timebases, ARRAY_SIZE(hmo_timebases), + &i) != SR_OK) { + g_free(tmp_str); sr_err("Could not determine array index for time base."); return SR_ERR; } + state->timebase = i; + if (sr_scpi_get_float(sdi->conn, (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS], &tmp_float) != SR_OK) @@ -714,6 +740,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) struct sr_datafeed_logic logic; (void)fd; + (void)revents; data = NULL; @@ -723,8 +750,12 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) if (!(devc = sdi->priv)) return TRUE; + /* Although this is correct in general, the USBTMC libusb implementation + * currently does not generate an event prior to the first read. Often + * it is ok to start reading just after the 50ms timeout. See bug #785. if (revents != G_IO_IN) return TRUE; + */ ch = devc->current_channel->data; @@ -748,7 +779,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) analog.mqflags = 0; packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); g_slist_free(analog.channels); g_array_free(data, TRUE); data = NULL; @@ -767,7 +798,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) logic.data = data->data; packet.type = SR_DF_LOGIC; packet.payload = &logic; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); g_array_free(data, TRUE); data = NULL; break; @@ -783,7 +814,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) devc->current_channel = devc->current_channel->next; hmo_request_data(sdi); } else if (++devc->num_frames == devc->frame_limit) { - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sdi->driver->dev_acquisition_stop(sdi); } else { devc->current_channel = devc->enabled_channels; hmo_request_data(sdi);