Work in progress.

merge-requests/1/head
Teuniz 2015-06-27 23:30:38 +02:00
rodzic bb11eab54e
commit 6e8e11f8cd
2 zmienionych plików z 20 dodań i 2 usunięć

Wyświetl plik

@ -31,7 +31,7 @@
#define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.20_1506272231"
#define PROGRAM_VERSION "0.20_1506272330"
#define MAX_PATHLEN 4096

Wyświetl plik

@ -2485,8 +2485,12 @@ void UI_Mainwindow::set_to_factory()
scrn_timer->stop();
qApp->processEvents();
tmc_write("*RST");
qApp->processEvents();
devparms.timebasescale = 1e-6;
devparms.timebaseoffset = 0;
@ -2555,7 +2559,21 @@ void UI_Mainwindow::set_to_factory()
qApp->processEvents();
sleep(10);
for(i=0; i<50; i++)
{
qApp->processEvents();
usleep(500000);
tmc_write("*OPC?");
tmc_read();
if(device->buf[0] == '1')
{
break;
}
}
if(devparms.modelserie == 6)
{