Commit 75c9f0d63eee54af8cb9977dee1ffffb39c71a6a
1 parent
2ddb05828a
Exists in
master
and in
2 other branches
V0.3.6
- 에러 발생 임시 마스크 적용
Showing
2 changed files
with
49 additions
and
49 deletions
Show diff stats
app/gui/oven_control/mainwindow.ui
... | ... | @@ -696,7 +696,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
696 | 696 | </font> |
697 | 697 | </property> |
698 | 698 | <property name="text"> |
699 | - <string>V0.3.5</string> | |
699 | + <string>V0.3.6</string> | |
700 | 700 | </property> |
701 | 701 | <property name="alignment"> |
702 | 702 | <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set> | ... | ... |
app/gui/oven_control/ovenstatics.h
... | ... | @@ -281,58 +281,58 @@ private: |
281 | 281 | // }; |
282 | 282 | |
283 | 283 | const uint32_t sensor_err_mask[2][MAX_MODEL_COUNT] = { |
284 | - {0x03fb, //ele10 | |
285 | - 0x03fb, //ele 20 | |
286 | - 0x03fb, //ele 24 | |
287 | - 0x03fb, //ele 40 | |
288 | - 0x03fb, //lpg 10 | |
289 | - 0x03fb, //lpg 20 | |
290 | - 0x03fb, //lpg 24 | |
291 | - 0x03fb, //lpg 40 | |
292 | - 0x03fb, //lng 10 | |
293 | - 0x03fb, //lng 20 | |
294 | - 0x03fb, //lng 24 | |
295 | - 0x03fb //lng40 | |
284 | + {0x0213, //ele10 | |
285 | + 0x0213, //ele 20 | |
286 | + 0x0213, //ele 24 | |
287 | + 0x0213, //ele 40 | |
288 | + 0x0213, //lpg 10 | |
289 | + 0x0213, //lpg 20 | |
290 | + 0x0213, //lpg 24 | |
291 | + 0x0213, //lpg 40 | |
292 | + 0x0213, //lng 10 | |
293 | + 0x0213, //lng 20 | |
294 | + 0x0213, //lng 24 | |
295 | + 0x0213 //lng40 | |
296 | 296 | }, // end of noncooking state |
297 | - {0x03fb, //ele10 | |
298 | - 0x03fb, //ele 20 | |
299 | - 0x03fb, //ele 24 | |
300 | - 0x03fb, //ele 40 | |
301 | - 0x03fb, //lpg 10 | |
302 | - 0x03fb, //lpg 20 | |
303 | - 0x03fb, //lpg 24 | |
304 | - 0x03fb, //lpg 40 | |
305 | - 0x03fb, //lng 10 | |
306 | - 0x03fb, //lng 20 | |
307 | - 0x03fb, //lng 24 | |
308 | - 0x03fb //lng40 | |
297 | + {0x0213, //ele10 | |
298 | + 0x0213, //ele 20 | |
299 | + 0x0213, //ele 24 | |
300 | + 0x0213, //ele 40 | |
301 | + 0x0213, //lpg 10 | |
302 | + 0x0213, //lpg 20 | |
303 | + 0x0213, //lpg 24 | |
304 | + 0x0213, //lpg 40 | |
305 | + 0x0213, //lng 10 | |
306 | + 0x0213, //lng 20 | |
307 | + 0x0213, //lng 24 | |
308 | + 0x0213 //lng40 | |
309 | 309 | }}; |
310 | 310 | const uint32_t state_err_mask[2][MAX_MODEL_COUNT] = { |
311 | - {0x000d, //ele 10 | |
312 | - 0x001f, //ele 20 | |
313 | - 0x000d, //ele 24 | |
314 | - 0x001f, //ele 40 | |
315 | - 0x000d, //lpg 10 | |
316 | - 0x001f, //lpg 20 | |
317 | - 0x000d, //lpg 24 | |
318 | - 0x001f, //lpg 40 | |
319 | - 0x000d, //lng 10 | |
320 | - 0x001f, //lng 20 | |
321 | - 0x000d, //lng 24 | |
322 | - 0x001f //lng 40 | |
311 | + {0x0008, //ele 10 | |
312 | + 0x0018, //ele 20 | |
313 | + 0x0008, //ele 24 | |
314 | + 0x0018, //ele 40 | |
315 | + 0x0008, //lpg 10 | |
316 | + 0x0018, //lpg 20 | |
317 | + 0x0008, //lpg 24 | |
318 | + 0x0018, //lpg 40 | |
319 | + 0x0008, //lng 10 | |
320 | + 0x0018, //lng 20 | |
321 | + 0x0008, //lng 24 | |
322 | + 0x0018 //lng 40 | |
323 | 323 | }, //end of noncooking state |
324 | - {0x000d, //ele 10 | |
325 | - 0x001f, //ele 20 | |
326 | - 0x000d, //ele 24 | |
327 | - 0x001f, //ele 40 | |
328 | - 0x000d, //lpg 10 | |
329 | - 0x001f, //lpg 20 | |
330 | - 0x000d, //lpg 24 | |
331 | - 0x001f, //lpg 40 | |
332 | - 0x000d, //lng 10 | |
333 | - 0x001f, //lng 20 | |
334 | - 0x000d, //lng 24 | |
335 | - 0x001f //lng 40 | |
324 | + {0x0008, //ele 10 | |
325 | + 0x0018, //ele 20 | |
326 | + 0x0008, //ele 24 | |
327 | + 0x0018, //ele 40 | |
328 | + 0x0008, //lpg 10 | |
329 | + 0x0018, //lpg 20 | |
330 | + 0x0008, //lpg 24 | |
331 | + 0x0018, //lpg 40 | |
332 | + 0x0008, //lng 10 | |
333 | + 0x0018, //lng 20 | |
334 | + 0x0008, //lng 24 | |
335 | + 0x0018 //lng 40 | |
336 | 336 | }}; |
337 | 337 | |
338 | 338 | ... | ... |