Rev 229 | Rev 242 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 229 | Rev 233 | ||
|---|---|---|---|
| Line 473... | Line 473... | ||
| 473 | 473 | ||
| 474 | switch(state) |
474 | switch(state) |
| Line 475... | Line 475... | ||
| 475 | { |
475 | { |
| 476 | - | ||
| 477 | case STATEID_RESET_PARAMS: |
- | |
| - | 476 | ||
| 478 | mk.watchdog.act_paramset=0; |
477 | case STATEID_RESET_PARAMS: |
| 479 | mk.params.reset(); |
478 | |
| - | 479 | if (mk.bootloader_finish_ok) |
|
| - | 480 | { |
|
| 480 | if (mk.bootloader_finish_ok) |
481 | mk.params.reset(); |
| 481 | { |
482 | mk.watchdog.act_paramset=0; |
| 482 | nextstate=STATEID_PARAM_MENU; |
483 | nextstate=STATEID_PARAM_MENU; |
| 483 | success_msg="Param Reset Success!"; |
484 | success_msg="Param Reset Success!"; |
| 484 | chg_state(STATEID_SUCCESS_MSG); |
485 | chg_state(STATEID_SUCCESS_MSG); |
| Line 1659... | Line 1660... | ||
| 1659 | case STATEID_KEYCONTROL: |
1660 | case STATEID_KEYCONTROL: |
| 1660 | mk.user_intent= USER_INTENT_EXTERNAL_CONTROL; |
1661 | mk.user_intent= USER_INTENT_EXTERNAL_CONTROL; |
| 1661 | keycontrol_exit=0; |
1662 | keycontrol_exit=0; |
| 1662 | break; |
1663 | break; |
| Line -... | Line 1664... | ||
| - | 1664 | ||
| - | 1665 | ||
| 1663 | 1666 | ||
| 1664 | case STATEID_READ_PARAMS: |
1667 | case STATEID_READ_PARAMS: |
| 1665 | mk.user_intent=USER_INTENT_PARAMS; |
1668 | mk.user_intent=USER_INTENT_PARAMS; |
| 1666 | lcd_lines=new String[2]; |
1669 | lcd_lines=new String[2]; |
| 1667 | lcd_lines[0]="Reading Settings "; |
1670 | lcd_lines[0]="Reading Settings "; |
| Line 2346... | Line 2349... | ||
| 2346 | break; |
2349 | break; |
| 2347 | case ACTIONID_SELECT_PARAMS: |
2350 | case ACTIONID_SELECT_PARAMS: |
| 2348 | select_paramset4edit=true; |
2351 | select_paramset4edit=true; |
| 2349 | if (settings.reload_settings) |
2352 | if (settings.reload_settings) |
| 2350 | { |
2353 | { |
| - | 2354 | ||
| - | 2355 | ||
| 2351 | mk.watchdog.act_paramset=0; |
2356 | mk.watchdog.act_paramset=0; |
| 2352 | mk.params.reset(); |
2357 | mk.params.reset(); |
| - | 2358 | chg_state(STATEID_READ_PARAMS); |
|
| 2353 | } |
2359 | } |
| 2354 | - | ||
| 2355 | if (mk.watchdog.act_paramset<5) |
- | |
| 2356 | chg_state(STATEID_READ_PARAMS); |
- | |
| 2357 | else |
2360 | else |
| - | 2361 | { |
|
| - | 2362 | if (mk.watchdog.act_paramset!=5) |
|
| - | 2363 | chg_state(STATEID_READ_PARAMS); |
|
| - | 2364 | else |
|
| 2358 | chg_state(STATEID_SELECT_PARAMSET); |
2365 | chg_state(STATEID_SELECT_PARAMSET); |
| 2359 | 2366 | } |
|
| 2360 | break; |
2367 | break; |
| Line 2361... | Line 2368... | ||
| 2361 | 2368 | ||
| 2362 | 2369 | ||