에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit e24704e9edbfd5fd95459684a206fe190060186a

Authored by 고영탁
1 parent 16ef5d842d
Exists in master

V2.02 통신 Timeout 시간 30초로 변경

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @e24704e
@@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
5 5
6 #define MAJOR_VER 2 6 #define MAJOR_VER 2
7 #define MINOR_VER 0 7 #define MINOR_VER 0
8 -#define HOTFIX_VER 1 8 +#define HOTFIX_VER 2
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
12 -#define MODEL_GRADE 1 12 +#define MODEL_GRADE 0
13 13
14 namespace Define 14 namespace Define
15 { 15 {
app/gui/oven_control/udphandler.cpp
  Diff comments   View file @e24704e
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 #define IPC_UDP_SYS_HOST "127.0.0.1" 7 #define IPC_UDP_SYS_HOST "127.0.0.1"
8 #define IPC_UDP_SYS_PORT 4001 8 #define IPC_UDP_SYS_PORT 4001
9 #define IPC_UDP_GUI_PORT 4000 9 #define IPC_UDP_GUI_PORT 4000
  10 +#define COMM_TIMEOUT_SEC 30
10 11
11 typedef struct { 12 typedef struct {
12 int header; 13 int header;
@@ -22,7 +23,7 @@ UdpHandler::UdpHandler(QObject *parent) : QObject(parent) @@ -22,7 +23,7 @@ UdpHandler::UdpHandler(QObject *parent) : QObject(parent)
22 23
23 emitted = false; 24 emitted = false;
24 emitTimeoutTimer.setSingleShot(true); 25 emitTimeoutTimer.setSingleShot(true);
25 - emitTimeoutTimer.setInterval(10 * 1000); 26 + emitTimeoutTimer.setInterval(COMM_TIMEOUT_SEC * 1000);
26 connect(&emitTimeoutTimer, SIGNAL(timeout()), SLOT(emitTimeout())); 27 connect(&emitTimeoutTimer, SIGNAL(timeout()), SLOT(emitTimeout()));
27 28
28 emitTimeoutTimer.start(); 29 emitTimeoutTimer.start();