hameg-hmo: simplify code by using new sr_rational_parse/_eq API functions

[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 bc81b810946d04d74ef2f556048499e5b247970b..ffd682bf5a7f3158a2ea0c640bcc875a778cec68 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -78,6 +78,7 @@ static const char *hmo_coupling_options[] = {
 static const char *scope_trigger_slopes[] = {
        "POS",
        "NEG",
+       "EITH",
        NULL,
 };
 
@@ -86,6 +87,9 @@ static const char *hmo_compact2_trigger_sources[] = {
        "CH2",
        "LINE",
        "EXT",
+       "PATT",
+       "BUS1",
+       "BUS2",
        "D0",
        "D1",
        "D2",
@@ -104,6 +108,9 @@ static const char *hmo_compact4_trigger_sources[] = {
        "CH4",
        "LINE",
        "EXT",
+       "PATT",
+       "BUS1",
+       "BUS2",
        "D0",
        "D1",
        "D2",
@@ -170,6 +177,8 @@ static const uint64_t hmo_vdivs[][2] = {
        { 2, 1 },
        { 5, 1 },
        { 10, 1 },
+       { 20, 1 },
+       { 50, 1 },
 };
 
 static const char *scope_analog_channel_names[] = {
@@ -200,7 +209,9 @@ static const char *scope_digital_channel_names[] = {
 
 static const struct scope_config scope_models[] = {
        {
-               .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL},
+               /* 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},
                .analog_channels = 2,
                .digital_channels = 8,
                .digital_pods = 1,
@@ -230,7 +241,9 @@ static const struct scope_config scope_models[] = {
                .scpi_dialect = &hameg_scpi_dialect,
        },
        {
-               .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL},
+               /* HMO2524/3034/3044/3054 support 16 digital channels but they're not supported yet. */
+               .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", "HMO2524",
+                               "HMO3034", "HMO3044", "HMO3054", NULL},
                .analog_channels = 4,
                .digital_channels = 8,
                .digital_pods = 1,
@@ -330,14 +343,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.
@@ -349,40 +356,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;
-       uint64_t f;
-       float s;
-       unsigned int s_int;
-       gchar ss[10], es[10];
+       struct sr_rational rval;
+       struct sr_rational aval;
 
-       memset(ss, 0, sizeof(ss));
-       memset(es, 0, sizeof(es));
-
-       strncpy(ss, value, 5);
-       strncpy(es, &(value[6]), 3);
-
-       if (sr_atof_ascii(ss, &s) != SR_OK)
-               return SR_ERR;
-       if (sr_atoi(es, &i) != 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(i));
-
-       /*
-        * Adjust the significand/factor pair to make sure
-        * that f is a multiple of 1000.
-        */
-       while ((int)fmod(log10(f), 3) > 0) {
-               s *= 10;
-               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;
                }
@@ -544,6 +526,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
        const struct scope_config *config;
        float tmp_float;
        unsigned int i;
+       char *tmp_str;
 
        devc = sdi->priv;
        config = devc->model_config;
@@ -562,18 +545,20 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
                        &tmp_float) != SR_OK)
                return SR_ERR;
 
-       for (i = 0; i < config->num_timebases; i++) {
-               if (tmp_float == ((float) (*config->timebases)[i][0] /
-                                 (*config->timebases)[i][1])) {
-                       state->timebase = i;
-                       break;
-               }
-       }
-       if (i == config->num_timebases) {
+       if (sr_scpi_get_string(sdi->conn,
+                       (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
+                       &tmp_str) != SR_OK)
+               return SR_ERR;
+
+       if (array_float_get(tmp_str, hmo_timebases, ARRAY_SIZE(hmo_timebases),
+                       &i) != SR_OK) {
+               g_free(tmp_str);
                sr_err("Could not determine array index for time base.");
                return SR_ERR;
        }
 
+       state->timebase = i;
+
        if (sr_scpi_get_float(sdi->conn,
                        (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
                        &tmp_float) != SR_OK)
@@ -716,6 +701,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
        struct sr_datafeed_logic logic;
 
        (void)fd;
+       (void)revents;
 
        data = NULL;
 
@@ -725,8 +711,12 @@ 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;
 
@@ -750,7 +740,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
                analog.mqflags = 0;
                packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
-               sr_session_send(cb_data, &packet);
+               sr_session_send(sdi, &packet);
                g_slist_free(analog.channels);
                g_array_free(data, TRUE);
                data = NULL;
@@ -769,7 +759,7 @@ 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);
+               sr_session_send(sdi, &packet);
                g_array_free(data, TRUE);
                data = NULL;
                break;
@@ -785,7 +775,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);