From 625bebad762ff19dfd312415c5cdc659e0476fbe Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 17 May 2017 12:58:15 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=B3=B4=EB=93=9C=20On/Of?= =?UTF-8?q?f=20=EA=B4=80=EB=A0=A8=20=EB=A3=A8=ED=8B=B4=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20=20-=20=ED=95=AD=EC=83=81=20On=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/burnertestwindow.cpp | 2 -- app/gui/oven_control/componenttestwindow.cpp | 4 ++-- app/gui/oven_control/fantestwindow.cpp | 6 ++++-- app/gui/oven_control/ovencontroller.cpp | 2 -- app/gui/oven_control/valvetestwindow.cpp | 7 +++++-- app/gui/oven_control/washtestwindow.cpp | 2 -- app/gui/oven_control/washwindow.cpp | 2 -- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/gui/oven_control/burnertestwindow.cpp b/app/gui/oven_control/burnertestwindow.cpp index 4e22698..cabe09b 100644 --- a/app/gui/oven_control/burnertestwindow.cpp +++ b/app/gui/oven_control/burnertestwindow.cpp @@ -25,7 +25,6 @@ BurnerTestWindow::BurnerTestWindow(QWidget *parent) : connect(this->udp, SIGNAL(changed()), this, SLOT(onDataChanged())); udp->set(TG_OVEN_MODE, 4); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_MANUAL_BURNER1); udp->turnOn(TG_MANUAL_BURNER2); udp->turnOn(TG_MANUAL_BURNER3); @@ -143,7 +142,6 @@ void BurnerTestWindow::on_backButton_clicked() udp->turnOff(TG_MANUAL_BURNER1); udp->turnOff(TG_MANUAL_BURNER2); udp->turnOff(TG_MANUAL_BURNER3); - udp->turnOff(TG_SYSTEM); close(); } diff --git a/app/gui/oven_control/componenttestwindow.cpp b/app/gui/oven_control/componenttestwindow.cpp index a978f75..81dd772 100644 --- a/app/gui/oven_control/componenttestwindow.cpp +++ b/app/gui/oven_control/componenttestwindow.cpp @@ -17,7 +17,6 @@ ComponentTestWindow::ComponentTestWindow(QWidget *parent) : connect(&damperTimer, SIGNAL(timeout()), this, SLOT(damperOff())); udp->set(TG_OVEN_MODE, 4); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_MANUAL_RELAY); onDataChanged(); @@ -72,8 +71,9 @@ void ComponentTestWindow::on_backButton_clicked() { damperTimer.stop(); + udp->turnOff(TG_HL); + udp->turnOff(TG_HDM); udp->turnOff(TG_MANUAL_RELAY); - udp->turnOff(TG_SYSTEM); close(); } diff --git a/app/gui/oven_control/fantestwindow.cpp b/app/gui/oven_control/fantestwindow.cpp index b94fb99..a6d08c6 100644 --- a/app/gui/oven_control/fantestwindow.cpp +++ b/app/gui/oven_control/fantestwindow.cpp @@ -18,7 +18,6 @@ FanTestWindow::FanTestWindow(QWidget *parent) : rpm1 = rpm2 = 500; udp->set(TG_OVEN_MODE, 4); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_MANUAL_FAN1); udp->turnOn(TG_MANUAL_FAN2); udp->set(TG_FAN1_RPM, rpm1); @@ -241,9 +240,12 @@ void FanTestWindow::on_backButton_clicked() stop(Fan1); stop(Fan2); + udp->set(TG_FAN1_RPM, 500); + udp->set(TG_FAN2_RPM, 500); + udp->set(TG_FAN1_DIRECTOIN, 0); + udp->set(TG_FAN2_DIRECTOIN, 0); udp->turnOff(TG_MANUAL_FAN1); udp->turnOff(TG_MANUAL_FAN2); - udp->turnOff(TG_SYSTEM); deleteLater(); } diff --git a/app/gui/oven_control/ovencontroller.cpp b/app/gui/oven_control/ovencontroller.cpp index b246c62..560e336 100644 --- a/app/gui/oven_control/ovencontroller.cpp +++ b/app/gui/oven_control/ovencontroller.cpp @@ -114,7 +114,6 @@ void OvenController::startCooking() qDebug() << "Start Cooking"; udp->set(TG_OVEN_MODE, 1); udp->set(TG_TIME, 1440); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_COOKING); } @@ -129,7 +128,6 @@ void OvenController::startPreheating() qDebug() << "Start Preheating"; udp->set(TG_OVEN_MODE, 1); udp->set(TG_TIME, 1440); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_PREHEAT); } diff --git a/app/gui/oven_control/valvetestwindow.cpp b/app/gui/oven_control/valvetestwindow.cpp index 2d7eeb4..966dbb2 100644 --- a/app/gui/oven_control/valvetestwindow.cpp +++ b/app/gui/oven_control/valvetestwindow.cpp @@ -14,7 +14,6 @@ ValveTestWindow::ValveTestWindow(QWidget *parent) : connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); udp->set(TG_OVEN_MODE, 4); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_MANUAL_RELAY); onDataChanged(); @@ -106,8 +105,12 @@ void ValveTestWindow::on_backButton_clicked() quenchingValveClose(); sideValveClose(); + udp->turnOff(TG_SSV); + udp->turnOff(TG_DP); + udp->turnOff(TG_QNV); + udp->turnOff(TG_SNV); + udp->turnOff(TG_SGNV); udp->turnOff(TG_MANUAL_RELAY); - udp->turnOff(TG_SYSTEM); close(); } diff --git a/app/gui/oven_control/washtestwindow.cpp b/app/gui/oven_control/washtestwindow.cpp index da5aafd..16e0ad0 100644 --- a/app/gui/oven_control/washtestwindow.cpp +++ b/app/gui/oven_control/washtestwindow.cpp @@ -14,7 +14,6 @@ WashTestWindow::WashTestWindow(QWidget *parent) : connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); udp->set(TG_OVEN_MODE, 4); - udp->turnOn(TG_SYSTEM); udp->turnOn(TG_MANUAL_RELAY); onDataChanged(); @@ -85,7 +84,6 @@ void WashTestWindow::on_backButton_clicked() drainValveClose(); udp->turnOff(TG_MANUAL_RELAY); - udp->turnOff(TG_SYSTEM); close(); } diff --git a/app/gui/oven_control/washwindow.cpp b/app/gui/oven_control/washwindow.cpp index 2e82263..218f8fa 100644 --- a/app/gui/oven_control/washwindow.cpp +++ b/app/gui/oven_control/washwindow.cpp @@ -20,7 +20,6 @@ WashWindow::WashWindow(QWidget *parent) : setAttribute(Qt::WA_DeleteOnClose); udp = UdpHandler::getInstance(); - udp->turnOff(TG_SYSTEM); connect(udp, SIGNAL(changed()), SLOT(onChanged())); ui->animation->load(":/images/animation/wash_04.png"); @@ -74,7 +73,6 @@ void WashWindow::start(int type) ui->animation->start(300); udp->set(TG_OVEN_MODE, 2); - udp->turnOn(TG_SYSTEM); } void WashWindow::stop() -- 2.1.4