diff --git a/app/gui/oven_control/udphandler.h b/app/gui/oven_control/udphandler.h index 272032b..61dd783 100644 --- a/app/gui/oven_control/udphandler.h +++ b/app/gui/oven_control/udphandler.h @@ -55,6 +55,7 @@ public: bool unp() { return (state.onoff_state2 & 0x0200) != 0; } bool hdm() { return (state.onoff_state2 & 0x0400) != 0; } bool sgnv() { return (state.onoff_state2 & 0x0800) != 0; } + bool inv() {return (state.onoff_state2 & 0x1000) !=0; } signals: void changed(); diff --git a/app/gui/oven_control/valvetestwindow.cpp b/app/gui/oven_control/valvetestwindow.cpp index 44d0ee0..0c54dfa 100644 --- a/app/gui/oven_control/valvetestwindow.cpp +++ b/app/gui/oven_control/valvetestwindow.cpp @@ -116,6 +116,15 @@ void ValveTestWindow::on_steamPumpButton_clicked() steamPumpOn(); } +void ValveTestWindow::on_steamPumpButton_2_clicked() +{ + if (udp->inv()) + steamPumpOff(); + else + steamPumpOn(); +} + + void ValveTestWindow::on_quenchingValveButton_clicked() { if (udp->qnv()) @@ -223,3 +232,14 @@ void ValveTestWindow::cleanValveClose() { udp->turnOff(TG_SGNV); } + +void ValveTestWindow::innerCleanValveOpen() +{ + udp->turnOn(TG_INV); +} + +void ValveTestWindow::innerCleanValveClose() +{ + udp->turnOff(TG_INV); +} + diff --git a/app/gui/oven_control/valvetestwindow.h b/app/gui/oven_control/valvetestwindow.h index 843807d..fd40f8e 100644 --- a/app/gui/oven_control/valvetestwindow.h +++ b/app/gui/oven_control/valvetestwindow.h @@ -32,6 +32,8 @@ private slots: void sideValveClose(); void cleanValveOpen(); void cleanValveClose(); + void innerCleanValveOpen(); + void innerCleanValveClose(); void onDataChanged(); @@ -44,6 +46,8 @@ private slots: void on_backButton_clicked(); + void on_steamPumpButton_2_clicked(); + private: Ui::ValveTestWindow *ui; UdpHandler *udp; diff --git a/app/gui/oven_control/valvetestwindow.ui b/app/gui/oven_control/valvetestwindow.ui index a86484b..3654d64 100644 --- a/app/gui/oven_control/valvetestwindow.ui +++ b/app/gui/oven_control/valvetestwindow.ui @@ -121,7 +121,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b <property name="geometry"> <rect> <x>697</x> - <y>655</y> + <y>593</y> <width>184</width> <height>70</height> </rect> @@ -183,7 +183,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o <property name="geometry"> <rect> <x>697</x> - <y>585</y> + <y>523</y> <width>184</width> <height>70</height> </rect> @@ -763,7 +763,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o <property name="geometry"> <rect> <x>480</x> - <y>585</y> + <y>523</y> <width>211</width> <height>70</height> </rect> @@ -820,7 +820,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o <property name="geometry"> <rect> <x>480</x> - <y>655</y> + <y>593</y> <width>184</width> <height>70</height> </rect> @@ -1062,7 +1062,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o <property name="geometry"> <rect> <x>332</x> - <y>592</y> + <y>530</y> <width>133</width> <height>56</height> </rect> @@ -1078,7 +1078,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o <property name="geometry"> <rect> <x>369</x> - <y>666</y> + <y>604</y> <width>96</width> <height>48</height> </rect> @@ -1194,6 +1194,93 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o <string>서비스단계(엔지니어모드) > 기능테스트 > 급수밸브</string> </property> </widget> + <widget class="QPushButton" name="steamPumpButton_2"> + <property name="geometry"> + <rect> + <x>696</x> + <y>662</y> + <width>184</width> + <height>70</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <family>Roboto</family> + <pointsize>10</pointsize> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="styleSheet"> + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_ov.png); }</string> + </property> + <property name="text"> + <string notr="true">START</string> + </property> + </widget> + <widget class="QLabel" name="label_20"> + <property name="geometry"> + <rect> + <x>479</x> + <y>662</y> + <width>184</width> + <height>70</height> + </rect> + </property> + <property name="palette"> + <palette> + <active> + <colorrole role="WindowText"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + </brush> + </colorrole> + </active> + <inactive> + <colorrole role="WindowText"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + </brush> + </colorrole> + </inactive> + <disabled> + <colorrole role="WindowText"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>123</red> + <green>123</green> + <blue>123</blue> + </color> + </brush> + </colorrole> + </disabled> + </palette> + </property> + <property name="font"> + <font> + <family>Malgun Gothic</family> + <pointsize>11</pointsize> + </font> + </property> + <property name="text"> + <string>내부 세척 밸브</string> + </property> + </widget> </widget> </widget> <customwidgets>