diff --git a/app/gui/oven_control/adjustmentwindow.cpp b/app/gui/oven_control/adjustmentwindow.cpp new file mode 100644 index 0000000..3df378d --- /dev/null +++ b/app/gui/oven_control/adjustmentwindow.cpp @@ -0,0 +1,14 @@ +#include "adjustmentwindow.h" +#include "ui_adjustmentwindow.h" + +AdjustmentWindow::AdjustmentWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::AdjustmentWindow) +{ + ui->setupUi(this); +} + +AdjustmentWindow::~AdjustmentWindow() +{ + delete ui; +} diff --git a/app/gui/oven_control/adjustmentwindow.h b/app/gui/oven_control/adjustmentwindow.h new file mode 100644 index 0000000..1b70686 --- /dev/null +++ b/app/gui/oven_control/adjustmentwindow.h @@ -0,0 +1,22 @@ +#ifndef ADJUSTMENTWINDOW_H +#define ADJUSTMENTWINDOW_H + +#include + +namespace Ui { +class AdjustmentWindow; +} + +class AdjustmentWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit AdjustmentWindow(QWidget *parent = 0); + ~AdjustmentWindow(); + +private: + Ui::AdjustmentWindow *ui; +}; + +#endif // ADJUSTMENTWINDOW_H diff --git a/app/gui/oven_control/adjustmentwindow.ui b/app/gui/oven_control/adjustmentwindow.ui new file mode 100644 index 0000000..0e0d312 --- /dev/null +++ b/app/gui/oven_control/adjustmentwindow.ui @@ -0,0 +1,24 @@ + + + + + AdjustmentWindow + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + + + + diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index cbfbc61..11fb72d 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -44,7 +44,6 @@ SOURCES += main.cpp\ cooldownpopup.cpp \ engineermenuwindow.cpp \ ovenstatics.cpp \ - popupwindow.cpp \ cookbook.cpp \ define.cpp \ autocook.cpp \ @@ -61,7 +60,8 @@ SOURCES += main.cpp\ realtimesensorwindow.cpp \ bulletindicator.cpp \ soundplayer.cpp \ - servicedata.cpp + servicedata.cpp \ + adjustmentwindow.cpp HEADERS += mainwindow.h \ cook.h \ @@ -95,7 +95,6 @@ HEADERS += mainwindow.h \ cooldownpopup.h \ engineermenuwindow.h \ ovenstatics.h \ - popupwindow.h \ cookbook.h \ define.h \ autocook.h \ @@ -112,7 +111,8 @@ HEADERS += mainwindow.h \ realtimesensorwindow.h \ bulletindicator.h \ soundplayer.h \ - servicedata.h + servicedata.h \ + adjustmentwindow.h FORMS += mainwindow.ui \ manualcookwindow.ui \ @@ -131,7 +131,6 @@ FORMS += mainwindow.ui \ preheatpopup.ui \ cooldownpopup.ui \ engineermenuwindow.ui \ - popupwindow.ui \ keepwarmpopup.ui \ errorpopupdlg.ui \ servicehistorymain.ui \ @@ -142,7 +141,8 @@ FORMS += mainwindow.ui \ operationtimeparts.ui \ realtimemain.ui \ realtimepartswindow.ui \ - realtimesensorwindow.ui + realtimesensorwindow.ui \ + adjustmentwindow.ui RESOURCES += \ resources.qrc diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index 341de97..7187ca0 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -4,7 +4,6 @@ #include #include "mainwindow.h" #include "ovencontroller.h" -#include "popupwindow.h" #include "engineermenuwindow.h" #include "errorpopupdlg.h" #include "historylistwindow.h" diff --git a/app/gui/oven_control/popupwindow.h b/app/gui/oven_control/popupwindow.h deleted file mode 100644 index f2b8a8b..0000000 --- a/app/gui/oven_control/popupwindow.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef POPUPWINDOW_H -#define POPUPWINDOW_H - -#include - -namespace Ui { -class popupWindow; -} - -class popupWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit popupWindow(QWidget *parent = 0, const QString &MsgDesc=0); - ~popupWindow(); - -private slots: - void on_ctrlOkBtn_released(); - -private: - Ui::popupWindow *ui; -}; - -#endif // POPUPWINDOW_H diff --git a/app/gui/oven_control/servicedata.cpp b/app/gui/oven_control/servicedata.cpp index dc8a949..418b383 100644 --- a/app/gui/oven_control/servicedata.cpp +++ b/app/gui/oven_control/servicedata.cpp @@ -8,7 +8,7 @@ #define FRAM_TEST_PROCESS 0 #define fRam_path "/sys/bus/spi/devices/spi0.0/fram" -#define INIT_FRAM 1 +#define INIT_FRAM 0 //시작시 RRAM 초기화 ServiceData::ServiceData() diff --git a/app/gui/oven_control/udphandler.cpp b/app/gui/oven_control/udphandler.cpp index 0e179d8..a93c49a 100644 --- a/app/gui/oven_control/udphandler.cpp +++ b/app/gui/oven_control/udphandler.cpp @@ -46,7 +46,7 @@ void UdpHandler::readPendingDatagrams() void UdpHandler::processDatagram(QByteArray &datagram) { - sock->writeDatagram(datagram, QHostAddress("192.168.4.191"), 40001); + sock->writeDatagram(datagram, QHostAddress("192.168.4.70"), 40001); packet_t *packet = (packet_t *) datagram.data(); switch (packet->header) {