rigol-ds: Fix reading data from internal memory

[libsigrok.git] / src / output / csv.c

diff --git a/src/output/csv.c b/src/output/csv.c
index f892311205869ba0f65b4f9fa041a671b4e8b2a9..ea328c4b092a8eee5c498c71ea946ce8e4dd8594 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -44,12 +44,12 @@
  *          Values are "channel", "units", "off". Defaults to "units".
  *
  * time:    Whether or not the first column should include the time the sample
- *          was taken. Defaults to TRUE.
+ *          was taken. Defaults to FALSE.
  *
  * trigger: Whether or not to add a "trigger" column as the last column.
  *          Defaults to FALSE.
  *
- * dedup:   Don't output duplicate rows. Defaults to TRUE. If time is off, then
+ * dedup:   Don't output duplicate rows. Defaults to FALSE. If time is off, then
  *          this is forced to be off.
  */
 
@@ -252,7 +252,7 @@ static GString *gen_header(const struct sr_output *o,
                g_string_append_printf(header,
                        "%s CSV generated by %s %s\n%s from %s on %s",
                        ctx->comment, PACKAGE_NAME,
-                       SR_PACKAGE_VERSION_STRING, ctx->comment,
+                       sr_package_version_string_get(), ctx->comment,
                        ctx->title, ctime(&hdr->starttime.tv_sec));
 
                /* Columns / channels */
@@ -658,9 +658,9 @@ static const struct sr_option *get_options(void)
                l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("channel")));
                l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("off")));
                options[7].values = l;
-               options[8].def = g_variant_ref_sink(g_variant_new_boolean(TRUE));
+               options[8].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
                options[9].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
-               options[10].def = g_variant_ref_sink(g_variant_new_boolean(TRUE));
+               options[10].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
        }
 
        return options;