에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 4483bc52fec116609756b36c59fcc6d6eacdf30c

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

오븐 에러발생 수정 

고객사 요청에 따른 에러 팝업 동작 수정
Showing 2 changed files with 14 additions and 14 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @4483bc5
... ... @@ -5,11 +5,11 @@
5 5  
6 6 #define MAJOR_VER 1
7 7 #define MINOR_VER 5
8   -#define HOTFIX_VER 3
  8 +#define HOTFIX_VER 4
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
  Diff comments   View file @4483bc5
... ... @@ -390,17 +390,17 @@ private:
390 390 0x0018 //lng 40
391 391 },
392 392 {0x0000, //ele 10
393   - 0x0000, //ele 20
  393 + 0x0018, //ele 20
394 394 0x0000, //ele 24
395   - 0x0000, //ele 40
  395 + 0x0018, //ele 40
396 396 0x0000, //lpg 10
397   - 0x0000, //lpg 20
  397 + 0x0018, //lpg 20
398 398 0x0000, //lpg 24
399   - 0x0000, //lpg 40
  399 + 0x0018, //lpg 40
400 400 0x0000, //lng 10
401   - 0x0000, //lng 20
  401 + 0x0018, //lng 20
402 402 0x0000, //lng 24
403   - 0x0000 //lng 40
  403 + 0x0018 //lng 40
404 404 }//washing state
405 405 };
406 406  
... ... @@ -412,8 +412,8 @@ private:
412 412 error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_OFF state
413 413 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,
414 414 error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_ON state
415   - {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
416   - error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_WASH state
  415 + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,
  416 + error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_WASH state
417 417 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
418 418 error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_OFF_COOK_ON state
419 419 };
... ... @@ -422,7 +422,7 @@ private:
422 422 {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_OFF
423 423 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_OFF
424 424 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_ON
425   - {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_ON_WASH
  425 + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_WASH
426 426 {error_type_popnonclr,error_type_popnonclr,error_type_popnonclr,error_type_engnonclr,error_type_engnonclr}, //SYS_OFF_COO_ON
427 427 };
428 428  
... ... @@ -430,7 +430,7 @@ private:
430 430 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_OFF
431 431 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_OFF
432 432 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_COO_ON
433   - {error_type_allnone,error_type_allnone,error_type_allnone,error_type_allnone,error_type_allnone}, //SYS_ON_WASH
  433 + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_WASH
434 434 //{error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, //SYS_ON_WASH
435 435 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, //SYS_OFF_COO_ON
436 436 };
... ... @@ -442,8 +442,8 @@ private:
442 442 error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_OFF state
443 443 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_allnone,error_type_popclrstopcmd,error_type_popclrstopcmd,
444 444 error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_ON state
445   - {error_type_popclr,error_type_popclr,error_type_allnone,error_type_allnone,error_type_popclr,
446   - error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_ON_WASH
  445 + {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_allnone,error_type_allnone,error_type_popclrstopcmd,
  446 + error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclrstopcmd}, // SYS_ON_WASH
447 447 {error_type_engnonclr,error_type_popnonclr,error_type_allnone,error_type_popnonclr,error_type_onlychk,
448 448 error_type_popnonclr,error_type_allnone,error_type_allnone,error_type_allnone,error_type_popnonclr}, // SYS_OFF_COOK_ON state same with SYS_OFF_COOK_OFF
449 449 };
... ...