X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=41b14d48b71aa5b10fe01cec522b23a5ae6c5333;hb=d779dcacb70ffcfed190612e39a3ac5df62b31e0;hp=059ae4399cc612f241b6b5d0dff7e3e1f9ec6994;hpb=eac9fcd2685a0068a9c9884a2b96629088a20ca5;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c index 059ae439..41b14d48 100644 --- a/src/hardware/hameg-hmo/protocol.c +++ b/src/hardware/hameg-hmo/protocol.c @@ -59,6 +59,7 @@ static const char *hameg_scpi_dialect[] = { static const uint32_t devopts[] = { SR_CONF_OSCILLOSCOPE, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | 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, @@ -88,19 +89,30 @@ static const char *scope_trigger_slopes[] = { "EITH", }; -static const char *compact2_trigger_sources[] = { +/* HMO compact2 */ +static const char *an2_dig8_trigger_sources[] = { "CH1", "CH2", "LINE", "EXT", "PATT", "BUS1", "BUS2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", }; -static const char *compact4_trigger_sources[] = { +/* HMO xxx2 */ +static const char *an2_dig16_trigger_sources[] = { + "CH1", "CH2", + "LINE", "EXT", "PATT", "BUS1", "BUS2", + "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", + "D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15", +}; + +/* HMO compact4 */ +static const char *an4_dig8_trigger_sources[] = { "CH1", "CH2", "CH3", "CH4", "LINE", "EXT", "PATT", "BUS1", "BUS2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", }; -static const char *compact4_dig16_trigger_sources[] = { +/* HMO xxx4 */ +static const char *an4_dig16_trigger_sources[] = { "CH1", "CH2", "CH3", "CH4", "LINE", "EXT", "PATT", "BUS1", "BUS2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", @@ -177,9 +189,8 @@ 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 = {"HMO1002", "HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522", - "HMO3032", "HMO3042", "HMO3052", NULL}, + /* HMO722/1002/1022/1522/2022 support only 8 digital channels. */ + .name = {"HMO722", "HMO1002", "HMO1022", "HMO1522", "HMO2022", NULL}, .analog_channels = 2, .digital_channels = 8, .digital_pods = 1, @@ -196,8 +207,44 @@ static const struct scope_config scope_models[] = { .coupling_options = &coupling_options, .num_coupling_options = ARRAY_SIZE(coupling_options), - .trigger_sources = &compact2_trigger_sources, - .num_trigger_sources = ARRAY_SIZE(compact2_trigger_sources), + .trigger_sources = &an2_dig8_trigger_sources, + .num_trigger_sources = ARRAY_SIZE(an2_dig8_trigger_sources), + + .trigger_slopes = &scope_trigger_slopes, + .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes), + + .timebases = &timebases, + .num_timebases = ARRAY_SIZE(timebases), + + .vdivs = &vdivs, + .num_vdivs = ARRAY_SIZE(vdivs), + + .num_xdivs = 12, + .num_ydivs = 8, + + .scpi_dialect = &hameg_scpi_dialect, + }, + { + /* HMO3032/3042/3052/3522 support 16 digital channels. */ + .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, + + .devopts = &devopts, + .num_devopts = ARRAY_SIZE(devopts), + + .devopts_cg_analog = &devopts_cg_analog, + .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog), + + .coupling_options = &coupling_options, + .num_coupling_options = ARRAY_SIZE(coupling_options), + + .trigger_sources = &an2_dig16_trigger_sources, + .num_trigger_sources = ARRAY_SIZE(an2_dig16_trigger_sources), .trigger_slopes = &scope_trigger_slopes, .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes), @@ -231,8 +278,8 @@ static const struct scope_config scope_models[] = { .coupling_options = &coupling_options, .num_coupling_options = ARRAY_SIZE(coupling_options), - .trigger_sources = &compact4_trigger_sources, - .num_trigger_sources = ARRAY_SIZE(compact4_trigger_sources), + .trigger_sources = &an4_dig8_trigger_sources, + .num_trigger_sources = ARRAY_SIZE(an4_dig8_trigger_sources), .trigger_slopes = &scope_trigger_slopes, .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes), @@ -266,8 +313,8 @@ static const struct scope_config scope_models[] = { .coupling_options = &coupling_options, .num_coupling_options = ARRAY_SIZE(coupling_options), - .trigger_sources = &compact4_dig16_trigger_sources, - .num_trigger_sources = ARRAY_SIZE(compact4_dig16_trigger_sources), + .trigger_sources = &an4_dig16_trigger_sources, + .num_trigger_sources = ARRAY_SIZE(an4_dig16_trigger_sources), .trigger_slopes = &scope_trigger_slopes, .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes), @@ -737,6 +784,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi) } devc->model_config = &scope_models[model_index]; + devc->samples_limit = 0; devc->frame_limit = 0; if (!(devc->model_state = scope_state_new(devc->model_config))) @@ -775,8 +823,6 @@ SR_PRIV void hmo_queue_logic_data(struct dev_context *devc, } else { store = devc->logic_data; size = store->len / devc->pod_count; - if (size != pod_data->len) - return; if (group >= devc->pod_count) return; } @@ -792,6 +838,10 @@ SR_PRIV void hmo_queue_logic_data(struct dev_context *devc, *logic_data = pod_data->data[idx]; logic_data += logic_step; } + + /* Truncate acquisition if a smaller number of samples has been requested. */ + if (devc->samples_limit > 0 && devc->logic_data->len > devc->samples_limit * devc->pod_count) + devc->logic_data->len = devc->samples_limit * devc->pod_count; } /* Submit data for all channels, after the individual groups got collected. */ @@ -881,7 +931,6 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) { if (data) g_byte_array_free(data, TRUE); - return TRUE; } @@ -889,6 +938,9 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) analog.data = data->data; analog.num_samples = data->len / sizeof(float); + /* 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; @@ -921,13 +973,15 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) spec.spec_digits = 2; packet.payload = &analog; sr_session_send(sdi, &packet); + devc->num_samples = data->len / sizeof(float); g_slist_free(meaning.channels); g_byte_array_free(data, TRUE); data = NULL; break; case SR_CHANNEL_LOGIC: if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) { - g_free(data); + if (data) + g_byte_array_free(data, TRUE); return TRUE; } @@ -948,6 +1002,9 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) packet.type = SR_DF_LOGIC; logic.data = data->data; logic.length = data->len; + /* Truncate acquisition if a smaller number of samples has been requested. */ + if (devc->samples_limit > 0 && logic.length > devc->samples_limit) + logic.length = devc->samples_limit; logic.unitsize = 1; packet.payload = &logic; sr_session_send(sdi, &packet); @@ -956,6 +1013,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) hmo_queue_logic_data(devc, group, data); } + devc->num_samples = data->len / devc->pod_count; g_byte_array_free(data, TRUE); data = NULL; break; @@ -989,10 +1047,10 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data) /* * End of frame was reached. Stop acquisition after the specified - * number of frames, or continue reception by starting over at - * the first enabled channel. + * number of frames or after the specified number of samples, or + * continue reception by starting over at the first enabled channel. */ - if (++devc->num_frames == devc->frame_limit) { + if (++devc->num_frames >= devc->frame_limit || devc->num_samples >= devc->samples_limit) { sr_dev_acquisition_stop(sdi); hmo_cleanup_logic_data(devc); } else {