output/analog: Drop unused fancyprint() and si_printf().
These functions were only used in the SR_DF_ANALOG_OLD case, whereas the SR_DF_ANALOG case already used functions and lists from src/analog.c. This closes bug #636.
This commit is contained in:
Uwe Hermann
parent
24f4a9d50b
commit
d1d3d2e0c4
|
|
@ -70,214 +70,6 @@ static int init(struct sr_output *o, GHashTable *options)
|
|||
return SR_OK;
|
||||
}
|
||||
|
||||
static void si_printf(float value, GString *out, const char *unitstr)
|
||||
{
|
||||
float v;
|
||||
|
||||
if (signbit(value))
|
||||
v = -(value);
|
||||
else
|
||||
v = value;
|
||||
|
||||
if (v < 1e-12 || v > 1e+12)
|
||||
g_string_append_printf(out, "%f %s", value, unitstr);
|
||||
else if (v > 1e+9)
|
||||
g_string_append_printf(out, "%f G%s", value / 1e+9, unitstr);
|
||||
else if (v > 1e+6)
|
||||
g_string_append_printf(out, "%f M%s", value / 1e+6, unitstr);
|
||||
else if (v > 1e+3)
|
||||
g_string_append_printf(out, "%f k%s", value / 1e+3, unitstr);
|
||||
else if (v < 1e-9)
|
||||
g_string_append_printf(out, "%f n%s", value * 1e+9, unitstr);
|
||||
else if (v < 1e-6)
|
||||
g_string_append_printf(out, "%f u%s", value * 1e+6, unitstr);
|
||||
else if (v < 1e-3)
|
||||
g_string_append_printf(out, "%f m%s", value * 1e+3, unitstr);
|
||||
else
|
||||
g_string_append_printf(out, "%f %s", value, unitstr);
|
||||
|
||||
}
|
||||
|
||||
/* Please use the same order as in enum sr_unit (libsigrok.h). */
|
||||
static void fancyprint(int unit, int mqflags, float value, GString *out)
|
||||
{
|
||||
switch (unit) {
|
||||
case SR_UNIT_VOLT:
|
||||
si_printf(value, out, "V");
|
||||
break;
|
||||
case SR_UNIT_AMPERE:
|
||||
si_printf(value, out, "A");
|
||||
break;
|
||||
case SR_UNIT_OHM:
|
||||
si_printf(value, out, "");
|
||||
g_string_append_unichar(out, 0x2126);
|
||||
break;
|
||||
case SR_UNIT_FARAD:
|
||||
si_printf(value, out, "F");
|
||||
break;
|
||||
case SR_UNIT_KELVIN:
|
||||
si_printf(value, out, "K");
|
||||
break;
|
||||
case SR_UNIT_CELSIUS:
|
||||
si_printf(value, out, "");
|
||||
g_string_append_unichar(out, 0x00b0);
|
||||
g_string_append_c(out, 'C');
|
||||
break;
|
||||
case SR_UNIT_FAHRENHEIT:
|
||||
si_printf(value, out, "");
|
||||
g_string_append_unichar(out, 0x00b0);
|
||||
g_string_append_c(out, 'F');
|
||||
break;
|
||||
case SR_UNIT_HERTZ:
|
||||
si_printf(value, out, "Hz");
|
||||
break;
|
||||
case SR_UNIT_PERCENTAGE:
|
||||
g_string_append_printf(out, "%f %%", value);
|
||||
break;
|
||||
case SR_UNIT_BOOLEAN:
|
||||
if (value > 0)
|
||||
g_string_append_printf(out, "TRUE");
|
||||
else
|
||||
g_string_append_printf(out, "FALSE");
|
||||
break;
|
||||
case SR_UNIT_SECOND:
|
||||
si_printf(value, out, "s");
|
||||
break;
|
||||
case SR_UNIT_SIEMENS:
|
||||
si_printf(value, out, "S");
|
||||
break;
|
||||
case SR_UNIT_DECIBEL_MW:
|
||||
si_printf(value, out, "dBu");
|
||||
break;
|
||||
case SR_UNIT_DECIBEL_VOLT:
|
||||
si_printf(value, out, "dBV");
|
||||
break;
|
||||
case SR_UNIT_UNITLESS:
|
||||
si_printf(value, out, "");
|
||||
break;
|
||||
case SR_UNIT_DECIBEL_SPL:
|
||||
if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A)
|
||||
si_printf(value, out, "dB(A)");
|
||||
else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_C)
|
||||
si_printf(value, out, "dB(C)");
|
||||
else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_Z)
|
||||
si_printf(value, out, "dB(Z)");
|
||||
else
|
||||
/* No frequency weighting, or non-standard "flat" */
|
||||
si_printf(value, out, "dB(SPL)");
|
||||
if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_S)
|
||||
g_string_append(out, " S");
|
||||
else if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_F)
|
||||
g_string_append(out, " F");
|
||||
if (mqflags & SR_MQFLAG_SPL_LAT)
|
||||
g_string_append(out, " LAT");
|
||||
else if (mqflags & SR_MQFLAG_SPL_PCT_OVER_ALARM)
|
||||
/* Not a standard function for SLMs, so this is
|
||||
* a made-up notation. */
|
||||
g_string_append(out, " %oA");
|
||||
break;
|
||||
case SR_UNIT_CONCENTRATION:
|
||||
g_string_append_printf(out, "%f ppm", value * (1000 * 1000));
|
||||
break;
|
||||
case SR_UNIT_REVOLUTIONS_PER_MINUTE:
|
||||
si_printf(value, out, "RPM");
|
||||
break;
|
||||
case SR_UNIT_VOLT_AMPERE:
|
||||
si_printf(value, out, "VA");
|
||||
break;
|
||||
case SR_UNIT_WATT:
|
||||
si_printf(value, out, "W");
|
||||
break;
|
||||
case SR_UNIT_WATT_HOUR:
|
||||
si_printf(value, out, "Wh");
|
||||
break;
|
||||
case SR_UNIT_METER_SECOND:
|
||||
si_printf(value, out, "m/s");
|
||||
break;
|
||||
case SR_UNIT_HECTOPASCAL:
|
||||
si_printf(value, out, "hPa");
|
||||
break;
|
||||
case SR_UNIT_HUMIDITY_293K:
|
||||
si_printf(value, out, "%rF");
|
||||
break;
|
||||
case SR_UNIT_DEGREE:
|
||||
si_printf(value, out, "");
|
||||
g_string_append_unichar(out, 0x00b0);
|
||||
break;
|
||||
case SR_UNIT_HENRY:
|
||||
si_printf(value, out, "H");
|
||||
break;
|
||||
case SR_UNIT_GRAM:
|
||||
si_printf(value, out, "g");
|
||||
break;
|
||||
case SR_UNIT_CARAT:
|
||||
si_printf(value, out, "ct");
|
||||
break;
|
||||
case SR_UNIT_OUNCE:
|
||||
si_printf(value, out, "oz");
|
||||
break;
|
||||
case SR_UNIT_TROY_OUNCE:
|
||||
si_printf(value, out, "oz t");
|
||||
break;
|
||||
case SR_UNIT_POUND:
|
||||
si_printf(value, out, "lb");
|
||||
break;
|
||||
case SR_UNIT_PENNYWEIGHT:
|
||||
si_printf(value, out, "dwt");
|
||||
break;
|
||||
case SR_UNIT_GRAIN:
|
||||
si_printf(value, out, "gr");
|
||||
break;
|
||||
case SR_UNIT_TAEL:
|
||||
si_printf(value, out, "tael");
|
||||
break;
|
||||
case SR_UNIT_MOMME:
|
||||
si_printf(value, out, "momme");
|
||||
break;
|
||||
case SR_UNIT_TOLA:
|
||||
si_printf(value, out, "tola");
|
||||
break;
|
||||
case SR_UNIT_PIECE:
|
||||
si_printf(value, out, "pcs");
|
||||
break;
|
||||
default:
|
||||
si_printf(value, out, "");
|
||||
break;
|
||||
}
|
||||
|
||||
/* Please use the same order as in enum sr_mqflag (libsigrok.h). */
|
||||
if (mqflags & SR_MQFLAG_AC)
|
||||
g_string_append_printf(out, " AC");
|
||||
if (mqflags & SR_MQFLAG_DC)
|
||||
g_string_append_printf(out, " DC");
|
||||
if (mqflags & SR_MQFLAG_RMS)
|
||||
g_string_append_printf(out, " RMS");
|
||||
if (mqflags & SR_MQFLAG_DIODE)
|
||||
g_string_append_printf(out, " DIODE");
|
||||
if (mqflags & SR_MQFLAG_HOLD)
|
||||
g_string_append_printf(out, " HOLD");
|
||||
if (mqflags & SR_MQFLAG_MAX)
|
||||
g_string_append_printf(out, " MAX");
|
||||
if (mqflags & SR_MQFLAG_MIN)
|
||||
g_string_append_printf(out, " MIN");
|
||||
if (mqflags & SR_MQFLAG_AUTORANGE)
|
||||
g_string_append_printf(out, " AUTO");
|
||||
if (mqflags & SR_MQFLAG_RELATIVE)
|
||||
g_string_append_printf(out, " REL");
|
||||
/* Note: SR_MQFLAG_SPL_* is handled above. */
|
||||
if (mqflags & SR_MQFLAG_DURATION)
|
||||
g_string_append_printf(out, " DURATION");
|
||||
if (mqflags & SR_MQFLAG_AVG)
|
||||
g_string_append_printf(out, " AVG");
|
||||
if (mqflags & SR_MQFLAG_REFERENCE)
|
||||
g_string_append_printf(out, " REF");
|
||||
if (mqflags & SR_MQFLAG_UNSTABLE)
|
||||
g_string_append_printf(out, " UNSTABLE");
|
||||
if (mqflags & SR_MQFLAG_FOUR_WIRE)
|
||||
g_string_append_printf(out, " 4-WIRE");
|
||||
g_string_append_c(out, '\n');
|
||||
}
|
||||
|
||||
static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
|
||||
GString **out)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue