누락 기능 개발

- 음향 설정 초기화 기능 추가

누락 기능 개발
- 음향 설정 초기화 기능 추가
고영탁
1 parent be2756ef5b
Showing 3 changed files with 15 additions and 3 deletions Show diff stats
app/gui/oven_control/config.cpp
app/gui/oven_control/config.h
app/gui/oven_control/configwindow.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;
+}
  
  
  
@@ -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);
@@ -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;
-
     }
+
 }
...	...	@@ -83,7 +83,7 @@ void Config::initConfig(){
83	83	configlist.items.resttime_format.d32=0;
84	84	configlist.items.marster_vol.d32=7;
85	85	configlist.items.keypad_sound1.d32=0;
86		- configlist.items.keypad_sound2.d32=0;
	86	+ configlist.items.keypad_sound2.d32=7;
87	87	configlist.items.request_loadexec.d32=6;
88	88	configlist.items.programstep_finish.d32=7;
89	89	configlist.items.cooktime_finish.d32=8;
...	...	@@ -458,6 +458,7 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
458	458	qDebug()<<"Accepted";
459	459	if(idx == config_sound_factory_reset){
460	460	//Sound Fatory Reset
	461	+ soundConfigReset();
461	462	qDebug() << "Process Sound Config Reset";
462	463	}
463	464	}
...	...	@@ -466,6 +467,15 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
466	467	}
467	468	}
468	469
	470	+void Config::soundConfigReset(){
	471	+ configlist.items.marster_vol.d32=7;
	472	+ configlist.items.keypad_sound1.d32=0;
	473	+ configlist.items.keypad_sound2.d32=7;
	474	+ configlist.items.request_loadexec.d32=6;
	475	+ configlist.items.programstep_finish.d32=7;
	476	+ configlist.items.cooktime_finish.d32=8;
	477	+ configlist.items.stoperror_distinguish.d32=9;
	478	+}
469	479
470	480
471	481
...	...
...	...	@@ -346,7 +346,7 @@ class Config : public QObject
346	346	"ILC 조리 온습도 대기시간",
347	347	"조리시간 포맷", //10
348	348	"실시간 단위 설정",
349		- "잔여시간 포맷", //12
	349	+ "잔여시간 시점변경설정", //12
350	350	"마스터 볼륨", //13
351	351	"키패드 소리 - 1",
352	352	"키패드 볼륨 ", //15
...	...	@@ -388,6 +388,7 @@ public:
388	388	static Config getInstance(QObject parent=0);
389	389	//static void init();
390	390	void initConfig(void);
	391	+ void soundConfigReset(void);
391	392	bool loadConfig(void);
392	393	void applyConfig(void);
393	394	bool saveConfig(void);
...	...
...	...	@@ -127,9 +127,10 @@ void ConfigWindow::onConfigBtnClicked(uint16_t id){
127	127	default:
128	128	cfg->execConfigWindow(this,(Define::ConfigType)id);
129	129	if(m_nCurConfigPos != config_menu_favorite) reloadValue();
	130	+ if(id==config_sound_factory_reset) reloadUi();
130	131	break;
131		-
132	132	}
	133	+
133	134	}
134	135
135	136
...	...