X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=3e15d3760543a7ab3da9332a356c5dd8eae7812d;hb=d7a4dad881bf;hp=167c1a4fe5e9960d4f1a0df91e76c20ef9209857;hpb=29a9b1a0bd0af79e0eb2adee594f42895452344c;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c index 167c1a4f..3e15d376 100644 --- a/src/hardware/hameg-hmo/protocol.c +++ b/src/hardware/hameg-hmo/protocol.c @@ -44,6 +44,8 @@ static const char *hameg_scpi_dialect[] = { [SCPI_CMD_SET_VERTICAL_SCALE] = ":CHAN%d:SCAL %s", [SCPI_CMD_GET_DIG_POD_STATE] = ":POD%d:STAT?", [SCPI_CMD_SET_DIG_POD_STATE] = ":POD%d:STAT %d", + [SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?", + [SCPI_CMD_SET_TRIGGER_SOURCE] = ":TRIG:A:SOUR %s", [SCPI_CMD_GET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP?", [SCPI_CMD_SET_TRIGGER_SLOPE] = ":TRIG:A:TYPE EDGE;:TRIG:A:EDGE:SLOP %s", [SCPI_CMD_GET_TRIGGER_PATTERN] = ":TRIG:A:PATT:SOUR?", @@ -52,8 +54,10 @@ static const char *hameg_scpi_dialect[] = { ":TRIG:A:PATT:COND \"TRUE\";" \ ":TRIG:A:PATT:MODE OFF;" \ ":TRIG:A:PATT:SOUR \"%s\"", - [SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?", - [SCPI_CMD_SET_TRIGGER_SOURCE] = ":TRIG:A:SOUR %s", + [SCPI_CMD_GET_HIGH_RESOLUTION] = ":ACQ:HRES?", + [SCPI_CMD_SET_HIGH_RESOLUTION] = ":ACQ:HRES %s", + [SCPI_CMD_GET_PEAK_DETECTION] = ":ACQ:PEAK?", + [SCPI_CMD_SET_PEAK_DETECTION] = ":ACQ:PEAK %s", [SCPI_CMD_GET_DIG_CHAN_STATE] = ":LOG%d:STAT?", [SCPI_CMD_SET_DIG_CHAN_STATE] = ":LOG%d:STAT %d", [SCPI_CMD_GET_VERTICAL_OFFSET] = ":CHAN%d:POS?", @@ -82,6 +86,8 @@ static const char *rohde_schwarz_log_not_pod_scpi_dialect[] = { [SCPI_CMD_SET_VERTICAL_SCALE] = ":CHAN%d:SCAL %s", [SCPI_CMD_GET_DIG_POD_STATE] = ":LOG%d:STAT?", [SCPI_CMD_SET_DIG_POD_STATE] = ":LOG%d:STAT %d", + [SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?", + [SCPI_CMD_SET_TRIGGER_SOURCE] = ":TRIG:A:SOUR %s", [SCPI_CMD_GET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP?", [SCPI_CMD_SET_TRIGGER_SLOPE] = ":TRIG:A:TYPE EDGE;:TRIG:A:EDGE:SLOP %s", [SCPI_CMD_GET_TRIGGER_PATTERN] = ":TRIG:A:PATT:SOUR?", @@ -90,8 +96,10 @@ static const char *rohde_schwarz_log_not_pod_scpi_dialect[] = { ":TRIG:A:PATT:COND \"TRUE\";" \ ":TRIG:A:PATT:MODE OFF;" \ ":TRIG:A:PATT:SOUR \"%s\"", - [SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?", - [SCPI_CMD_SET_TRIGGER_SOURCE] = ":TRIG:A:SOUR %s", + [SCPI_CMD_GET_HIGH_RESOLUTION] = ":ACQ:HRES?", + [SCPI_CMD_SET_HIGH_RESOLUTION] = ":ACQ:HRES %s", + [SCPI_CMD_GET_PEAK_DETECTION] = ":ACQ:PEAK?", + [SCPI_CMD_SET_PEAK_DETECTION] = ":ACQ:PEAK %s", [SCPI_CMD_GET_DIG_CHAN_STATE] = ":LOG%d:STAT?", [SCPI_CMD_SET_DIG_CHAN_STATE] = ":LOG%d:STAT %d", [SCPI_CMD_GET_VERTICAL_OFFSET] = ":CHAN%d:POS?", /* Might not be supported on RTB200x... */ @@ -109,7 +117,7 @@ static const char *rohde_schwarz_log_not_pod_scpi_dialect[] = { static const uint32_t devopts[] = { SR_CONF_OSCILLOSCOPE, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, - SR_CONF_LIMIT_FRAMES | SR_CONF_SET, + SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET, SR_CONF_SAMPLERATE | SR_CONF_GET, SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_NUM_HDIV | SR_CONF_GET, @@ -117,6 +125,8 @@ static const uint32_t devopts[] = { SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_PATTERN | SR_CONF_GET | SR_CONF_SET, + SR_CONF_HIGH_RESOLUTION | SR_CONF_GET | SR_CONF_SET, + SR_CONF_PEAK_DETECTION | SR_CONF_GET | SR_CONF_SET, }; static const uint32_t devopts_cg_analog[] = { @@ -173,6 +183,9 @@ static const char *logic_threshold_rtb200x_rtm300x[] = { "MAN", // overwritten by logic_threshold_custom }; +/* This might need updates whenever logic_threshold* above change. */ +#define MAX_NUM_LOGIC_THRESHOLD_ENTRIES ARRAY_SIZE(logic_threshold) + /* RTC1002, HMO Compact2 and HMO1002/HMO1202 */ static const char *an2_dig8_trigger_sources[] = { "CH1", "CH2", @@ -932,7 +945,7 @@ static int digital_channel_state_get(struct sr_dev_inst *sdi, { unsigned int i, idx; int result = SR_ERR; - static char *logic_threshold_short[] = {}; + char *logic_threshold_short[MAX_NUM_LOGIC_THRESHOLD_ENTRIES]; char command[MAX_COMMAND_SIZE]; struct sr_channel *ch; struct sr_scpi_dev_inst *scpi = sdi->conn; @@ -1120,6 +1133,26 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi) MAX_ANALOG_CHANNEL_COUNT + MAX_DIGITAL_CHANNEL_COUNT); g_free(tmp_str); + if (sr_scpi_get_string(sdi->conn, + (*config->scpi_dialect)[SCPI_CMD_GET_HIGH_RESOLUTION], + &tmp_str) != SR_OK) + return SR_ERR; + if (!strcmp("OFF", tmp_str)) + state->high_resolution = FALSE; + else + state->high_resolution = TRUE; + g_free(tmp_str); + + if (sr_scpi_get_string(sdi->conn, + (*config->scpi_dialect)[SCPI_CMD_GET_PEAK_DETECTION], + &tmp_str) != SR_OK) + return SR_ERR; + if (!strcmp("OFF", tmp_str)) + state->peak_detection = FALSE; + else + state->peak_detection = TRUE; + g_free(tmp_str); + if (hmo_update_sample_rate(sdi) != SR_OK) return SR_ERR; @@ -1369,10 +1402,8 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) * Send "frame begin" packet upon reception of data for the * first enabled channel. */ - if (devc->current_channel == devc->enabled_channels) { - packet.type = SR_DF_FRAME_BEGIN; - sr_session_send(sdi, &packet); - } + if (devc->current_channel == devc->enabled_channels) + std_session_send_df_frame_begin(sdi); /* * Pass on the received data of the channel(s). @@ -1392,25 +1423,9 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) /* Truncate acquisition if a smaller number of samples has been requested. */ if (devc->samples_limit > 0 && analog.num_samples > devc->samples_limit) analog.num_samples = devc->samples_limit; - analog.encoding = &encoding; - analog.meaning = &meaning; - analog.spec = &spec; - - encoding.unitsize = sizeof(float); - encoding.is_signed = TRUE; - encoding.is_float = TRUE; -#ifdef WORDS_BIGENDIAN - encoding.is_bigendian = TRUE; -#else - encoding.is_bigendian = FALSE; -#endif /* 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; + sr_analog_init(&analog, &encoding, &meaning, &spec, 2); + encoding.is_signed = TRUE; if (state->analog_channels[ch->index].probe_unit == 'V') { meaning.mq = SR_MQ_VOLTAGE; meaning.unit = SR_UNIT_VOLT; @@ -1418,10 +1433,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) 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(sdi, &packet); devc->num_samples = data->len / sizeof(float); @@ -1493,8 +1505,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) */ hmo_cleanup_logic_data(devc); - packet.type = SR_DF_FRAME_END; - sr_session_send(sdi, &packet); + std_session_send_df_frame_end(sdi); /* * End of frame was reached. Stop acquisition after the specified