Commit 43b3aef60c36caf01a629e07ad6353867f99b5dc
1 parent
776411ce50
Exists in
master
and in
2 other branches
버그 수정
- 타이머 삭제 루틴 제거
Showing
5 changed files
with
8 additions
and
8 deletions
Show diff stats
app/gui/oven_control/config.cpp
@@ -84,6 +84,8 @@ QString Config::getValueString(Define::ConfigType idx){ | @@ -84,6 +84,8 @@ QString Config::getValueString(Define::ConfigType idx){ | ||
84 | case 3: | 84 | case 3: |
85 | qstrTemp.sprintf(config_format[(uint32_t)idx], configlist.values[(uint32_t)idx].d32+1); | 85 | qstrTemp.sprintf(config_format[(uint32_t)idx], configlist.values[(uint32_t)idx].d32+1); |
86 | break; | 86 | break; |
87 | + case 0x7f: | ||
88 | + qstrTemp = ""; | ||
87 | } | 89 | } |
88 | return qstrTemp; | 90 | return qstrTemp; |
89 | } | 91 | } |
app/gui/oven_control/config.h
@@ -246,6 +246,7 @@ class Config : public QObject | @@ -246,6 +246,7 @@ class Config : public QObject | ||
246 | * 1 = float | 246 | * 1 = float |
247 | * 2 = only String, | 247 | * 2 = only String, |
248 | * 3 = int +1 | 248 | * 3 = int +1 |
249 | + * 7f = none value | ||
249 | */ | 250 | */ |
250 | const uint8_t config_data_type[MAX_CONFIG_COUNT] = { | 251 | const uint8_t config_data_type[MAX_CONFIG_COUNT] = { |
251 | 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, //Settings | 252 | 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, //Settings |
@@ -253,7 +254,7 @@ class Config : public QObject | @@ -253,7 +254,7 @@ class Config : public QObject | ||
253 | 0x02, 0x02, 0x02,0x02, 0x02,0x02, 0x80, 0x80, 0x80, 0x02, 0x02, | 254 | 0x02, 0x02, 0x02,0x02, 0x02,0x02, 0x80, 0x80, 0x80, 0x02, 0x02, |
254 | 0x80, 0x00, 0x00,0x00, | 255 | 0x80, 0x00, 0x00,0x00, |
255 | 0x80, 0x00, 0x00, | 256 | 0x80, 0x00, 0x00, |
256 | - 0x80, 0x80, 0x80,0x80,0x80,0x80 | 257 | + 0x7F,0x7F,0x7F,0x7F,0x7F,0x7F |
257 | }; | 258 | }; |
258 | 259 | ||
259 | const char config_format_kr[MAX_CONFIG_COUNT][64]={ | 260 | const char config_format_kr[MAX_CONFIG_COUNT][64]={ |
app/gui/oven_control/realtimepartswindow.cpp
@@ -57,9 +57,6 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : | @@ -57,9 +57,6 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : | ||
57 | 57 | ||
58 | RealtimePartsWindow::~RealtimePartsWindow() | 58 | RealtimePartsWindow::~RealtimePartsWindow() |
59 | { | 59 | { |
60 | - timer->stop(); | ||
61 | - delete timer; | ||
62 | - delete ui; | ||
63 | } | 60 | } |
64 | 61 | ||
65 | void RealtimePartsWindow::on_backButton_clicked() | 62 | void RealtimePartsWindow::on_backButton_clicked() |
app/gui/oven_control/realtimesensorwindow.cpp
@@ -65,9 +65,6 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : | @@ -65,9 +65,6 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : | ||
65 | 65 | ||
66 | RealtimeSensorWindow::~RealtimeSensorWindow() | 66 | RealtimeSensorWindow::~RealtimeSensorWindow() |
67 | { | 67 | { |
68 | - timer->stop(); | ||
69 | - delete timer; | ||
70 | - delete ui; | ||
71 | } | 68 | } |
72 | 69 | ||
73 | void RealtimeSensorWindow::on_backButton_clicked() | 70 | void RealtimeSensorWindow::on_backButton_clicked() |
app/gui/oven_control/usbcheckpopupdlg.cpp
@@ -29,5 +29,8 @@ void UsbCheckPopupDlg::on_ctrBtnYes_clicked() | @@ -29,5 +29,8 @@ void UsbCheckPopupDlg::on_ctrBtnYes_clicked() | ||
29 | } | 29 | } |
30 | 30 | ||
31 | void UsbCheckPopupDlg::usbCheckTimerFired(){ | 31 | void UsbCheckPopupDlg::usbCheckTimerFired(){ |
32 | - | 32 | + bool usbDetect = false; |
33 | + if(usbDetect){ | ||
34 | + accept(); | ||
35 | + } | ||
33 | } | 36 | } |