Included DS1104Z-S Plus, DS1074Z Plus and DS1074Z-S Plus to the device list.

merge-requests/1/head
Teuniz 2017-06-03 08:47:50 +02:00
rodzic 59e32e34a5
commit d5d7dc33fc
2 zmienionych plików z 40 dodań i 1 usunięć

Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote" #define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.35_1706022131" #define PROGRAM_VERSION "0.35_1706030846"
#define MAX_PATHLEN 4096 #define MAX_PATHLEN 4096

Wyświetl plik

@ -1096,6 +1096,32 @@ void UI_Mainwindow::get_device_model(const char *str)
if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10; if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10;
} }
if(!strcmp(str, "DS1074Z Plus"))
{
devparms.channel_cnt = 4;
devparms.bandwidth = 70;
devparms.modelserie = 1;
devparms.hordivisions = 12;
if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10;
}
if(!strcmp(str, "DS1074Z-S Plus"))
{
devparms.channel_cnt = 4;
devparms.bandwidth = 70;
devparms.modelserie = 1;
devparms.hordivisions = 12;
if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10;
}
if(!strcmp(str, "DS1104Z")) if(!strcmp(str, "DS1104Z"))
{ {
devparms.channel_cnt = 4; devparms.channel_cnt = 4;
@ -1135,6 +1161,19 @@ void UI_Mainwindow::get_device_model(const char *str)
if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10; if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10;
} }
if(!strcmp(str, "DS1104Z-S Plus"))
{
devparms.channel_cnt = 4;
devparms.bandwidth = 100;
devparms.modelserie = 1;
devparms.hordivisions = 12;
if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10;
}
if(devparms.channel_cnt && devparms.bandwidth && devparms.modelserie) if(devparms.channel_cnt && devparms.bandwidth && devparms.modelserie)
{ {
strcpy(devparms.modelname, str); strcpy(devparms.modelname, str);