X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=528d7b04295dac4eda31220d537c71ac614e35af;hb=d1ad8b10bc9a928cb7b636bcf206ea59736a8658;hp=60731ec46574a35f98f3594d96b523039e55a0a4;hpb=8cccbac8da97397b61aa094c67e62ee922b628ed;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c index 60731ec4..528d7b04 100644 --- a/src/hardware/hameg-hmo/protocol.c +++ b/src/hardware/hameg-hmo/protocol.c @@ -24,14 +24,14 @@ #include "protocol.h" static const char *hameg_scpi_dialect[] = { - [SCPI_CMD_GET_DIG_DATA] = ":POD%d:DATA?", + [SCPI_CMD_GET_DIG_DATA] = ":FORM UINT,8;:POD%d:DATA?", [SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?", [SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s", [SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?", [SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s", [SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?", [SCPI_CMD_GET_SAMPLE_RATE_LIVE] = ":%s:DATA:POINTS?", - [SCPI_CMD_GET_ANALOG_DATA] = ":CHAN%d:DATA?", + [SCPI_CMD_GET_ANALOG_DATA] = ":FORM REAL,32;:CHAN%d:DATA?", [SCPI_CMD_GET_VERTICAL_DIV] = ":CHAN%d:SCAL?", [SCPI_CMD_SET_VERTICAL_DIV] = ":CHAN%d:SCAL %s", [SCPI_CMD_GET_DIG_POD_STATE] = ":POD%d:STAT?", @@ -47,6 +47,7 @@ static const char *hameg_scpi_dialect[] = { [SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s", [SCPI_CMD_GET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT?", [SCPI_CMD_SET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT %d", + [SCPI_CMD_GET_PROBE_UNIT] = ":PROB%d:SET:ATT:UNIT?", }; static const uint32_t hmo_devopts[] = { @@ -67,10 +68,10 @@ static const uint32_t hmo_analog_devopts[] = { }; static const char *hmo_coupling_options[] = { - "AC", - "ACL", - "DC", - "DCL", + "AC", // AC with 50 Ohm termination (152x, 202x, 30xx, 1202) + "ACL", // AC with 1 MOhm termination + "DC", // DC with 50 Ohm termination + "DCL", // DC with 1 MOhm termination "GND", NULL, }; @@ -78,6 +79,7 @@ static const char *hmo_coupling_options[] = { static const char *scope_trigger_slopes[] = { "POS", "NEG", + "EITH", NULL, }; @@ -86,6 +88,9 @@ static const char *hmo_compact2_trigger_sources[] = { "CH2", "LINE", "EXT", + "PATT", + "BUS1", + "BUS2", "D0", "D1", "D2", @@ -104,6 +109,9 @@ static const char *hmo_compact4_trigger_sources[] = { "CH4", "LINE", "EXT", + "PATT", + "BUS1", + "BUS2", "D0", "D1", "D2", @@ -115,6 +123,35 @@ static const char *hmo_compact4_trigger_sources[] = { NULL, }; +static const char *hmo_compact4_dig16_trigger_sources[] = { + "CH1", + "CH2", + "CH3", + "CH4", + "LINE", + "EXT", + "PATT", + "BUS1", + "BUS2", + "D0", + "D1", + "D2", + "D3", + "D4", + "D5", + "D6", + "D7", + "D8", + "D9", + "D10", + "D11", + "D12", + "D13", + "D14", + "D15", + NULL, +}; + static const uint64_t hmo_timebases[][2] = { /* nanoseconds */ { 2, 1000000000 }, @@ -203,7 +240,7 @@ static const char *scope_digital_channel_names[] = { static const struct scope_config scope_models[] = { { /* HMO2522/3032/3042/3052 support 16 digital channels but they're not supported yet. */ - .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522", + .name = {"HMO1002", "HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522", "HMO3032", "HMO3042", "HMO3052", NULL}, .analog_channels = 2, .digital_channels = 8, @@ -234,9 +271,7 @@ static const struct scope_config scope_models[] = { .scpi_dialect = &hameg_scpi_dialect, }, { - /* HMO2524/3034/3044/3054 support 16 digital channels but they're not supported yet. */ - .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", "HMO2524", - "HMO3034", "HMO3044", "HMO3054", NULL}, + .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL}, .analog_channels = 4, .digital_channels = 8, .digital_pods = 1, @@ -263,6 +298,36 @@ static const struct scope_config scope_models[] = { .num_xdivs = 12, .num_ydivs = 8, + .scpi_dialect = &hameg_scpi_dialect, + }, + { + .name = {"HMO2524", "HMO3034", "HMO3044", "HMO3054", NULL}, + .analog_channels = 4, + .digital_channels = 16, + .digital_pods = 2, + + .analog_names = &scope_analog_channel_names, + .digital_names = &scope_digital_channel_names, + + .devopts = &hmo_devopts, + .num_devopts = ARRAY_SIZE(hmo_devopts), + + .analog_devopts = &hmo_analog_devopts, + .num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts), + + .coupling_options = &hmo_coupling_options, + .trigger_sources = &hmo_compact4_dig16_trigger_sources, + .trigger_slopes = &scope_trigger_slopes, + + .timebases = &hmo_timebases, + .num_timebases = ARRAY_SIZE(hmo_timebases), + + .vdivs = &hmo_vdivs, + .num_vdivs = ARRAY_SIZE(hmo_vdivs), + + .num_xdivs = 12, + .num_ydivs = 8, + .scpi_dialect = &hameg_scpi_dialect, }, }; @@ -276,7 +341,7 @@ static void scope_state_dump(const struct scope_config *config, for (i = 0; i < config->analog_channels; i++) { tmp = sr_voltage_string((*config->vdivs)[state->analog_channels[i].vdiv][0], (*config->vdivs)[state->analog_channels[i].vdiv][1]); - sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)", + sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)", i + 1, state->analog_channels[i].state ? "On" : "Off", (*config->coupling_options)[state->analog_channels[i].coupling], tmp, state->analog_channels[i].vertical_offset); @@ -336,14 +401,8 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi, } /** - * This function takes a value of the form "2.000E-03", converts it to a - * significand / factor pair and returns the index of an array where - * a matching pair was found. - * - * It's a bit convoluted because of floating-point issues. The value "10.00E-09" - * is parsed by g_ascii_strtod() as 0.000000009999999939, for example. - * Therefore it's easier to break the number up into two strings and handle - * them separately. + * This function takes a value of the form "2.000E-03" and returns the index + * of an array where a matching pair was found. * * @param value The string to be parsed. * @param array The array of s/f pairs. @@ -355,48 +414,15 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi, static int array_float_get(gchar *value, const uint64_t array[][2], int array_len, unsigned int *result) { - int i, pos, e; - uint64_t f; - float s; - unsigned int s_int; - gchar ss[10], es[10]; - - memset(ss, 0, sizeof(ss)); - memset(es, 0, sizeof(es)); - - /* Get index of the separating 'E' character and break up the string. */ - pos = (int)g_strstr_len(value, strlen(value), "E"); - pos -= (int)value; + struct sr_rational rval; + struct sr_rational aval; - 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, &e) != SR_OK) + if (sr_parse_rational(value, &rval) != SR_OK) return SR_ERR; - /* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */ - f = pow(10, abs(e)); - - /* - * Adjust the significand/factor pair to make sure - * that f is a multiple of 1000. - */ - while ((int)fmod(log10(f), 3) > 0) { - s *= 10; - - if (e < 0) - f *= 10; - else - f /= 10; - } - - /* Truncate s to circumvent rounding errors. */ - s_int = (unsigned int)s; - - for (i = 0; i < array_len; i++) { - if ((s_int == array[i][0]) && (f == array[i][1])) { + for (int i = 0; i < array_len; i++) { + sr_rational_set(&aval, array[i][0], array[i][1]); + if (sr_rational_eq(&rval, &aval)) { *result = i; return SR_OK; } @@ -454,6 +480,19 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, if (scope_state_get_array_option(scpi, command, config->coupling_options, &state->analog_channels[i].coupling) != SR_OK) return SR_ERR; + + g_snprintf(command, sizeof(command), + (*config->scpi_dialect)[SCPI_CMD_GET_PROBE_UNIT], + i + 1); + + if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK) + return SR_ERR; + + if (tmp_str[0] == 'A') + state->analog_channels[i].probe_unit = 'A'; + else + state->analog_channels[i].probe_unit = 'V'; + g_free(tmp_str); } return SR_OK; @@ -588,6 +627,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi) sr_err("Could not determine array index for time base."); return SR_ERR; } + g_free(tmp_str); state->timebase = i; @@ -648,7 +688,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi) { char tmp[25]; int model_index; - unsigned int i, j; + unsigned int i, j, group; struct sr_channel *ch; struct dev_context *devc; @@ -701,7 +741,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi) devc->digital_groups[i]->name = g_strdup(tmp); sdi->channel_groups = g_slist_append(sdi->channel_groups, - devc->digital_groups[i < 8 ? 0 : 1]); + devc->digital_groups[i]); } /* Add digital channels. */ @@ -709,8 +749,9 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi) ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, (*scope_models[model_index].digital_names)[i]); - devc->digital_groups[i < 8 ? 0 : 1]->channels = g_slist_append( - devc->digital_groups[i < 8 ? 0 : 1]->channels, ch); + group = i / 8; + devc->digital_groups[group]->channels = g_slist_append( + devc->digital_groups[group]->channels, ch); } devc->model_config = &scope_models[model_index]; @@ -727,12 +768,17 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) struct sr_channel *ch; struct sr_dev_inst *sdi; struct dev_context *devc; + struct scope_state *state; struct sr_datafeed_packet packet; - GArray *data; - struct sr_datafeed_analog_old analog; + GByteArray *data; + struct sr_datafeed_analog analog; + struct sr_analog_encoding encoding; + struct sr_analog_meaning meaning; + struct sr_analog_spec spec; struct sr_datafeed_logic logic; (void)fd; + (void)revents; data = NULL; @@ -742,16 +788,21 @@ 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; + state = devc->model_state; switch (ch->type) { case SR_CHANNEL_ANALOG: - if (sr_scpi_get_floatv(sdi->conn, NULL, &data) != SR_OK) { + if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) { if (data) - g_array_free(data, TRUE); + g_byte_array_free(data, TRUE); return TRUE; } @@ -759,21 +810,44 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) packet.type = SR_DF_FRAME_BEGIN; sr_session_send(sdi, &packet); - analog.channels = g_slist_append(NULL, ch); - analog.num_samples = data->len; - analog.data = (float *) data->data; - analog.mq = SR_MQ_VOLTAGE; - analog.unit = SR_UNIT_VOLT; - analog.mqflags = 0; - packet.type = SR_DF_ANALOG_OLD; + packet.type = SR_DF_ANALOG; + + analog.data = data->data; + analog.num_samples = data->len / sizeof(float); + analog.encoding = &encoding; + analog.meaning = &meaning; + analog.spec = &spec; + + encoding.unitsize = sizeof(float); + encoding.is_signed = TRUE; + encoding.is_float = TRUE; + encoding.is_bigendian = FALSE; + /* TODO: Use proper 'digits' value for this device (and its modes). */ + encoding.digits = 2; + encoding.is_digits_decimal = FALSE; + encoding.scale.p = 1; + encoding.scale.q = 1; + encoding.offset.p = 0; + encoding.offset.q = 1; + if (state->analog_channels[ch->index].probe_unit == 'V') { + meaning.mq = SR_MQ_VOLTAGE; + meaning.unit = SR_UNIT_VOLT; + } else { + meaning.mq = SR_MQ_CURRENT; + meaning.unit = SR_UNIT_AMPERE; + } + meaning.mqflags = 0; + meaning.channels = g_slist_append(NULL, ch); + /* TODO: Use proper 'digits' value for this device (and its modes). */ + spec.spec_digits = 2; packet.payload = &analog; - sr_session_send(cb_data, &packet); - g_slist_free(analog.channels); - g_array_free(data, TRUE); + sr_session_send(sdi, &packet); + g_slist_free(meaning.channels); + g_byte_array_free(data, TRUE); data = NULL; break; case SR_CHANNEL_LOGIC: - if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) { + if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) { g_free(data); return TRUE; } @@ -786,8 +860,8 @@ 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); - g_array_free(data, TRUE); + sr_session_send(sdi, &packet); + g_byte_array_free(data, TRUE); data = NULL; break; default: @@ -802,7 +876,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);