From 35ba77897ea35d905e7b75da2b33799a6cdc68b1 Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Thu, 1 Jun 2017 17:30:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=88=84=EB=9D=BD=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B0=9C=EB=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 음향 설정 초기화 기능 추가
---
 app/gui/oven_control/config.cpp       | 12 +++++++++++-
 app/gui/oven_control/config.h         |  3 ++-
 app/gui/oven_control/configwindow.cpp |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp
index 6751707..4ae6b98 100644
--- a/app/gui/oven_control/config.cpp
+++ b/app/gui/oven_control/config.cpp
@@ -83,7 +83,7 @@ void Config::initConfig(){
     configlist.items.resttime_format.d32=0;
     configlist.items.marster_vol.d32=7;
     configlist.items.keypad_sound1.d32=0;
-    configlist.items.keypad_sound2.d32=0;
+    configlist.items.keypad_sound2.d32=7;
     configlist.items.request_loadexec.d32=6;
     configlist.items.programstep_finish.d32=7;
     configlist.items.cooktime_finish.d32=8;
@@ -458,6 +458,7 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
         qDebug()<<"Accepted";
         if(idx == config_sound_factory_reset){
             //Sound Fatory Reset
+            soundConfigReset();
             qDebug() << "Process Sound Config Reset";
         }
     }
@@ -466,6 +467,15 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
     }
 }
 
+void Config::soundConfigReset(){
+    configlist.items.marster_vol.d32=7;
+    configlist.items.keypad_sound1.d32=0;
+    configlist.items.keypad_sound2.d32=7;
+    configlist.items.request_loadexec.d32=6;
+    configlist.items.programstep_finish.d32=7;
+    configlist.items.cooktime_finish.d32=8;
+    configlist.items.stoperror_distinguish.d32=9;
+}
 
 
 
diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h
index 9f626aa..41d6765 100644
--- a/app/gui/oven_control/config.h
+++ b/app/gui/oven_control/config.h
@@ -346,7 +346,7 @@ class Config : public QObject
         "ILC 조리 온습도 대기시간",
         "조리시간 포맷", //10
         "실시간 단위 설정",
-        "잔여시간 포맷", //12
+        "잔여시간 시점변경설정", //12
         "마스터 볼륨", //13
         "키패드 소리 - 1",
         "키패드 볼륨 ", //15
@@ -388,6 +388,7 @@ public:
     static Config *getInstance(QObject *parent=0);
     //static void init();
     void initConfig(void);
+    void soundConfigReset(void);
     bool loadConfig(void);
     void applyConfig(void);
     bool saveConfig(void);
diff --git a/app/gui/oven_control/configwindow.cpp b/app/gui/oven_control/configwindow.cpp
index 89c139f..ae8e769 100644
--- a/app/gui/oven_control/configwindow.cpp
+++ b/app/gui/oven_control/configwindow.cpp
@@ -127,9 +127,10 @@ void ConfigWindow::onConfigBtnClicked(uint16_t id){
     default:
         cfg->execConfigWindow(this,(Define::ConfigType)id);
         if(m_nCurConfigPos != config_menu_favorite) reloadValue();
+        if(id==config_sound_factory_reset) reloadUi();
         break;
-
     }
+
 }
 
 
-- 
2.1.4