에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 36685016587c79bf79564c108534ea6e09f589d0

Authored by 김태훈
1 parent 083ab1ea05
Exists in master and in 2 other branches fhd, fhd-demo

연동 시험 결과 반영

Showing 7 changed files with 28 additions and 26 deletions   Show diff stats
app/gui/oven_control/componenttestwindow.cpp
  Diff comments   View file @3668501
... ... @@ -32,9 +32,9 @@ void ComponentTestWindow::onDataChanged()
32 32 ui->lampButton->setText("ON");
33 33  
34 34 if (udp->hdm())
35   - ui->damperButton->setText("START");
36   - else
37 35 ui->damperButton->setText("STOP");
  36 + else
  37 + ui->damperButton->setText("START");
38 38 }
39 39  
40 40 void ComponentTestWindow::on_speakerButton_clicked()
... ...
app/gui/oven_control/images/manual/graphe_BTN_Bigsize.png
  Diff comments   View file @3668501

3.77 KB
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @3668501
... ... @@ -433,10 +433,9 @@ margin-bottom: 13px;
433 433 }
434 434  
435 435 QSlider::handle {
436   -background-image: url(:/images/images/manual/010_gauge_sel.png);
437   -width: 22px;
438   -margin-right: -2px;
439   -margin-top: -2px;
  436 +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
  437 +width: 23px;
  438 +margin-bottom: -7px;
440 439 }
441 440  
442 441 QSlider {
... ... @@ -503,10 +502,9 @@ margin-bottom: 13px;
503 502 }
504 503  
505 504 QSlider::handle {
506   -background-image: url(:/images/images/manual/010_gauge_sel.png);
507   -width: 22px;
508   -margin-right: -2px;
509   -margin-top: -2px;
  505 +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
  506 +width: 23px;
  507 +margin-bottom: -7px;
510 508 }
511 509  
512 510 QSlider {
... ... @@ -559,10 +557,9 @@ margin-bottom: 13px;
559 557 }
560 558  
561 559 QSlider::handle {
562   -background-image: url(:/images/images/manual/010_gauge_sel.png);
563   -width: 22px;
564   -margin-right: -2px;
565   -margin-top: -2px;
  560 +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
  561 +width: 23px;
  562 +margin-bottom: -7px;
566 563 }
567 564  
568 565 QSlider {
... ... @@ -653,10 +650,9 @@ margin-bottom: 13px;
653 650 }
654 651  
655 652 QSlider::handle {
656   -background-image: url(:/images/images/manual/010_gauge_sel.png);
657   -width: 22px;
658   -margin-right: -2px;
659   -margin-top: -2px;
  653 +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
  654 +width: 23px;
  655 +margin-bottom: -7px;
660 656 }
661 657  
662 658 QSlider {
... ... @@ -1578,10 +1574,9 @@ margin-bottom: 13px;
1578 1574 }
1579 1575  
1580 1576 QSlider::handle {
1581   -background-image: url(:/images/images/manual/010_gauge_sel.png);
1582   -width: 22px;
1583   -margin-right: -2px;
1584   -margin-top: -2px;
  1577 +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
  1578 +width: 23px;
  1579 +margin-bottom: -7px;
1585 1580 }
1586 1581  
1587 1582 QSlider {
... ...
app/gui/oven_control/oven.cpp
  Diff comments   View file @3668501
... ... @@ -164,6 +164,11 @@ bool Oven::setInterTempEnabled_(bool enabled)
164 164 if (interTempEnabled_ != enabled)
165 165 {
166 166 interTempEnabled_ = enabled;
  167 + if (interTempEnabled_)
  168 + interface->setInterTemp(interTemp_);
  169 + else
  170 + interface->setInterTemp(300);
  171 +
167 172 return true;
168 173 }
169 174  
... ... @@ -184,7 +189,8 @@ bool Oven::setInterTemp_(int celsius)
184 189 if (celsius != interTemp_)
185 190 {
186 191 interTemp_ = celsius;
187   - interface->setInterTemp(celsius);
  192 + if (interTempEnabled_)
  193 + interface->setInterTemp(celsius);
188 194  
189 195 return true;
190 196 }
... ...
app/gui/oven_control/ovencontroller.cpp
  Diff comments   View file @3668501
... ... @@ -2,7 +2,6 @@
2 2  
3 3 OvenController::OvenController(QObject *parent) : OvenInterface(parent)
4 4 {
5   -
6 5 }
7 6  
8 7 void OvenController::setUdpHandler(UdpHandler *udp)
... ... @@ -66,6 +65,7 @@ void OvenController::setFan(int rpm)
66 65 void OvenController::startCooking()
67 66 {
68 67 udp->set(TG_OVEN_MODE, 1);
  68 + udp->set(TG_TIME, 1440);
69 69 udp->turnOn(TG_SYSTEM);
70 70 udp->turnOn(TG_COOKING);
71 71 }
... ...
app/gui/oven_control/packetprinter.cpp
  Diff comments   View file @3668501
... ... @@ -24,7 +24,7 @@ void PacketPrinter::printControl(oven_control_t &control)
24 24  
25 25 stream << "Control\n";
26 26  
27   - for (int idx = 0; idx < sizeof(control) / sizeof(unsigned short); idx++)
  27 + for (int idx = 0; idx < (int) sizeof(control) / sizeof(unsigned short); idx++)
28 28 {
29 29 QString str;
30 30 stream << str.sprintf("0x%04X 0x%04X\n", idx, ((unsigned short *) &control)[idx]);
... ... @@ -40,7 +40,7 @@ void PacketPrinter::printState(oven_state_t &amp;state)
40 40 QTextStream stream(&str);
41 41 stream << "State\n";
42 42  
43   - for (int idx = 0; idx < sizeof(state) / sizeof(unsigned short); idx++)
  43 + for (int idx = 0; idx < (int) sizeof(state) / sizeof(unsigned short); idx++)
44 44 {
45 45 QString str;
46 46 stream << str.sprintf("0x%04X 0x%04X\n", idx, ((unsigned short *) &state)[idx]);
... ...
app/gui/oven_control/resources.qrc
  Diff comments   View file @3668501
... ... @@ -420,5 +420,6 @@
420 420 <file>images/config_service/112_profile_hide_menu_12.png</file>
421 421 <file>images/config_service/112_profile_hide_menu_13.png</file>
422 422 <file>images/config_service/112_profile_hide_menu_14.png</file>
  423 + <file>images/manual/graphe_BTN_Bigsize.png</file>
423 424 </qresource>
424 425 </RCC>
... ...