Commit 65aaca7a62676bdb93f7918d8b708a930c9cd647
1 parent
b3087d7eb0
Exists in
master
and in
2 other branches
GUI V0.3.2
- 에러 일부 비활성화 - 고객사 요청 사항
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/gui/oven_control/mainwindow.ui
| @@ -683,7 +683,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -683,7 +683,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 683 | </font> | 683 | </font> |
| 684 | </property> | 684 | </property> |
| 685 | <property name="text"> | 685 | <property name="text"> |
| 686 | - <string>V0.3.1</string> | 686 | + <string>V0.3.2</string> |
| 687 | </property> | 687 | </property> |
| 688 | <property name="alignment"> | 688 | <property name="alignment"> |
| 689 | <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set> | 689 | <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set> |
app/gui/oven_control/ovenstatics.h
| @@ -16,8 +16,8 @@ | @@ -16,8 +16,8 @@ | ||
| 16 | 16 | ||
| 17 | #define SYS_ERROR_MASK 0x03ff | 17 | #define SYS_ERROR_MASK 0x03ff |
| 18 | #define COMM_ERROR_MASK 0x001f | 18 | #define COMM_ERROR_MASK 0x001f |
| 19 | -#define SENSOR_ERROR_MASK 0x03fb | ||
| 20 | -#define STATE_ERROR_MASK 0x001f | 19 | +#define SENSOR_ERROR_MASK 0x03f3 |
| 20 | +#define STATE_ERROR_MASK 0x0018 | ||
| 21 | 21 | ||
| 22 | #define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff | 22 | #define SYS_ERR_MASK_ERR_CLEAR_COOKING 0x00ff |
| 23 | #define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING 0x00ff | 23 | #define SYS_ERR_MASK_ERR_CLEAR_NONCOOKING 0x00ff |