qt: fixed read/write timeouts

bbogush · bbogush · commit 4c2b86f310ce · 2017-04-02T13:21:54.000+03:00
diff --git a/qt/programmer.cpp b/qt/programmer.cpp
@@ -9,7 +9,8 @@
 #define CDC_DEV_NAME "/dev/ttyACM0"
 #define CDC_BUF_SIZE 60
 
-#define READ_WRITE_TIMEOUT_MS 30000
+#define READ_WRITE_TIMEOUT_MS 10
+#define READ_RESP_TIMEOUT_MS 30000
 
 Programmer::Programmer(QObject *parent) : QObject(parent)
 {
@@ -81,7 +82,7 @@ int Programmer::readRespHead(RespHeader *respHead)
 {
     qint64 ret;
 
-    serialPort.waitForReadyRead(READ_WRITE_TIMEOUT_MS);
+    serialPort.waitForReadyRead(READ_RESP_TIMEOUT_MS);
     ret = serialPort.read((char *)respHead, sizeof(RespHeader));
     if (ret < 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`#define CDC_DEV_NAME "/dev/ttyACM0"`
`10`	`10`	`#define CDC_BUF_SIZE 60`
`11`	`11`
`12`		`-#define READ_WRITE_TIMEOUT_MS 30000`
	`12`	`+#define READ_WRITE_TIMEOUT_MS 10`
	`13`	`+#define READ_RESP_TIMEOUT_MS 30000`
`13`	`14`
`14`	`15`	`Programmer::Programmer(QObject *parent) : QObject(parent)`
`15`	`16`	`{`
`@@ -81,7 +82,7 @@ int Programmer::readRespHead(RespHeader *respHead)`
`81`	`82`	`{`
`82`	`83`	`qint64 ret;`
`83`	`84`
`84`		`- serialPort.waitForReadyRead(READ_WRITE_TIMEOUT_MS);`
	`85`	`+ serialPort.waitForReadyRead(READ_RESP_TIMEOUT_MS);`
`85`	`86`	`ret = serialPort.read((char *)respHead, sizeof(RespHeader));`
`86`	`87`	`if (ret < 0)`
`87`	`88`	`{`