std: Drop unneeded/duplicate log messages.

[libsigrok.git] / src / std.c

diff --git a/src/std.c b/src/std.c
index 522606f8fd48b737ea33861a3b8dd46e58f09b40..9199611a1723118cf39de5d857679f17388d2f4c 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -182,7 +182,6 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
        prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
        /* Send header packet to the session bus. */
-       sr_dbg("%s: Sending SR_DF_HEADER packet.", prefix);
        packet.type = SR_DF_HEADER;
        packet.payload = (uint8_t *)&header;
        header.feed_version = 1;
@@ -221,8 +220,6 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 
        prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
-       sr_dbg("%s: Sending SR_DF_END packet.", prefix);
-
        packet.type = SR_DF_END;
        packet.payload = NULL;
 
@@ -259,8 +256,6 @@ SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
 
        prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
-       sr_dbg("%s: Sending SR_DF_FRAME_BEGIN packet.", prefix);
-
        packet.type = SR_DF_FRAME_BEGIN;
        packet.payload = NULL;
 
@@ -297,8 +292,6 @@ SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi)
 
        prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
-       sr_dbg("%s: Sending SR_DF_FRAME_END packet.", prefix);
-
        packet.type = SR_DF_FRAME_END;
        packet.payload = NULL;
 
@@ -712,15 +705,21 @@ SR_PRIV GVariant *std_gvar_min_max_step_array(const double a[3])
 
 SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double min, const double max, const double step)
 {
-       double d;
+       double d, v;
        GVariant *gvar, *range[2];
        GVariantBuilder gvb;
 
        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
 
        for (d = min; d <= max; d += step) {
-               range[0] = g_variant_new_double(d);
-               range[1] = g_variant_new_double(d);
+               /*
+                * We will never see exactly 0.0 because of the error we're
+                * accumulating, so catch the "zero" value and force it to be 0.
+                */
+               v = ((d > (-step / 2)) && (d < (step / 2))) ? 0 : d;
+
+               range[0] = g_variant_new_double(v);
+               range[1] = g_variant_new_double(v);
 
                gvar = g_variant_new_tuple(range, 2);
                g_variant_builder_add_value(&gvb, gvar);