X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=9412ff46e8ac8a09c469386ade2e7a4a236d23af;hb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;hp=d093770e62a44a1ed9210b46d7e91131474a2927;hpb=24b6882ffa32b21a3f94de6fef72198116499071;p=libsigrok.git diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c index d093770e..9412ff46 100644 --- a/src/lcr/es51919.c +++ b/src/lcr/es51919.c @@ -490,21 +490,21 @@ static void parse_measurement(const uint8_t *pkt, float *floatval, int unit; int exponent; } units[] = { - { SR_UNIT_UNITLESS, 0 }, /* no unit */ - { SR_UNIT_OHM, 0 }, /* Ohm */ - { SR_UNIT_OHM, 3 }, /* kOhm */ - { SR_UNIT_OHM, 6 }, /* MOhm */ - { -1, 0 }, /* ??? */ - { SR_UNIT_HENRY, -6 }, /* uH */ - { SR_UNIT_HENRY, -3 }, /* mH */ - { SR_UNIT_HENRY, 0 }, /* H */ - { SR_UNIT_HENRY, 3 }, /* kH */ - { SR_UNIT_FARAD, -12 }, /* pF */ - { SR_UNIT_FARAD, -9 }, /* nF */ - { SR_UNIT_FARAD, -6 }, /* uF */ - { SR_UNIT_FARAD, -3 }, /* mF */ - { SR_UNIT_PERCENTAGE, 0 }, /* % */ - { SR_UNIT_DEGREE, 0 }, /* degree */ + { SR_UNIT_UNITLESS, 0 }, /* no unit */ + { SR_UNIT_OHM, 0 }, /* Ohm */ + { SR_UNIT_OHM, 3 }, /* kOhm */ + { SR_UNIT_OHM, 6 }, /* MOhm */ + { -1, 0 }, /* ??? */ + { SR_UNIT_HENRY, -6 }, /* uH */ + { SR_UNIT_HENRY, -3 }, /* mH */ + { SR_UNIT_HENRY, 0 }, /* H */ + { SR_UNIT_HENRY, 3 }, /* kH */ + { SR_UNIT_FARAD, -12 }, /* pF */ + { SR_UNIT_FARAD, -9 }, /* nF */ + { SR_UNIT_FARAD, -6 }, /* uF */ + { SR_UNIT_FARAD, -3 }, /* mF */ + { SR_UNIT_PERCENTAGE, 0 }, /* % */ + { SR_UNIT_DEGREE, 0 }, /* degree */ }; const uint8_t *buf; int digits, exponent; @@ -644,6 +644,7 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt) frame = FALSE; + /* Note: digits/spec_digits will be overridden later. */ sr_analog_init(&analog, &encoding, &meaning, &spec, 0); analog.num_samples = 1;