kopia lustrzana https://gitlab.com/Teuniz/DSRemote
Fix for the broken *IDN? command in FW version 00.04.04 of the DS1054Z
that caused a "can't read" error with USB connection.merge-requests/1/head
rodzic
a12c916407
commit
0591773755
2
global.h
2
global.h
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
|
|
||||||
#define PROGRAM_NAME "DSRemote"
|
#define PROGRAM_NAME "DSRemote"
|
||||||
#define PROGRAM_VERSION "0.32_1603121812"
|
#define PROGRAM_VERSION "0.32_1608042235"
|
||||||
|
|
||||||
#define MAX_PATHLEN 4096
|
#define MAX_PATHLEN 4096
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,8 @@ void UI_Mainwindow::open_connection()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(tmc_write("*IDN?") != 5)
|
// if(tmc_write("*IDN?") != 5)
|
||||||
|
if(tmc_write("*IDN?;:SYST:ERR?") != 16) // This is a fix for the broken *IDN? command
|
||||||
{
|
{
|
||||||
sprintf(str, "Can not write to device %s", dev_str);
|
sprintf(str, "Can not write to device %s", dev_str);
|
||||||
goto OUT_ERROR;
|
goto OUT_ERROR;
|
||||||
|
@ -228,6 +229,18 @@ void UI_Mainwindow::open_connection()
|
||||||
|
|
||||||
strcpy(devparms.softwvers, ptr);
|
strcpy(devparms.softwvers, ptr);
|
||||||
|
|
||||||
|
for(i=0; ; i++)
|
||||||
|
{
|
||||||
|
if(devparms.softwvers[i] == 0) break;
|
||||||
|
|
||||||
|
if(devparms.softwvers[i] == ';')
|
||||||
|
{
|
||||||
|
devparms.softwvers[i] = 0;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if((devparms.modelserie != 6) &&
|
if((devparms.modelserie != 6) &&
|
||||||
(devparms.modelserie != 1))
|
(devparms.modelserie != 1))
|
||||||
{
|
{
|
||||||
|
|
Ładowanie…
Reference in New Issue