Replace 'probe' with 'channel' in most places.

[libsigrok.git] / hardware / gmc-mh-1x-2x / protocol.c

diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c
index b0163dbd1e0bf2eeac67e2e8e868665fc2b12796..fc086a7d93a306c073667bcb76845ff30ac00957 100644 (file)
--- a/hardware/gmc-mh-1x-2x/protocol.c
+++ b/hardware/gmc-mh-1x-2x/protocol.c
@@ -132,7 +132,7 @@ static void decode_rs_16(uint8_t rs, struct dev_context *devc)
                if (devc->mq == SR_MQ_VOLTAGE) /* V */
                        devc->scale *= 0.1;
                else if (devc->mq == SR_MQ_CURRENT) /* 000.0 µA */
-                       devc->scale *= 0.0000001; /* Untested! */
+                       devc->scale *= 0.00001;
                else if (devc->mq == SR_MQ_RESISTANCE) {
                        if (devc->buflen >= 10) {
                                /* °C with 10 byte msg type, otherwise GOhm. */
@@ -480,8 +480,19 @@ static void decode_ctmv_2x(uint8_t ctmv, struct dev_context *devc)
                devc->unit = SR_UNIT_UNITLESS;
                devc->mqflags |= SR_MQFLAG_AC;
                break;
+       case 0x1f: /* 11111 Undocumented: 25S in stopwatch mode.
+                       The value is voltage, not time, so treat it such. */
+               devc->mq = SR_MQ_VOLTAGE;
+               devc->unit = SR_UNIT_VOLT;
+               devc->mqflags |= SR_MQFLAG_DC;
+               break;
+       case 0x20: /* 100000 Undocumented: 25S in event count mode.
+               Value is 0 anyway. */
+               devc->mq = SR_MQ_VOLTAGE;
+               devc->unit = SR_UNIT_UNITLESS;
+               break;
        default:
-               sr_err("decode_ctmv_2x(%d, ...): Unknown ctmv!");
+               sr_err("decode_ctmv_2x(%d, ...): Unknown ctmv!", ctmv);
                break;
        }
 }
@@ -637,7 +648,7 @@ static void send_value(struct sr_dev_inst *sdi)
        devc = sdi->priv;
 
        memset(&analog, 0, sizeof(analog));
-       analog.probes = sdi->probes;
+       analog.channels = sdi->channels;
        analog.num_samples = 1;
        analog.mq = devc->mq;
        analog.unit = devc->unit;
@@ -1151,7 +1162,7 @@ SR_PRIV int gmc_mh_1x_2x_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1202,7 +1213,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1320,11 +1331,15 @@ int req_stat14(const struct sr_dev_inst *sdi, gboolean power_on)
 
        if (power_on) {
                sr_info("Write some data and wait 3s to turn on powered off device...");
-               if ((serial_write(serial, msg, sizeof(msg)) == -1) ||
-                               (serial_write(serial, msg, sizeof(msg)) == -1) ||
-                               (serial_write(serial, msg, sizeof(msg)) == -1))
+               if (serial_write(serial, msg, sizeof(msg)) < 0)
+                       return SR_ERR;
+               g_usleep(1*1000*1000);
+               if (serial_write(serial, msg, sizeof(msg)) < 0)
+                       return SR_ERR;
+               g_usleep(1*1000*1000);
+               if (serial_write(serial, msg, sizeof(msg)) < 0)
                        return SR_ERR;
-               g_usleep(3*1000*1000);
+               g_usleep(1*1000*1000);
                serial_flush(serial);
        }
 
@@ -1477,13 +1492,13 @@ SR_PRIV const char *gmc_model_str(enum model mcode)
 /** @copydoc sr_dev_driver.config_set
  */
 SR_PRIV int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-                      const struct sr_probe_group *probe_group)
+                      const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        uint8_t params[9];
        uint8_t msg[42];
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -1517,12 +1532,12 @@ SR_PRIV int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                }
                devc->limit_msec = g_variant_get_uint64(data);
                sr_dbg("Setting time limit to %" PRIu64 "ms.",
-                      devc->limit_msec);
+                       devc->limit_msec);
                break;
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
                sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
+                       devc->limit_samples);
                break;
        default:
                return SR_ERR_NA;