에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit c824bb98b065eab11d968462330efce257ea04e7

Authored by 고영탁
1 parent 987fdc1b74
Exists in master and in 2 other branches fhd, fhd-demo

고객사 수정 요청 

 - 엔지니어 모드 내부 세척 밸브 제어 추가
Showing 4 changed files with 118 additions and 6 deletions   Show diff stats
app/gui/oven_control/udphandler.h
  Diff comments   View file @c824bb9
@@ -55,6 +55,7 @@ public: @@ -55,6 +55,7 @@ public:
55 bool unp() { return (state.onoff_state2 & 0x0200) != 0; } 55 bool unp() { return (state.onoff_state2 & 0x0200) != 0; }
56 bool hdm() { return (state.onoff_state2 & 0x0400) != 0; } 56 bool hdm() { return (state.onoff_state2 & 0x0400) != 0; }
57 bool sgnv() { return (state.onoff_state2 & 0x0800) != 0; } 57 bool sgnv() { return (state.onoff_state2 & 0x0800) != 0; }
  58 + bool inv() {return (state.onoff_state2 & 0x1000) !=0; }
58 59
59 signals: 60 signals:
60 void changed(); 61 void changed();
app/gui/oven_control/valvetestwindow.cpp
  Diff comments   View file @c824bb9
@@ -116,6 +116,15 @@ void ValveTestWindow::on_steamPumpButton_clicked() @@ -116,6 +116,15 @@ void ValveTestWindow::on_steamPumpButton_clicked()
116 steamPumpOn(); 116 steamPumpOn();
117 } 117 }
118 118
  119 +void ValveTestWindow::on_steamPumpButton_2_clicked()
  120 +{
  121 + if (udp->inv())
  122 + steamPumpOff();
  123 + else
  124 + steamPumpOn();
  125 +}
  126 +
  127 +
