X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=dc1a683ed37d5453cab9c95cf668dc917dd14dad;hp=d20c910b73070fe5e6878f434d64efc6cc62600a;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=a84f6ad38984dd8cee2e41a1f35a4ddf373d2dfd

diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c
index d20c910b..dc1a683e 100644
--- a/hardware/gmc-mh-1x-2x/protocol.c
+++ b/hardware/gmc-mh-1x-2x/protocol.c
@@ -648,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;
@@ -1379,21 +1379,23 @@ SR_PRIV int gmc_decode_model_sm(uint8_t mcode)
 		return METRAHIT_16S;
 	case 0x06: /* 0110b (undocumented by GMC!) */
 		return METRAHIT_16I;
+	case 0x07: /* 0111b (undocumented by GMC!) */
+		return METRAHIT_16T;
 	case 0x0D: /* 1101b */
 		return METRAHIT_18S;
 	case 0x02: /* 0010b */
 		return METRAHIT_22SM;
 	case 0x03: /* 0011b */
 		return METRAHIT_23S;
-	case 0x0f: /* 1111b */
+	case 0x0F: /* 1111b */
 		return METRAHIT_24S;
 	case 0x05: /* 0101b */
 		return METRAHIT_25S;
 	case 0x01: /* 0001b */
 		return METRAHIT_26SM;
-	case 0x0c: /* 1100b */
+	case 0x0C: /* 1100b */
 		return METRAHIT_28S;
-	case 0x0e: /* 1110b */
+	case 0x0E: /* 1110b */
 		return METRAHIT_29S;
 	default:
 		sr_err("Unknown model code %d!", mcode);
@@ -1458,7 +1460,9 @@ SR_PRIV const char *gmc_model_str(enum model mcode)
 	case METRAHIT_16S:
 		return "METRAHit 16S";
 	case METRAHIT_16I:
-		return "METRAHit 16I";
+		return "METRAHit 16I/16L";
+	case METRAHIT_16T:
+		return "METRAHit 16T/16U/KMM2002";
 	case METRAHIT_18S:
 		return "METRAHit 18S";
 	case METRAHIT_22SM:
@@ -1492,13 +1496,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;