scpi-pps: Add support for Owon P4000 series.

[libsigrok.git] / src / hardware / hameg-hmo / protocol.c

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index b0875eb588e2bae2928608aeee6a0af08c38e7c7..3e15d3760543a7ab3da9332a356c5dd8eae7812d 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -117,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,
@@ -183,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",
@@ -942,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;
@@ -1399,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).
@@ -1422,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;
@@ -1448,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);
@@ -1523,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