From 94ee83e2266c56f364d68514a5f1ef9de55076ef Mon Sep 17 00:00:00 2001 From: yunyaobaihong <896458252@qq.com> Date: Mon, 15 May 2023 14:07:46 +0800 Subject: [PATCH] demo file --- .../{demo_sawtooth_analog.dsl => sawtooth.demo} | Bin .../demo/analog/{demo_sine_analog.dsl => sine.demo} | Bin .../analog/{demo_square_analog.dsl => square.demo} | Bin .../{demo_triangle_analog.dsl => triangle.demo} | Bin .../dso/{demo_sawtooth_dso.dsl => sawtooth.demo} | Bin DSView/demo/dso/{demo_sine_dso.dsl => sine.demo} | Bin .../demo/dso/{demo_square_dso.dsl => square.demo} | Bin .../dso/{demo_triangle_dso.dsl => triangle.demo} | Bin DSView/demo/logic/{demo_uart.dsl => demo.demo} | Bin DSView/demo/logic/{demo_eeprom.dsl => eeprom.demo} | Bin DSView/demo/logic/{demo_spi.dsl => spi.demo} | Bin libsigrok4DSL/hardware/demo/demo.c | 5 ----- 12 files changed, 5 deletions(-) rename DSView/demo/analog/{demo_sawtooth_analog.dsl => sawtooth.demo} (100%) rename DSView/demo/analog/{demo_sine_analog.dsl => sine.demo} (100%) rename DSView/demo/analog/{demo_square_analog.dsl => square.demo} (100%) rename DSView/demo/analog/{demo_triangle_analog.dsl => triangle.demo} (100%) rename DSView/demo/dso/{demo_sawtooth_dso.dsl => sawtooth.demo} (100%) rename DSView/demo/dso/{demo_sine_dso.dsl => sine.demo} (100%) rename DSView/demo/dso/{demo_square_dso.dsl => square.demo} (100%) rename DSView/demo/dso/{demo_triangle_dso.dsl => triangle.demo} (100%) rename DSView/demo/logic/{demo_uart.dsl => demo.demo} (100%) rename DSView/demo/logic/{demo_eeprom.dsl => eeprom.demo} (100%) rename DSView/demo/logic/{demo_spi.dsl => spi.demo} (100%) diff --git a/DSView/demo/analog/demo_sawtooth_analog.dsl b/DSView/demo/analog/sawtooth.demo similarity index 100% rename from DSView/demo/analog/demo_sawtooth_analog.dsl rename to DSView/demo/analog/sawtooth.demo diff --git a/DSView/demo/analog/demo_sine_analog.dsl b/DSView/demo/analog/sine.demo similarity index 100% rename from DSView/demo/analog/demo_sine_analog.dsl rename to DSView/demo/analog/sine.demo diff --git a/DSView/demo/analog/demo_square_analog.dsl b/DSView/demo/analog/square.demo similarity index 100% rename from DSView/demo/analog/demo_square_analog.dsl rename to DSView/demo/analog/square.demo diff --git a/DSView/demo/analog/demo_triangle_analog.dsl b/DSView/demo/analog/triangle.demo similarity index 100% rename from DSView/demo/analog/demo_triangle_analog.dsl rename to DSView/demo/analog/triangle.demo diff --git a/DSView/demo/dso/demo_sawtooth_dso.dsl b/DSView/demo/dso/sawtooth.demo similarity index 100% rename from DSView/demo/dso/demo_sawtooth_dso.dsl rename to DSView/demo/dso/sawtooth.demo diff --git a/DSView/demo/dso/demo_sine_dso.dsl b/DSView/demo/dso/sine.demo similarity index 100% rename from DSView/demo/dso/demo_sine_dso.dsl rename to DSView/demo/dso/sine.demo diff --git a/DSView/demo/dso/demo_square_dso.dsl b/DSView/demo/dso/square.demo similarity index 100% rename from DSView/demo/dso/demo_square_dso.dsl rename to DSView/demo/dso/square.demo diff --git a/DSView/demo/dso/demo_triangle_dso.dsl b/DSView/demo/dso/triangle.demo similarity index 100% rename from DSView/demo/dso/demo_triangle_dso.dsl rename to DSView/demo/dso/triangle.demo diff --git a/DSView/demo/logic/demo_uart.dsl b/DSView/demo/logic/demo.demo similarity index 100% rename from DSView/demo/logic/demo_uart.dsl rename to DSView/demo/logic/demo.demo diff --git a/DSView/demo/logic/demo_eeprom.dsl b/DSView/demo/logic/eeprom.demo similarity index 100% rename from DSView/demo/logic/demo_eeprom.dsl rename to DSView/demo/logic/eeprom.demo diff --git a/DSView/demo/logic/demo_spi.dsl b/DSView/demo/logic/spi.demo similarity index 100% rename from DSView/demo/logic/demo_spi.dsl rename to DSView/demo/logic/spi.demo diff --git a/libsigrok4DSL/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c index a3ab84ad..86344612 100644 --- a/libsigrok4DSL/hardware/demo/demo.c +++ b/libsigrok4DSL/hardware/demo/demo.c @@ -208,7 +208,6 @@ static int get_pattern_mode_from_file(uint8_t device_mode) strcpy(dir_str,DS_RES_PATH); strcat(dir_str,"../"); strcat(dir_str,"demo/"); - sr_info("%s",dir_str); if(device_mode == LOGIC) strcat(dir_str,"logic/"); @@ -277,7 +276,6 @@ static int scan_dsl_file(struct sr_dev_inst *sdi) sample_generator = PATTERN_RANDOM; sdi->mode = LOGIC; reset_dsl_path(sdi,LOGIC,PATTERN_RANDOM); - sr_info("path:%s",sdi->path); } } @@ -1816,7 +1814,6 @@ static int receive_data_dso(int fd, int revents, const struct sr_dev_inst *sdi) int index; int bit = get_bit(vdev->timebase); - sr_info("bit per circle(double channels):%d",bit); void* tmp_buf = g_try_malloc0(bit); for(int i = 0 ; i < bit ; i++) { @@ -2307,7 +2304,6 @@ static int load_virtual_device_session(struct sr_dev_inst *sdi) } else { - sr_info("%s",sdi->path); archive = unzOpen64(sdi->path); if (NULL == archive) { @@ -2384,7 +2380,6 @@ static int load_virtual_device_session(struct sr_dev_inst *sdi) for (j = 0; keys[j]; j++) { val = g_key_file_get_string(kf, sections[i], keys[j], NULL); - sr_info("keys:%s , val:%s", keys[j],val); if (!strcmp(keys[j], "device mode")) {