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

Accept more trigger modes when reading settings from scope.

master
Teuniz 2023-09-14 16:31:24 +02:00
rodzic ab76204a40
commit 278e70b662
2 zmienionych plików z 36 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
global.h
Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.40_2304101223"
#define PROGRAM_VERSION "0.40_2309141629"
#define MAX_PATHLEN (1024)
@ -191,8 +191,8 @@ struct device_settings
int triggeredgeslope; // 0=POS, 1=NEG, 2= RFAL
int triggeredgesource; // 0=chan1, 1=chan2, 2=chan3, 3=chan4, 4=ext, 5=ext5, 6=acl, 7=D0, 8=D1, ... ,21=D14, 22=D15
double triggerholdoff; // min. is 16nSec or 100nSec depends on series
int triggermode; // 0=edge, 1=pulse, 2=slope, 3=video, 4=pattern, 5=rs232,
// 6=i2c, 7=spi, 8=can, 9=usb
int triggermode; // 0=edge, 1=pulse, 2=slope, 3=video, 4=pattern, 5=rs232, 6=i2c, 7=spi, 8=can, 9=usb,
// 10=wind, 11=runt, 12=duration, 13=delay, 14=timeout, 15=nedg, 16=shold
int triggerstatus; // 0=td, 1=wait, 2=run, 3=auto, 4=fin, 5=stop
int triggersweep; // 0=auto, 1=normal, 2=single

38
read_settings_thread.cpp
Wyświetl plik

@ -802,11 +802,39 @@ void read_settings_thread::run()
{
devparms->triggermode = 9;
}
else
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
else if(!strcmp(device->buf, "WIND"))
{
devparms->triggermode = 10;
}
else if(!strcmp(device->buf, "RUNT"))
{
devparms->triggermode = 11;
}
else if(!strcmp(device->buf, "DUR"))
{
devparms->triggermode = 12;
}
else if(!strcmp(device->buf, "DEL"))
{
devparms->triggermode = 13;
}
else if(!strcmp(device->buf, "TIM"))
{
devparms->triggermode = 14;
}
else if(!strcmp(device->buf, "NEDG"))
{
devparms->triggermode = 15;
}
else if(!strcmp(device->buf, "SHOL"))
{
devparms->triggermode = 16;
}
else
{
line = __LINE__;
goto GDS_OUT_ERROR;
}
usleep(TMC_GDS_DELAY);