diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-10-01 22:46:22 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-10-01 22:46:22 +0200 |
| commit | 241c9dab2c7ea63708af9d98171653813ae04d00 (patch) | |
| tree | 7f952e02244a4d92eaaaa9ec6addeeb129584e11 /util/isensor.c | |
| parent | 644c6ecf8e0979cade08ae83fe2fe69941e5da40 (diff) | |
| parent | c91935376922760a8cc671cd083c381f2285e122 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'util/isensor.c')
| -rw-r--r-- | util/isensor.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/util/isensor.c b/util/isensor.c index 8bb2935..df4a911 100644 --- a/util/isensor.c +++ b/util/isensor.c @@ -2635,11 +2635,11 @@ ShowSDR(char *tag, uchar *sdr) memcpy(idstr,&sdr[ioff],ilen); for (i=ilen; i<16; i++) { idstr[i] = ' '; ilen++; } idstr[ilen] = 0; /* stringify */ - if ((sdr01->sens_capab & 0x40) == 0) brearm = 'm'; /*manual rearm*/ - else brearm = 'a'; /*automatic rearm*/ + if ((sdr01->sens_capab & 0x40) == 0) brearm = 'm'; /*manual rearm*/ + else brearm = 'a'; /*automatic rearm*/ if (fdebug) printf("entity %d.%d, idlen=%d sizeof=%lu idstr0=%c s0=%x\n", - sdr01->entity_id, sdr01->entity_inst, - ilen,sizeof(SDR01REC),idstr[0],sdr[ioff]); + sdr01->entity_id, sdr01->entity_inst, + ilen,sizeof(SDR01REC),idstr[0],sdr[ioff]); rc = GetSensorReading(sdr01->sens_num,sdr01,sens); if (rc != 0) { /* if rc != 0, leave sens values zero */ i = 41; /* Unknown */ @@ -2662,8 +2662,8 @@ ShowSDR(char *tag, uchar *sdr) sdr01->sens_num); } else val = RawToFloat(sens[0],sdr); - typestr = get_unit_type(sdr01->sens_units, sdr01->sens_base, - sdr01->sens_mod, fsimple); + typestr = get_unit_type(sdr01->sens_units, sdr01->sens_base, + sdr01->sens_mod, fsimple); #ifdef WRONG if (is_romley(vend_id,prod_id) && (sdr01->sens_type == 0x0C) && (sdr01->sens_units & 0x01)) @@ -2683,11 +2683,11 @@ ShowSDR(char *tag, uchar *sdr) else snprintf(rdgstr,sizeof(rdgstr),"%02x %s %.2f %s", sens[0], sensor_dstatus[i],val,typestr); - } + } sep[0] = 0; /*null string*/ printf("%s", tag); if (fsimple) { - sprintf(sep,"%c ",bdelim); + sprintf(sep,"%c ",bdelim); printf("%04x %c Full %c %s %c %02x %c %s %c %s%c", sdr01->recid, bdelim, bdelim, get_stype_str(sdr01->sens_type), |