예열 완료 조건 변경

- 습도 비교 없이 목표 온도 도달만 검사

예열 완료 조건 변경
- 습도 비교 없이 목표 온도 도달만 검사
김태훈
1 parent bae3714545
Showing 2 changed files with 2 additions and 3 deletions Show diff stats
app/gui/oven_control/autocook.cpp
app/gui/oven_control/preheatpopup.cpp
@@ -254,8 +254,7 @@ bool AutoCook::advance()
     switch (Define::classify(currentStep.type))
     {
     case Define::PreheatClass:
-        if (oven->currentHumidity() >= currentStep.humidity
-                && oven->currentTemp() >= currentStep.temp)
+        if (oven->currentTemp() >= currentStep.temp)
         {
             nextStep();
@@ -99,7 +99,7 @@ void PreheatPopup::showCurrentTemp()
 void PreheatPopup::onOvenChanged()
 {
-    if (oven->currentHumidity() >= oven->humidity() && oven->currentTemp() >= oven->temp())
+    if (oven->currentTemp() >= oven->temp())
     {
         stop();
         close();
	@@ -99,7 +99,7 @@ void PreheatPopup::showCurrentTemp()		@@ -99,7 +99,7 @@ void PreheatPopup::showCurrentTemp()
99		99
100	void PreheatPopup::onOvenChanged()	100	void PreheatPopup::onOvenChanged()
101	{	101	{
102	- if (oven->currentHumidity() >= oven->humidity() && oven->currentTemp() >= oven->temp())	102	+ if (oven->currentTemp() >= oven->temp())
103	{	103	{
104	stop();	104	stop();
105	close();	105	close();