X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=d15d7a8924346ed5cf0d46d85daeaace078c0963;hb=4c5f70063ad6ae311809ee7818ddc9070fbe05cf;hp=ef30c6f72950c0860482a1540b4572ce70216bd0;hpb=0c96de7223a47a21e509bc2c4560e50651d389e5;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c index ef30c6f7..d15d7a89 100644 --- a/src/hardware/hameg-hmo/protocol.c +++ b/src/hardware/hameg-hmo/protocol.c @@ -34,6 +34,7 @@ static const char *hameg_scpi_dialect[] = { [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_HORIZONTAL_DIV] = ":TIM:DIV?", [SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?", [SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s", [SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?", @@ -43,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?", @@ -51,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?", @@ -71,6 +76,7 @@ static const char *rohde_schwarz_log_not_pod_scpi_dialect[] = { [SCPI_CMD_GET_DIG_DATA] = ":FORM UINT,8;:LOG%d:DATA?", [SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?", [SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s", + [SCPI_CMD_GET_HORIZONTAL_DIV] = ":TIM:DIV?", [SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?", [SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s", [SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?", @@ -80,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?", @@ -88,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... */ @@ -115,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[] = { @@ -171,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", @@ -326,7 +341,7 @@ static const char *scope_digital_channel_names[] = { "D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15", }; -static const struct scope_config scope_models[] = { +static struct scope_config scope_models[] = { { /* HMO Compact2: HMO722/1022/1522/2022 support only 8 digital channels. */ .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL}, @@ -364,7 +379,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &hameg_scpi_dialect, @@ -374,7 +388,6 @@ static const struct scope_config scope_models[] = { .name = {"RTC1002", "HMO1002", "HMO1202", NULL}, .analog_channels = 2, .digital_channels = 8, - .digital_pods = 1, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -407,7 +420,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &hameg_scpi_dialect, @@ -417,7 +429,6 @@ static const struct scope_config scope_models[] = { .name = {"HMO3032", "HMO3042", "HMO3052", "HMO3522", NULL}, .analog_channels = 2, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -450,7 +461,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &hameg_scpi_dialect, @@ -460,7 +470,6 @@ static const struct scope_config scope_models[] = { .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL}, .analog_channels = 4, .digital_channels = 8, - .digital_pods = 1, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -493,7 +502,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &hameg_scpi_dialect, @@ -502,7 +510,6 @@ static const struct scope_config scope_models[] = { .name = {"HMO2524", "HMO3034", "HMO3044", "HMO3054", "HMO3524", NULL}, .analog_channels = 4, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -535,7 +542,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &hameg_scpi_dialect, @@ -544,7 +550,6 @@ static const struct scope_config scope_models[] = { .name = {"RTB2002", NULL}, .analog_channels = 2, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -577,7 +582,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect, @@ -586,7 +590,6 @@ static const struct scope_config scope_models[] = { .name = {"RTB2004", NULL}, .analog_channels = 4, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -619,7 +622,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect, @@ -628,7 +630,6 @@ static const struct scope_config scope_models[] = { .name = {"RTM3002", NULL}, .analog_channels = 2, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -661,7 +662,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect, @@ -670,7 +670,6 @@ static const struct scope_config scope_models[] = { .name = {"RTM3004", NULL}, .analog_channels = 4, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -703,7 +702,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect, @@ -712,7 +710,6 @@ static const struct scope_config scope_models[] = { .name = {"RTA4004", NULL}, .analog_channels = 4, .digital_channels = 16, - .digital_pods = 2, .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, @@ -745,7 +742,6 @@ static const struct scope_config scope_models[] = { .vdivs = &vdivs, .num_vdivs = ARRAY_SIZE(vdivs), - .num_xdivs = 12, .num_ydivs = 8, .scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect, @@ -949,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; @@ -997,7 +993,7 @@ static int digital_channel_state_get(struct sr_dev_inst *sdi, if (config->logic_threshold_for_pod) idx = i + 1; else - idx = i * 8; + idx = i * DIGITAL_CHANNELS_PER_POD; g_snprintf(command, sizeof(command), (*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_THRESHOLD], @@ -1100,6 +1096,12 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi) state->timebase = i; + /* Determine the number of horizontal (x) divisions. */ + if (sr_scpi_get_int(sdi->conn, + (*config->scpi_dialect)[SCPI_CMD_GET_HORIZONTAL_DIV], + (int *)&config->num_xdivs) != SR_OK) + return SR_ERR; + if (sr_scpi_get_float(sdi->conn, (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS], &tmp_float) != SR_OK) @@ -1131,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; @@ -1192,6 +1214,9 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi) return SR_ERR_NA; } + /* Configure the number of PODs given the number of digital channels. */ + scope_models[model_index].digital_pods = scope_models[model_index].digital_channels / DIGITAL_CHANNELS_PER_POD; + devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) * scope_models[model_index].analog_channels); devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) * @@ -1237,7 +1262,7 @@ 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]); - group = i / 8; + group = i / DIGITAL_CHANNELS_PER_POD; devc->digital_groups[group]->channels = g_slist_append( devc->digital_groups[group]->channels, ch); } @@ -1377,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). @@ -1468,7 +1491,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) packet.payload = &logic; sr_session_send(sdi, &packet); } else { - group = ch->index / 8; + group = ch->index / DIGITAL_CHANNELS_PER_POD; hmo_queue_logic_data(devc, group, data); } @@ -1501,8 +1524,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