에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 4a1cc6a99e65989bb1b8936a87bea85bbd35faf1

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

GUI V0.4.2 

 - 수위 관련 센서 일반 상황에서 에러 발생하도록 수정
Showing 2 changed files with 14 additions and 14 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @4a1cc6a
... ... @@ -5,7 +5,7 @@
5 5  
6 6 #define MAJOR_VER 0
7 7 #define MINOR_VER 4
8   -#define HOTFIX_VER 1
  8 +#define HOTFIX_VER 2
9 9  
10 10 namespace Define
11 11 {
... ...
app/gui/oven_control/ovenstatics.h
  Diff comments   View file @4a1cc6a
... ... @@ -219,18 +219,18 @@ public:
219 219 private:
220 220  
221 221 const uint32_t sys_err_mask[3][MAX_MODEL_COUNT] = {
222   - {0x00b8, //ele_10
223   - 0x00b8, //ele_20
224   - 0x00b8, //ele_24
225   - 0x00b8, //ele_40
226   - 0x00b8, //lpg_10
227   - 0x00b8, //lpg_20
228   - 0x00b8, //lpg_24
229   - 0x00b8, //lpg_40
230   - 0x00b8, //lng_10
231   - 0x00b8, //lng_20
232   - 0x00b8, //lng_24
233   - 0x00b8 //lng_40
  222 + {0x03b8, //ele_10
  223 + 0x03b8, //ele_20
  224 + 0x03b8, //ele_24
  225 + 0x03b8, //ele_40
  226 + 0x03b8, //lpg_10
  227 + 0x03b8, //lpg_20
  228 + 0x03b8, //lpg_24
  229 + 0x03b8, //lpg_40
  230 + 0x03b8, //lng_10
  231 + 0x03b8, //lng_20
  232 + 0x03b8, //lng_24
  233 + 0x03b8 //lng_40
234 234 },// noncooking state
235 235 {0x03bd, //ele_10
236 236 0x03bf, //ele_20
... ... @@ -403,7 +403,7 @@ private:
403 403 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
404 404 error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr}, // SYS_OFF_COOK_OFF state
405 405 {error_type_onlychk,error_type_onlychk,error_type_onlychk,error_type_engclrstopcmd,error_type_engclrstopcmd,
406   - error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_onlychk,error_type_onlychk}, // SYS_ON_COOK_OFF state
  406 + error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_engclrstopcmd,error_type_popclr,error_type_popclr}, // SYS_ON_COOK_OFF state
407 407 {error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,
408 408 error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd,error_type_popclrstopcmd}, // SYS_ON_COOK_ON state
409 409 {error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,error_type_popclr,
... ...