Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

[libsigrok.git] / output / analog.c

diff --git a/output/analog.c b/output/analog.c
index 4b823955de696fed3982da573a999730ec9c97e2..ca3a2a0b392481e0846f725a2c02036ec7c17fa8 100644 (file)
--- a/output/analog.c
+++ b/output/analog.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/analog: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "output/analog"
 
 struct context {
        int num_enabled_probes;
@@ -41,7 +34,7 @@ struct context {
 static int init(struct sr_output *o)
 {
        struct context *ctx;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        GSList *l;
 
        sr_spew("Initializing output module.");
@@ -129,7 +122,7 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
                si_printf(value, out, "Hz");
                break;
        case SR_UNIT_PERCENTAGE:
-               g_string_append_printf(out, "%f%%", value);
+               g_string_append_printf(out, "%f %%", value);
                break;
        case SR_UNIT_BOOLEAN:
                if (value > 0)
@@ -173,16 +166,43 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
        case SR_UNIT_CONCENTRATION:
                g_string_append_printf(out, "%f ppm", value * 1000000);
                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;
        default:
                si_printf(value, out, "");
                break;
        }
-       if ((mqflags & (SR_MQFLAG_AC | SR_MQFLAG_DC)) == (SR_MQFLAG_AC | SR_MQFLAG_DC))
-               g_string_append_printf(out, " AC+DC");
-       else if (mqflags & SR_MQFLAG_AC)
+
+       if (mqflags & SR_MQFLAG_AC)
                g_string_append_printf(out, " AC");
-       else if (mqflags & SR_MQFLAG_DC)
+       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");
+       if (mqflags & SR_MQFLAG_AVG)
+               g_string_append_printf(out, " AVG");
        g_string_append_c(out, '\n');
 }
 
@@ -190,7 +210,7 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet, GString **out)
 {
        const struct sr_datafeed_analog *analog;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        GSList *l;
        const float *fdata;
        int i, p;