Commit 625bebad762ff19dfd312415c5cdc659e0476fbe
1 parent
960048ca60
Exists in
master
and in
2 other branches
메인 보드 On/Off 관련 루틴 제거
- 항상 On으로 유지
Showing
7 changed files
with
11 additions
and
14 deletions
Show diff stats
app/gui/oven_control/burnertestwindow.cpp
| @@ -25,7 +25,6 @@ BurnerTestWindow::BurnerTestWindow(QWidget *parent) : | @@ -25,7 +25,6 @@ BurnerTestWindow::BurnerTestWindow(QWidget *parent) : | ||
| 25 | connect(this->udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 25 | connect(this->udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 26 | 26 | ||
| 27 | udp->set(TG_OVEN_MODE, 4); | 27 | udp->set(TG_OVEN_MODE, 4); |
| 28 | - udp->turnOn(TG_SYSTEM); | ||
| 29 | udp->turnOn(TG_MANUAL_BURNER1); | 28 | udp->turnOn(TG_MANUAL_BURNER1); |
| 30 | udp->turnOn(TG_MANUAL_BURNER2); | 29 | udp->turnOn(TG_MANUAL_BURNER2); |
| 31 | udp->turnOn(TG_MANUAL_BURNER3); | 30 | udp->turnOn(TG_MANUAL_BURNER3); |
| @@ -143,7 +142,6 @@ void BurnerTestWindow::on_backButton_clicked() | @@ -143,7 +142,6 @@ void BurnerTestWindow::on_backButton_clicked() | ||
| 143 | udp->turnOff(TG_MANUAL_BURNER1); | 142 | udp->turnOff(TG_MANUAL_BURNER1); |
| 144 | udp->turnOff(TG_MANUAL_BURNER2); | 143 | udp->turnOff(TG_MANUAL_BURNER2); |
| 145 | udp->turnOff(TG_MANUAL_BURNER3); | 144 | udp->turnOff(TG_MANUAL_BURNER3); |
| 146 | - udp->turnOff(TG_SYSTEM); | ||
| 147 | 145 | ||
| 148 | close(); | 146 | close(); |
| 149 | } | 147 | } |
app/gui/oven_control/componenttestwindow.cpp
| @@ -17,7 +17,6 @@ ComponentTestWindow::ComponentTestWindow(QWidget *parent) : | @@ -17,7 +17,6 @@ ComponentTestWindow::ComponentTestWindow(QWidget *parent) : | ||
| 17 | connect(&damperTimer, SIGNAL(timeout()), this, SLOT(damperOff())); | 17 | connect(&damperTimer, SIGNAL(timeout()), this, SLOT(damperOff())); |
| 18 | 18 | ||
| 19 | udp->set(TG_OVEN_MODE, 4); | 19 | udp->set(TG_OVEN_MODE, 4); |
| 20 | - udp->turnOn(TG_SYSTEM); | ||
| 21 | udp->turnOn(TG_MANUAL_RELAY); | 20 | udp->turnOn(TG_MANUAL_RELAY); |
| 22 | 21 | ||
| 23 | onDataChanged(); | 22 | onDataChanged(); |
| @@ -72,8 +71,9 @@ void ComponentTestWindow::on_backButton_clicked() | @@ -72,8 +71,9 @@ void ComponentTestWindow::on_backButton_clicked() | ||
| 72 | { | 71 | { |
| 73 | damperTimer.stop(); | 72 | damperTimer.stop(); |
| 74 | 73 | ||
| 74 | + udp->turnOff(TG_HL); | ||
| 75 | + udp->turnOff(TG_HDM); | ||
| 75 | udp->turnOff(TG_MANUAL_RELAY); | 76 | udp->turnOff(TG_MANUAL_RELAY); |
| 76 | - udp->turnOff(TG_SYSTEM); | ||
| 77 | 77 | ||
| 78 | close(); | 78 | close(); |
| 79 | } | 79 | } |
app/gui/oven_control/fantestwindow.cpp
| @@ -18,7 +18,6 @@ FanTestWindow::FanTestWindow(QWidget *parent) : | @@ -18,7 +18,6 @@ FanTestWindow::FanTestWindow(QWidget *parent) : | ||
| 18 | rpm1 = rpm2 = 500; | 18 | rpm1 = rpm2 = 500; |
| 19 | 19 | ||
| 20 | udp->set(TG_OVEN_MODE, 4); | 20 | udp->set(TG_OVEN_MODE, 4); |
| 21 | - udp->turnOn(TG_SYSTEM); | ||
| 22 | udp->turnOn(TG_MANUAL_FAN1); | 21 | udp->turnOn(TG_MANUAL_FAN1); |
| 23 | udp->turnOn(TG_MANUAL_FAN2); | 22 | udp->turnOn(TG_MANUAL_FAN2); |
| 24 | udp->set(TG_FAN1_RPM, rpm1); | 23 | udp->set(TG_FAN1_RPM, rpm1); |
| @@ -241,9 +240,12 @@ void FanTestWindow::on_backButton_clicked() | @@ -241,9 +240,12 @@ void FanTestWindow::on_backButton_clicked() | ||
| 241 | stop(Fan1); | 240 | stop(Fan1); |
| 242 | stop(Fan2); | 241 | stop(Fan2); |
| 243 | 242 | ||
| 243 | + udp->set(TG_FAN1_RPM, 500); | ||
| 244 | + udp->set(TG_FAN2_RPM, 500); | ||
| 245 | + udp->set(TG_FAN1_DIRECTOIN, 0); | ||
| 246 | + udp->set(TG_FAN2_DIRECTOIN, 0); | ||
| 244 | udp->turnOff(TG_MANUAL_FAN1); | 247 | udp->turnOff(TG_MANUAL_FAN1); |
| 245 | udp->turnOff(TG_MANUAL_FAN2); | 248 | udp->turnOff(TG_MANUAL_FAN2); |
| 246 | - udp->turnOff(TG_SYSTEM); | ||
| 247 | 249 | ||
| 248 | deleteLater(); | 250 | deleteLater(); |
| 249 | } | 251 | } |
app/gui/oven_control/ovencontroller.cpp
| @@ -114,7 +114,6 @@ void OvenController::startCooking() | @@ -114,7 +114,6 @@ void OvenController::startCooking() | ||
| 114 | qDebug() << "Start Cooking"; | 114 | qDebug() << "Start Cooking"; |
| 115 | udp->set(TG_OVEN_MODE, 1); | 115 | udp->set(TG_OVEN_MODE, 1); |
| 116 | udp->set(TG_TIME, 1440); | 116 | udp->set(TG_TIME, 1440); |
| 117 | - udp->turnOn(TG_SYSTEM); | ||
| 118 | udp->turnOn(TG_COOKING); | 117 | udp->turnOn(TG_COOKING); |
| 119 | } | 118 | } |
| 120 | 119 | ||
| @@ -129,7 +128,6 @@ void OvenController::startPreheating() | @@ -129,7 +128,6 @@ void OvenController::startPreheating() | ||
| 129 | qDebug() << "Start Preheating"; | 128 | qDebug() << "Start Preheating"; |
| 130 | udp->set(TG_OVEN_MODE, 1); | 129 | udp->set(TG_OVEN_MODE, 1); |
| 131 | udp->set(TG_TIME, 1440); | 130 | udp->set(TG_TIME, 1440); |
| 132 | - udp->turnOn(TG_SYSTEM); | ||
| 133 | udp->turnOn(TG_PREHEAT); | 131 | udp->turnOn(TG_PREHEAT); |
| 134 | } | 132 | } |
| 135 | 133 |
app/gui/oven_control/valvetestwindow.cpp
| @@ -14,7 +14,6 @@ ValveTestWindow::ValveTestWindow(QWidget *parent) : | @@ -14,7 +14,6 @@ ValveTestWindow::ValveTestWindow(QWidget *parent) : | ||
| 14 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 14 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 15 | 15 | ||
| 16 | udp->set(TG_OVEN_MODE, 4); | 16 | udp->set(TG_OVEN_MODE, 4); |
| 17 | - udp->turnOn(TG_SYSTEM); | ||
| 18 | udp->turnOn(TG_MANUAL_RELAY); | 17 | udp->turnOn(TG_MANUAL_RELAY); |
| 19 | 18 | ||
| 20 | onDataChanged(); | 19 | onDataChanged(); |
| @@ -106,8 +105,12 @@ void ValveTestWindow::on_backButton_clicked() | @@ -106,8 +105,12 @@ void ValveTestWindow::on_backButton_clicked() | ||
| 106 | quenchingValveClose(); | 105 | quenchingValveClose(); |
| 107 | sideValveClose(); | 106 | sideValveClose(); |
| 108 | 107 | ||
| 108 | + udp->turnOff(TG_SSV); | ||
| 109 | + udp->turnOff(TG_DP); | ||
| 110 | + udp->turnOff(TG_QNV); | ||
| 111 | + udp->turnOff(TG_SNV); | ||
| 112 | + udp->turnOff(TG_SGNV); | ||
| 109 | udp->turnOff(TG_MANUAL_RELAY); | 113 | udp->turnOff(TG_MANUAL_RELAY); |
| 110 | - udp->turnOff(TG_SYSTEM); | ||
| 111 | 114 | ||
| 112 | close(); | 115 | close(); |
| 113 | } | 116 | } |
app/gui/oven_control/washtestwindow.cpp
| @@ -14,7 +14,6 @@ WashTestWindow::WashTestWindow(QWidget *parent) : | @@ -14,7 +14,6 @@ WashTestWindow::WashTestWindow(QWidget *parent) : | ||
| 14 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 14 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 15 | 15 | ||
| 16 | udp->set(TG_OVEN_MODE, 4); | 16 | udp->set(TG_OVEN_MODE, 4); |
| 17 | - udp->turnOn(TG_SYSTEM); | ||
| 18 | udp->turnOn(TG_MANUAL_RELAY); | 17 | udp->turnOn(TG_MANUAL_RELAY); |
| 19 | 18 | ||
| 20 | onDataChanged(); | 19 | onDataChanged(); |
| @@ -85,7 +84,6 @@ void WashTestWindow::on_backButton_clicked() | @@ -85,7 +84,6 @@ void WashTestWindow::on_backButton_clicked() | ||
| 85 | drainValveClose(); | 84 | drainValveClose(); |
| 86 | 85 | ||
| 87 | udp->turnOff(TG_MANUAL_RELAY); | 86 | udp->turnOff(TG_MANUAL_RELAY); |
| 88 | - udp->turnOff(TG_SYSTEM); | ||
| 89 | 87 | ||
| 90 | close(); | 88 | close(); |
| 91 | } | 89 | } |
app/gui/oven_control/washwindow.cpp
| @@ -20,7 +20,6 @@ WashWindow::WashWindow(QWidget *parent) : | @@ -20,7 +20,6 @@ WashWindow::WashWindow(QWidget *parent) : | ||
| 20 | setAttribute(Qt::WA_DeleteOnClose); | 20 | setAttribute(Qt::WA_DeleteOnClose); |
| 21 | 21 | ||
| 22 | udp = UdpHandler::getInstance(); | 22 | udp = UdpHandler::getInstance(); |
| 23 | - udp->turnOff(TG_SYSTEM); | ||
| 24 | connect(udp, SIGNAL(changed()), SLOT(onChanged())); | 23 | connect(udp, SIGNAL(changed()), SLOT(onChanged())); |
| 25 | 24 | ||
| 26 | ui->animation->load(":/images/animation/wash_04.png"); | 25 | ui->animation->load(":/images/animation/wash_04.png"); |
| @@ -74,7 +73,6 @@ void WashWindow::start(int type) | @@ -74,7 +73,6 @@ void WashWindow::start(int type) | ||
| 74 | ui->animation->start(300); | 73 | ui->animation->start(300); |
| 75 | 74 | ||
| 76 | udp->set(TG_OVEN_MODE, 2); | 75 | udp->set(TG_OVEN_MODE, 2); |
| 77 | - udp->turnOn(TG_SYSTEM); | ||
| 78 | } | 76 | } |
| 79 | 77 | ||
| 80 | void WashWindow::stop() | 78 | void WashWindow::stop() |