에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit fb200c9f180cedd5a581f8ff43de279d605639fe

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

머지 후 컴파일 오류 수정

Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
app/gui/oven_control/historylistwindow.cpp
  Diff comments   View file @fb200c9
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
4 #include <time.h> 4 #include <time.h>
5 #include "historylistwindow.h" 5 #include "historylistwindow.h"
6 #include "ui_historylistwindow.h" 6 #include "ui_historylistwindow.h"
7 -#include "leftitemlinedelegate.h"  
8 #include "ovenstatics.h" 7 #include "ovenstatics.h"
9 8
10 9
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @fb200c9
@@ -88,13 +88,13 @@ void OvenStatics::onDataChanged() @@ -88,13 +88,13 @@ void OvenStatics::onDataChanged()
88 } 88 }
89 curSysErrorState = state.system_error; 89 curSysErrorState = state.system_error;
90 90
91 - errstatetemp = state.reserved2f; 91 + errstatetemp = state.communication_error;
92 if(errstatetemp!=0 && errstatetemp != curCommErrorState ){ 92 if(errstatetemp!=0 && errstatetemp != curCommErrorState ){
93 processCommError( errstatetemp,ltime ); 93 processCommError( errstatetemp,ltime );
94 } 94 }
95 curCommErrorState = errstatetemp; 95 curCommErrorState = errstatetemp;
96 96
97 - errstatetemp = state.reserved30; 97 + errstatetemp = state.sensor_error;
98 if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){ 98 if(errstatetemp!=0 && errstatetemp != curSensorErrorState ){
99 processCommError( errstatetemp,ltime ); 99 processCommError( errstatetemp,ltime );
100 } 100 }