BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gmc-mh-1x-2x-rs232: Support for Metrahit 16T and similiar models.

This commit is contained in:
Matthias Heidbrink 2014-07-17 12:40:02 +02:00
parent 5842817e45
commit 2c1a012ed2
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/gmc-mh-1x-2x/protocol.c
View File

@ -1379,21 +1379,23 @@ SR_PRIV int gmc_decode_model_sm(uint8_t mcode)
return METRAHIT_16S; return METRAHIT_16S;
case 0x06: /* 0110b (undocumented by GMC!) */ case 0x06: /* 0110b (undocumented by GMC!) */
return METRAHIT_16I; return METRAHIT_16I;
case 0x07: /* 0111b (undocumented by GMC!) */
return METRAHIT_16T;
case 0x0D: /* 1101b */ case 0x0D: /* 1101b */
return METRAHIT_18S; return METRAHIT_18S;
case 0x02: /* 0010b */ case 0x02: /* 0010b */
return METRAHIT_22SM; return METRAHIT_22SM;
case 0x03: /* 0011b */ case 0x03: /* 0011b */
return METRAHIT_23S; return METRAHIT_23S;
case 0x0f: /* 1111b */ case 0x0F: /* 1111b */
return METRAHIT_24S; return METRAHIT_24S;
case 0x05: /* 0101b */ case 0x05: /* 0101b */
return METRAHIT_25S; return METRAHIT_25S;
case 0x01: /* 0001b */ case 0x01: /* 0001b */
return METRAHIT_26SM; return METRAHIT_26SM;
case 0x0c: /* 1100b */ case 0x0C: /* 1100b */
return METRAHIT_28S; return METRAHIT_28S;
case 0x0e: /* 1110b */ case 0x0E: /* 1110b */
return METRAHIT_29S; return METRAHIT_29S;
default: default:
sr_err("Unknown model code %d!", mcode); sr_err("Unknown model code %d!", mcode);
@ -1458,7 +1460,9 @@ SR_PRIV const char *gmc_model_str(enum model mcode)
case METRAHIT_16S: case METRAHIT_16S:
return "METRAHit 16S"; return "METRAHit 16S";
case METRAHIT_16I: case METRAHIT_16I:
return "METRAHit 16I"; return "METRAHit 16I/16L";
case METRAHIT_16T:
return "METRAHit 16T/16U/KMM2002";
case METRAHIT_18S: case METRAHIT_18S:
return "METRAHit 18S"; return "METRAHit 18S";
case METRAHIT_22SM: case METRAHIT_22SM:

7
hardware/gmc-mh-1x-2x/protocol.h
View File

@ -60,10 +60,11 @@ enum model {
METRAHIT_14S = 14, METRAHIT_14S = 14,
METRAHIT_15S = 15, METRAHIT_15S = 15,
METRAHIT_16S = 16, METRAHIT_16S = 16,
METRAHIT_16I = 17, METRAHIT_16I = 17, /**< Metrahit 16I, L */
METRAHIT_16X = METRAHIT_16I, /**< All Metrahit 16 */ METRAHIT_16T = 18, /**< Metrahit 16T, U, KMM2002 */
METRAHIT_16X = METRAHIT_16T, /**< All Metrahit 16 */
/* A Metrahit 17 exists, but seems not to have an IR interface. */ /* A Metrahit 17 exists, but seems not to have an IR interface. */
METRAHIT_18S = 18, METRAHIT_18S = 19,
METRAHIT_2X = 20, /**< For model type comparisons */ METRAHIT_2X = 20, /**< For model type comparisons */
METRAHIT_22SM = METRAHIT_2X + 1, /**< Send mode */ METRAHIT_22SM = METRAHIT_2X + 1, /**< Send mode */
METRAHIT_22S = METRAHIT_22SM + 1, /**< Bidi mode */ METRAHIT_22S = METRAHIT_22SM + 1, /**< Bidi mode */