Commit 35ba77897ea35d905e7b75da2b33799a6cdc68b1

Authored by 고영탁
1 parent be2756ef5b
Exists in master and in 2 other branches fhd, fhd-demo

누락 기능 개발

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