From 763113c35c687e6cf57959f9aa01379a6c16f737 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Sat, 17 Jun 2023 18:29:29 +0800 Subject: [PATCH] update default mode for demo device --- DSView/demo/logic/protocol.demo | Bin 12622 -> 12628 bytes libsigrok4DSL/hardware/demo/demo.c | 28 +++++++++------------------- libsigrok4DSL/hardware/demo/demo.h | 2 ++ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/DSView/demo/logic/protocol.demo b/DSView/demo/logic/protocol.demo index a72aab1e3339f763579afcd425c18e70264bbd49..3967e0ee4847cc7297fc1d3b8e283cdb6be5b4bc 100644 GIT binary patch delta 3440 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 = g_variant_get_int16(data); - switch (sdi->mode) - { - case LOGIC: - nv = get_pattern_mode_index_by_string(LOGIC, DEFAULT_LOGIC_FILE); - if (nv != -1) - vdev->sample_generator = nv; - else - vdev->sample_generator = PATTERN_RANDOM; - reset_dsl_path(sdi,vdev->sample_generator); - break; - case DSO: - reset_dsl_path(sdi, PATTERN_RANDOM); - vdev->sample_generator = PATTERN_RANDOM; - break; - case ANALOG: - reset_dsl_path(sdi, PATTERN_RANDOM); - vdev->sample_generator = PATTERN_RANDOM; - break; - } + nv = get_pattern_mode_index_by_string(sdi->mode, (sdi->mode == LOGIC ? DEFAULT_LOGIC_FILE : + sdi->mode == DSO ? DEFAULT_DSO_FILE : DEFAULT_ANALOG_FILE)); + if (nv != -1) + vdev->sample_generator = nv; + else + vdev->sample_generator = PATTERN_RANDOM; + + reset_dsl_path(sdi,vdev->sample_generator); + load_virtual_device_session(sdi); break; case SR_CONF_PATTERN_MODE: diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h index 84bf417a..2087a33a 100644 --- a/libsigrok4DSL/hardware/demo/demo.h +++ b/libsigrok4DSL/hardware/demo/demo.h @@ -26,6 +26,8 @@ #include #define DEFAULT_LOGIC_FILE "protocol" +#define DEFAULT_ANALOG_FILE "sine" +#define DEFAULT_DSO_FILE "sine" #define SEC 1 #define LOGIC_POST_DATA_PER_SECOND(n) ((n)/(8))