X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=66a73e9f639965d0e5e86b3be2352275ac11bccb;hb=c2b988bd4a1986c15a0ffc8a38b3aa56d1a68c89;hp=2b2b6966bc1eff168243730390cd5147d2901a5b;hpb=873e0c1295b78022ef95f7dd537fa2557f72c681;p=libsigrok.git diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c index 2b2b6966..66a73e9f 100644 --- a/hardware/gmc-mh-1x-2x/protocol.c +++ b/hardware/gmc-mh-1x-2x/protocol.c @@ -102,17 +102,17 @@ static void decode_ctmv_16(uint8_t ctmv, struct dev_context *devc) /** * Decode range/sign/acdc byte special chars (Metrahit 12-16). * - * @param[in] spc Special characters 1 and 2 (s1 | (s2 << 4)). + * @param[in] rs Range and sign byte. */ static void decode_rs_16(uint8_t rs, struct dev_context *devc) { sr_spew("decode_rs_16(%d) scale = %f", rs, devc->scale); - if (rs & 0x08) /* Sign */ + if (rs & 0x04) /* Sign */ devc->scale *= -1.0; if (devc->mq == SR_MQ_CURRENT) { - if (rs & 0x04) /* Current is AC */ + if (rs & 0x08) /* Current is AC */ devc->mqflags |= SR_MQFLAG_AC; else devc->mqflags |= SR_MQFLAG_DC; @@ -130,7 +130,7 @@ static void decode_rs_16(uint8_t rs, struct dev_context *devc) devc->mq = SR_MQ_TEMPERATURE; devc->unit = SR_UNIT_CELSIUS; devc->scale *= 0.01; - } else if ((devc->scale1000 == 2)) { + } else if (devc->scale1000 == 2) { /* 16I Iso 500/1000V 3 GOhm */ devc->scale *= 0.1; }