mirror
/
DSRemote
kopia lustrzana https://gitlab.com/Teuniz/DSRemote
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Minor merge branch 'master' of https://gitlab.com/Teuniz/DSRemote

merge-requests/1/merge
Teuniz 2020-12-07 09:36:50 +01:00
rodzic fb9f22458b 9fb5ac3378
commit c43d3265ef
3 zmienionych plików z 56 dodań i 44 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
global.h
Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote" #define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.37_2012070931" #define PROGRAM_VERSION "0.37_2008071327"
#define MAX_PATHLEN 1024 #define MAX_PATHLEN 1024

9
mainwindow.cpp
Wyświetl plik

@ -1214,6 +1214,15 @@ void UI_Mainwindow::get_device_model(const char *str)
devparms.modelserie = 1; devparms.modelserie = 1;
} }
if(!strcmp(str, "DS1202Z-E"))
{
devparms.channel_cnt = 2;
devparms.bandwidth = 200;
devparms.modelserie = 1;
}
if(devparms.modelserie == 1) if(devparms.modelserie == 1)
{ {
if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10; if(devparms.use_extra_vertdivisions) devparms.vertdivisions = 10;

89
read_settings_thread.cpp
Wyświetl plik

@ -1760,60 +1760,63 @@ void read_settings_thread::run()
devparms->math_decode_threshold[1] = atof(device->buf); devparms->math_decode_threshold[1] = atof(device->buf);
usleep(TMC_GDS_DELAY); if(devparms->channel_cnt == 4)
if(devparms->modelserie != 1)
{ {
if(tmc_write(":BUS1:SPI:SCLK:THR?") != 19) usleep(TMC_GDS_DELAY);
if(devparms->modelserie != 1)
{
if(tmc_write(":BUS1:SPI:SCLK:THR?") != 19)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
}
else
{
if(tmc_write(":DEC1:THRE:CHAN3?") != 17)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
}
if(tmc_read() < 1)
{ {
line = __LINE__; line = __LINE__;
goto GDS_OUT_ERROR; goto GDS_OUT_ERROR;
} }
}
else devparms->math_decode_threshold[2] = atof(device->buf);
{
if(tmc_write(":DEC1:THRE:CHAN3?") != 17) usleep(TMC_GDS_DELAY);
if(devparms->modelserie != 1)
{
if(tmc_write(":BUS1:SPI:SS:THR?") != 17)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
}
else
{
if(tmc_write(":DEC1:THRE:CHAN4?") != 17)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
}
if(tmc_read() < 1)
{ {
line = __LINE__; line = __LINE__;
goto GDS_OUT_ERROR; goto GDS_OUT_ERROR;
} }
devparms->math_decode_threshold[3] = atof(device->buf);
} }
if(tmc_read() < 1)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
devparms->math_decode_threshold[2] = atof(device->buf);
usleep(TMC_GDS_DELAY);
if(devparms->modelserie != 1)
{
if(tmc_write(":BUS1:SPI:SS:THR?") != 17)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
}
else
{
if(tmc_write(":DEC1:THRE:CHAN4?") != 17)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
}
if(tmc_read() < 1)
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
devparms->math_decode_threshold[3] = atof(device->buf);
if(devparms->modelserie != 1) if(devparms->modelserie != 1)
{ {
usleep(TMC_GDS_DELAY); usleep(TMC_GDS_DELAY);