Commit 4e9cd180f046ceda68ae8860612a9041d0e0dd9f

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

중심온도 과열 에러 삭제

app/gui/oven_control/define.h
... ... @@ -5,11 +5,11 @@
5 5  
6 6 #define MAJOR_VER 1
7 7 #define MINOR_VER 2
8   -#define HOTFIX_VER 01
  8 +#define HOTFIX_VER 02
9 9  
10 10 // 0 for normal
11 11 // 1 for premium
12   -#define MODEL_GRADE 1
  12 +#define MODEL_GRADE 0
13 13  
14 14 namespace Define
15 15 {
... ...
app/gui/oven_control/ovenstatics.h
... ... @@ -218,46 +218,48 @@ public:
218 218 void resetSensorHistory(void);
219 219  
220 220 private:
221   -
  221 + /*
  222 + * 180920 : 중심온도 센서 과열 에러 삭제 *
  223 + */
222 224 const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = {
223   - {0x03b8, //ele_10
224   - 0x03b8, //ele_20
225   - 0x03b8, //ele_24
226   - 0x03b8, //ele_40
227   - 0x03b8, //lpg_10
228   - 0x03b8, //lpg_20
229   - 0x03b8, //lpg_24
230   - 0x03b8, //lpg_40
231   - 0x03b8, //lng_10
232   - 0x03b8, //lng_20
233   - 0x03b8, //lng_24
234   - 0x03b8 //lng_40
  225 + {0x0398, //ele_10
  226 + 0x0398, //ele_20
  227 + 0x0398, //ele_24
  228 + 0x0398, //ele_40
  229 + 0x0398, //lpg_10
  230 + 0x0398, //lpg_20
  231 + 0x0398, //lpg_24
  232 + 0x0398, //lpg_40
  233 + 0x0398, //lng_10
  234 + 0x0398, //lng_20
  235 + 0x0398, //lng_24
  236 + 0x0398 //lng_40
235 237 },// noncooking state
236   - {0x03bd, //ele_10
237   - 0x03bf, //ele_20
238   - 0x03bd, //ele_24
239   - 0x03bf, //ele_40
240   - 0x03bd, //lpg_10
241   - 0x03bf, //lpg_20
242   - 0x03bd, //lpg_24
243   - 0x03bf, //lpg_40
244   - 0x03bd, //lng_10
245   - 0x03bf, //lng_20
246   - 0x03bd, //lng_24
247   - 0x03bf //lng_40
  238 + {0x039d, //ele_10
  239 + 0x039f, //ele_20
  240 + 0x039d, //ele_24
  241 + 0x039f, //ele_40
  242 + 0x039d, //lpg_10
  243 + 0x039f, //lpg_20
  244 + 0x039d, //lpg_24
  245 + 0x039f, //lpg_40
  246 + 0x039d, //lng_10
  247 + 0x039f, //lng_20
  248 + 0x039d, //lng_24
  249 + 0x039f //lng_40
248 250 },//cooking state
249   - {0x03bd, //ele_10
250   - 0x03bf, //ele_20
251   - 0x03bd, //ele_24
252   - 0x03bf, //ele_40
253   - 0x03bd, //lpg_10
254   - 0x03bf, //lpg_20
255   - 0x03bd, //lpg_24
256   - 0x03bf, //lpg_40
257   - 0x03bd, //lng_10
258   - 0x03bf, //lng_20
259   - 0x03bd, //lng_24
260   - 0x03bf //lng_40
  251 + {0x039d, //ele_10
  252 + 0x039f, //ele_20
  253 + 0x039d, //ele_24
  254 + 0x039f, //ele_40
  255 + 0x039d, //lpg_10
  256 + 0x039f, //lpg_20
  257 + 0x039d, //lpg_24
  258 + 0x039f, //lpg_40
  259 + 0x039d, //lng_10
  260 + 0x039f, //lng_20
  261 + 0x039d, //lng_24
  262 + 0x039f //lng_40
261 263 } //washing state
262 264 };
263 265 const uint32_t comm_err_mask[3][MAX_MODEL_COUNT] = {
... ... @@ -315,6 +317,8 @@ private:
315 317 // 0x0213 //lng40
316 318 // };
317 319  
  320 +
  321 +
318 322 const uint32_t sensor_err_mask[3][MAX_MODEL_COUNT] = {
319 323 {0x0213, //ele10
320 324 0x0213, //ele 20
... ...