119 void ValveTestWindow::on_quenchingValveButton_clicked() 128 void ValveTestWindow::on_quenchingValveButton_clicked()
120 { 129 {
121 if (udp->qnv()) 130 if (udp->qnv())
@@ -223,3 +232,14 @@ void ValveTestWindow::cleanValveClose() @@ -223,3 +232,14 @@ void ValveTestWindow::cleanValveClose()
223 { 232 {
224 udp->turnOff(TG_SGNV); 233 udp->turnOff(TG_SGNV);
225 } 234 }
  235 +
  236 +void ValveTestWindow::innerCleanValveOpen()
  237 +{
  238 + udp->turnOn(TG_INV);
  239 +}
  240 +
  241 +void ValveTestWindow::innerCleanValveClose()
  242 +{
  243 + udp->turnOff(TG_INV);
  244 +}
  245 +
app/gui/oven_control/valvetestwindow.h
  Diff comments   View file @c824bb9
@@ -32,6 +32,8 @@ private slots: @@ -32,6 +32,8 @@ private slots:
32 void sideValveClose(); 32 void sideValveClose();
33 void cleanValveOpen(); 33 void cleanValveOpen();
34 void cleanValveClose(); 34 void cleanValveClose();
  35 + void innerCleanValveOpen();
  36 + void innerCleanValveClose();
35 37
36 void onDataChanged(); 38 void onDataChanged();
37 39
@@ -44,6 +46,8 @@ private slots: @@ -44,6 +46,8 @@ private slots:
44 void on_backButton_clicked(); 46 void on_backButton_clicked();
45 47
46 48
  49 + void on_steamPumpButton_2_clicked();
  50 +
47 private: 51 private:
48 Ui::ValveTestWindow *ui; 52 Ui::ValveTestWindow *ui;
49 UdpHandler *udp; 53 UdpHandler *udp;
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @c824bb9
@@ -121,7 +121,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b @@ -121,7 +121,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
121 <property name="geometry"> 121 <property name="geometry">
122 <rect> 122 <rect>
123 <x>697</x> 123 <x>697</x>
124 - <y>655</y> 124 + <y>593</y>
125 <width>184</width> 125 <width>184</width>
126 <height>70</height> 126 <height>70</height>
127 </rect> 127 </rect>
@@ -183,7 +183,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -183,7 +183,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
183 <property name="geometry"> 183 <property name="geometry">
184 <rect> 184 <rect>
185 <x>697</x> 185 <x>697</x>
186 - <y>585</y> 186 + <y>523</y>
187 <width>184</width> 187 <width>184</width>
188 <height>70</height> 188 <height>70</height>
189 </rect> 189 </rect>
@@ -763,7 +763,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -763,7 +763,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
763 <property name="geometry"> 763 <property name="geometry">
764 <rect> 764 <rect>
765 <x>480</x> 765 <x>480</x>
766 - <y>585</y> 766 + <y>523</y>
767 <width>211</width> 767 <width>211</width>
768 <height>70</height> 768 <height>70</height>
769 </rect> 769 </rect>
@@ -820,7 +820,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -820,7 +820,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
820 <property name="geometry"> 820 <property name="geometry">
821 <rect> 821 <rect>
822 <x>480</x> 822 <x>480</x>
823 - <y>655</y> 823 + <y>593</y>
824 <width>184</width> 824 <width>184</width>
825 <height>70</height> 825 <height>70</height>
826 </rect> 826 </rect>
@@ -1062,7 +1062,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1062,7 +1062,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1062 <property name="geometry"> 1062 <property name="geometry">
1063 <rect> 1063 <rect>
1064 <x>332</x> 1064 <x>332</x>
1065 - <y>592</y> 1065 + <y>530</y>
1066 <width>133</width> 1066 <width>133</width>
1067 <height>56</height> 1067 <height>56</height>
1068 </rect> 1068 </rect>
@@ -1078,7 +1078,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1078,7 +1078,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1078 <property name="geometry"> 1078 <property name="geometry">
1079 <rect> 1079 <rect>
1080 <x>369</x> 1080 <x>369</x>
1081 - <y>666</y> 1081 + <y>604</y>
1082 <width>96</width> 1082 <width>96</width>
1083 <height>48</height> 1083 <height>48</height>
1084 </rect> 1084 </rect>
@@ -1194,6 +1194,93 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1194,6 +1194,93 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1194 <string>서비스단계(엔지니어모드) &gt; 기능테스트 &gt; 급수밸브</string> 1194 <string>서비스단계(엔지니어모드) &gt; 기능테스트 &gt; 급수밸브</string>
1195 </property> 1195 </property>
1196 </widget> 1196 </widget>
  1197 + <widget class="QPushButton" name="steamPumpButton_2">
  1198 + <property name="geometry">
  1199 + <rect>
  1200 + <x>696</x>
  1201 + <y>662</y>
  1202 + <width>184</width>
  1203 + <height>70</height>
  1204 + </rect>
  1205 + </property>
  1206 + <property name="sizePolicy">
  1207 + <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
  1208 + <horstretch>0</horstretch>
  1209 + <verstretch>0</verstretch>
  1210 + </sizepolicy>
  1211 + </property>
  1212 + <property name="font">
  1213 + <font>
  1214 + <family>Roboto</family>
  1215 + <pointsize>10</pointsize>
  1216 + <weight>75</weight>
  1217 + <bold>true</bold>
  1218 + </font>
  1219 + </property>
  1220 + <property name="styleSheet">
  1221 + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); }
  1222 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_ov.png); }</string>
  1223 + </property>
  1224 + <property name="text">
  1225 + <string notr="true">START</string>
  1226 + </property>
  1227 + </widget>
  1228 + <widget class="QLabel" name="label_20">
  1229 + <property name="geometry">
  1230 + <rect>
  1231 + <x>479</x>
  1232 + <y>662</y>
  1233 + <width>184</width>
  1234 + <height>70</height>
  1235 + </rect>
  1236 + </property>
  1237 + <property name="palette">
  1238 + <palette>
  1239 + <active>
  1240 + <colorrole role="WindowText">
  1241 + <brush brushstyle="SolidPattern">
  1242 + <color alpha="255">
  1243 + <red>255</red>
  1244 + <green>255</green>
  1245 + <blue>255</blue>
  1246 + </color>
  1247 + </brush>
  1248 + </colorrole>
  1249 + </active>
  1250 + <inactive>
  1251 + <colorrole role="WindowText">
  1252 + <brush brushstyle="SolidPattern">
  1253 + <color alpha="255">
  1254 + <red>255</red>
  1255 + <green>255</green>
  1256 + <blue>255</blue>
  1257 + </color>
  1258 + </brush>
  1259 + </colorrole>
  1260 + </inactive>
  1261 + <disabled>
  1262 + <colorrole role="WindowText">
  1263 + <brush brushstyle="SolidPattern">
  1264 + <color alpha="255">
  1265 + <red>123</red>
  1266 + <green>123</green>
  1267 + <blue>123</blue>
  1268 + </color>
  1269 + </brush>
  1270 + </colorrole>
  1271 + </disabled>
  1272 + </palette>
  1273 + </property>
  1274 + <property name="font">
  1275 + <font>
  1276 + <family>Malgun Gothic</family>
  1277 + <pointsize>11</pointsize>
  1278 + </font>
  1279 + </property>
  1280 + <property name="text">
  1281 + <string>내부 세척 밸브</string>
  1282 + </property>
  1283 + </widget>
1197 </widget> 1284 </widget>
1198 </widget> 1285 </widget>
1199 <customwidgets> 1286 <customwidgets>