]> sigrok.org Git - libsigrok.git/blobdiff - output/analog.c
Rename 'struct sr_probe' to 'struct sr_channel' everywhere.
[libsigrok.git] / output / analog.c
index e7e475fc3126ec6219ddf509c76ae02d6e77f74b..ca3a2a0b392481e0846f725a2c02036ec7c17fa8 100644 (file)
 #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.");
@@ -99,89 +92,117 @@ static void si_printf(float value, GString *out, char *unitstr)
 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_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 * 1000000);
-                       break;
-               default:
-                       si_printf(value, out, "");
+       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_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 * 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');
 }
 
@@ -189,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;