SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

demo path

Browse Source
This commit is contained in:
yunyaobaihong
2023-05-15 14:00:05 +08:00
parent c25477da1f
commit e42cf2a8d0
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DSView/pv/mainwindow.cpp
View File

@@ -117,7 +117,7 @@ namespace pv
_is_auto_switch_device = false;
_is_save_confirm_msg = false;
_pattern_mode = "RANDOM";
_pattern_mode = "random";
setup_ui();
@@ -1779,7 +1779,7 @@ namespace pv
{
_view->auto_set_max_scale();
if(_pattern_mode != "RANDOM")
if(_pattern_mode != "random")
{
StoreSession ss(_session);
QJsonArray deArray = get_decoder_json_from_file(_device_agent->path());
@@ -1833,7 +1833,7 @@ namespace pv
if(_device_agent->get_work_mode() == LOGIC)
{
if(_pattern_mode != "RANDOM")
if(_pattern_mode != "random")
{
_device_agent->update();
StoreSession ss(_session);
@@ -1948,7 +1948,7 @@ namespace pv
_protocol_widget->del_all_protocol();
if(_pattern_mode != "RANDOM")
if(_pattern_mode != "random")
{
StoreSession ss(_session);
QJsonArray deArray = get_decoder_json_from_file(_device_agent->path());

2
DSView/pv/sigsession.cpp
View File

@@ -528,7 +528,7 @@ namespace pv
QString rand_mode = g_variant_get_string(gvar,NULL);
g_variant_unref(gvar);
if (rand_mode != "RANDOM"){
if (rand_mode != "random"){
set_operation_mode(OPT_SINGLE);
}
}

2
DSView/pv/toolbars/samplingbar.cpp
View File

@@ -1275,7 +1275,7 @@ namespace pv
QString rand_mode = g_variant_get_string(gvar,NULL);
g_variant_unref(gvar);
bool is_rand = rand_mode.toUpper() == "RANDOM";
bool is_rand = rand_mode.toUpper() == "random";
_action_loop->setVisible(is_rand);
if (!is_rand){

15
libsigrok4DSL/hardware/demo/demo.c
View File

@@ -207,7 +207,8 @@ static int get_pattern_mode_from_file(uint8_t device_mode)
strcpy(dir_str,DS_RES_PATH);
strcat(dir_str,"../");
strcat(dir_str,"demo-file/");
strcat(dir_str,"demo/");
sr_info("%s",dir_str);
if(device_mode == LOGIC)
strcat(dir_str,"logic/");
@@ -227,10 +228,10 @@ static int get_pattern_mode_from_file(uint8_t device_mode)
{
if (FALSE == g_file_test(filename,G_FILE_TEST_IS_DIR))
{
if(strstr(filename,".dsl") != NULL)
if(strstr(filename,".demo") != NULL)
{
char *tmp_file_name = g_try_malloc0(strlen(filename)-strlen(".dsl")+1);
snprintf(tmp_file_name, strlen(filename)-strlen(".dsl")+1 , "%s", filename);
char *tmp_file_name = g_try_malloc0(strlen(filename)-strlen(".demo")+1);
snprintf(tmp_file_name, strlen(filename)-strlen(".demo")+1 , "%s", filename);
if(device_mode == LOGIC)
pattern_strings_logic[index] = tmp_file_name;
else if(device_mode == DSO)
@@ -276,6 +277,7 @@ 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);
}
}
@@ -288,7 +290,7 @@ static int reset_dsl_path(struct sr_dev_inst *sdi,uint8_t device_mode ,uint8_t p
char *str = g_try_malloc0(500);
strcpy(str,DS_RES_PATH);
strcat(str,"../");
strcat(str,"demo-file/");
strcat(str,"demo/");
if (pattern_mode != PATTERN_RANDOM)
{
@@ -318,7 +320,7 @@ static int reset_dsl_path(struct sr_dev_inst *sdi,uint8_t device_mode ,uint8_t p
default:
break;
}
strcat(str,".dsl");
strcat(str,".demo");
}
if(pattern_mode != PATTERN_RANDOM)
@@ -2305,6 +2307,7 @@ static int load_virtual_device_session(struct sr_dev_inst *sdi)
}
else
{
sr_info("%s",sdi->path);
archive = unzOpen64(sdi->path);
if (NULL == archive)
{

6
libsigrok4DSL/hardware/demo/demo.h
View File

@@ -31,9 +31,9 @@ enum DEMO_PATTERN {
PATTERN_DEFAULT = 1,
};
static char *pattern_strings_logic[100] = {"RANDOM"};
static char *pattern_strings_dso[100] = {"RANDOM"};
static char *pattern_strings_analog[100] = {"RANDOM"};
static char *pattern_strings_logic[100] = {"random"};
static char *pattern_strings_dso[100] = {"random"};
static char *pattern_strings_analog[100] = {"random"};
static int pattern_logic_count = 1;
static int pattern_dso_count= 1;
static int pattern_analog_count= 1;