Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 232 → Rev 233

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
475,10 → 475,11
{
case STATEID_RESET_PARAMS:
mk.watchdog.act_paramset=0;
mk.params.reset();
 
if (mk.bootloader_finish_ok)
{
mk.params.reset();
mk.watchdog.act_paramset=0;
nextstate=STATEID_PARAM_MENU;
success_msg="Param Reset Success!";
chg_state(STATEID_SUCCESS_MSG);
1661,6 → 1662,8
keycontrol_exit=0;
break;
 
 
 
case STATEID_READ_PARAMS:
mk.user_intent=USER_INTENT_PARAMS;
lcd_lines=new String[2];
2348,15 → 2351,19
select_paramset4edit=true;
if (settings.reload_settings)
{
 
mk.watchdog.act_paramset=0;
mk.params.reset();
chg_state(STATEID_READ_PARAMS);
}
 
if (mk.watchdog.act_paramset<5)
chg_state(STATEID_READ_PARAMS);
else
chg_state(STATEID_SELECT_PARAMSET);
 
{
if (mk.watchdog.act_paramset!=5)
chg_state(STATEID_READ_PARAMS);
else
chg_state(STATEID_SELECT_PARAMSET);
}
break;
 
 
/DUBwise/trunk/j2me/src/DUBwiseSettings.java
228,7 → 228,7
//#if devicecontrol=="on"
,13
//#endif
} , {2,3} , {4,5,6,7,8} , {9,10,11},{SETTINGS_POS_BITFIELD1*8 +6,SETTINGS_POS_BITFIELD1*8 +7} ,{SETTINGS_POS_BITFIELD2+0,SETTINGS_POS_VOICEDELAY,SETTINGS_POS_VOICEVOLUME }, {10,11,12,SETTINGS_POS_BITFIELD2+1,12}};
} , {2,3} , {4,5,6,7,8} , {9,10,11},{SETTINGS_POS_BITFIELD1*8 +6,SETTINGS_POS_BITFIELD1*8 +7} ,{SETTINGS_POS_BITFIELD2*8+0,SETTINGS_POS_VOICEDELAY,SETTINGS_POS_VOICEVOLUME }, {10,11,12,SETTINGS_POS_BITFIELD2*8+1,12}};
public int[][] _field_types={ {PARAMTYPE_CHOICE+0,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH
//#if devicecontrol=="on"
,PARAMTYPE_BITSWITCH