/DUBwise/trunk/j2me/src/DUBwiseCanvas.java |
---|
27,6 → 27,11 |
public final static int[] handle_params_menu_items={STRINGID_EDIT_CONTENT,STRINGID_RENAME,STRINGID_SAVE_AS,STRINGID_SAVE,STRINGID_REREAD,STRINGID_BACK}; |
public final static byte[] handle_params_menu_actions={ACTIONID_EDIT_PARAMS,ACTIONID_RENAME_PARAMS,ACTIONID_WRITE_PARAM_AS,ACTIONID_WRITE_PARAMS,ACTIONID_UNDO_PARAMS,ACTIONID_SELECT_PARAMS }; |
public final static int[] setting_options_menu_items={STRINGID_EDIT,STRINGID_LOADPLAIN,STRINGID_LOADFANCY,STRINGID_BACK}; |
public final static byte[]setting_options_menu_actions={ACTIONID_SETTINGS,ACTIONID_SETTING_LOADPLAIN,ACTIONID_SETTING_LOADFANCY,ACTIONID_MAINMENU }; |
public final static int[] onlyback_menu_items={STRINGID_BACK }; |
public final static byte[] back_to_conndetails_actions={ACTIONID_BACK_TO_CONNDETAILS}; |
219,6 → 224,7 |
{ |
tmp_menu_add(l(STRINGID_PACKET_TRAFFIC),ACTIONID_TRAFFIC); |
tmp_menu_add(l(STRINGID_VIEW_DATA),ACTIONID_DATABUFF); |
tmp_menu_add(l(STRINGID_FORCERECONNECT),ACTIONID_RECONNECT); |
} |
//#if bluetooth=="on" |
tmp_menu_add(l(STRINGID_CONNECT_BT),ACTIONID_SCAN_BT); |
238,7 → 244,7 |
{ |
tmp_menu_init(20); |
tmp_menu_add(l(STRINGID_SETTINGS),ACTIONID_SETTINGS); |
tmp_menu_add(l(STRINGID_SETTINGS),ACTIONID_SETTING_OPTIONS); |
tmp_menu_add(l(STRINGID_CONN),ACTIONID_CONN_DETAILS); |
if (settings.dev_mode) |
1775,7 → 1781,9 |
settings_editor.paint(g); |
break; |
// falltru wanted |
case STATEID_SETTING_OPTIONS: |
case STATEID_MAINMENU: |
case STATEID_SELECT_PARAMSET: |
case STATEID_HANDLE_PARAMS: |
2053,6 → 2061,9 |
// case STATEID_COPY_PARAMS: |
//break; |
case STATEID_SETTING_OPTIONS: |
setup_menu(setting_options_menu_items,setting_options_menu_actions); |
break; |
case STATEID_GPSVIEW: |
2059,12 → 2070,8 |
mk.user_intent=USER_INTENT_GPSOSD; |
break; |
case STATEID_SELECT_FIRMWARE: |
fw_loader=new FirmwareLoader(); |
setup_menu(new String[0],new byte[0]); |
break; |
2376,6 → 2383,17 |
{ |
switch(actionid) |
{ |
case ACTIONID_SETTING_LOADFANCY: |
settings.load_fancy_defaults(); |
break; |
case ACTIONID_SETTING_LOADPLAIN: |
settings.load_plain_defaults(); |
break; |
case ACTIONID_RECONNECT: |
mk.close_connections(false); |
break; |
case ACTIONID_UPDATE_DUBWISE: |
try |
{ |
2534,6 → 2552,10 |
chg_state(STATEID_SETTINGSMENU); |
break; |
case ACTIONID_SETTING_OPTIONS: |
chg_state(STATEID_SETTING_OPTIONS); |
break; |
case ACTIONID_RCDATA: |
chg_state(STATEID_STICKVIEW); |
break; |
2663,6 → 2685,7 |
case STATEID_TRAFFIC: |
case STATEID_SELECT_COMPORT: |
case STATEID_MAINMENU: |
case STATEID_SETTING_OPTIONS: |
case STATEID_SELECT_PARAMSET: |
case STATEID_DEVICESELECT: |
2994,6 → 3017,7 |
break; |
*/ |
case STATEID_SETTING_OPTIONS: |
case STATEID_MAINMENU: |
case STATEID_SELECT_PARAMSET: |
case STATEID_SELECT_COMPORT: |
/DUBwise/trunk/j2me/src/DUBwiseSettings.java |
---|
45,6 → 45,8 |
public boolean do_altimeter_sound=true; |
public byte altsteps; |
public boolean horizon_invert_nick=true; |
public boolean horizon_invert_roll=true; |
public boolean horizon_display_altitude=true; |
55,6 → 57,8 |
public boolean expert_mode=false; |
public boolean dev_mode=false; |
public boolean reload_settings=false; |
public boolean instant_error_show=false; |
107,17 → 111,22 |
public final static int SETTINGS_POS_LANG=15; |
public final static int SETTINGS_POS_GRAPHINTERVAL=16; |
public final static int SETTINGS_POS_BITFIELD3=17; |
public final static int SETTINGS_POS_ALTSTEPS =18; |
public void field2setting(int pos,int val) |
{ |
if (pos==SETTINGS_POS_GRAPHINTERVAL) |
switch (pos) |
{ |
case SETTINGS_POS_ALTSTEPS: |
altsteps=(byte)val; |
break; |
case SETTINGS_POS_GRAPHINTERVAL: |
if (val<1) |
graph_interval=1; |
else |
graph_interval=(byte)val; |
break; |
} |
if (pos==SETTINGS_POS_LANG) |
258,9 → 267,41 |
if (pos==SETTINGS_POS_BITFIELD3) |
instant_error_show=((val&1)!=0); |
/* |
String ts=""; |
for ( int i=0;i<SETTINGS_FIELD_LENGTH;i++) |
ts+=","+settings_field[i]; |
System.out.println(ts); |
*/ |
} |
public int[] plain_defaults={0,0,0,0,42,42,42,1,1,-4242,-4242,-4242,0,10,0,0,7,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; |
public int[] fancy_defaults={0,255,0,0,42,42,42,1,1,-4242,-4242,-4242,150,10,5,0,7,1,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; |
public void process_all_settings() |
{ |
for ( int i=0;i<SETTINGS_FIELD_LENGTH;i++) |
field2setting(i,settings_field[i]); |
} |
public void load_plain_defaults() |
{ |
settings_field=plain_defaults; |
process_all_settings(); |
} |
public void load_fancy_defaults() |
{ |
settings_field=fancy_defaults; |
process_all_settings(); |
} |
public byte[] default_extern_control;//=default_extern_keycontrol ; |
286,7 → 327,7 |
{STRINGID_NICK ,STRINGID_ROLL,STRINGID_GIER,STRINGID_GASINCREASE,STRINGID_HEIGHTINCREASE }, |
{STRINGID_BACKTOMAINMENU,STRINGID_FULLSCREEN,STRINGID_CLEAR }, |
{STRINGID_LEGEND,STRINGID_SCALEGRID,STRINGID_GRAPHINTERVAL}, |
{STRINGID_SOUND,STRINGID_VOLTS,STRINGID_DELAYINS,STRINGID_ALTIMETER,STRINGID_VOLUME}, |
{STRINGID_SOUND,STRINGID_VOLTS,STRINGID_DELAYINS,STRINGID_ALTIMETER,STRINGID_ALTSTEPS,STRINGID_VOLUME}, |
{STRINGID_SHOWALTITUDE,STRINGID_SHOWFLIGHTTIME,STRINGID_INVERTROLL,STRINGID_INVERTNICK}, |
{STRINGID_INSTANTERRORSHOW,STRINGID_VIBRA,STRINGID_REMOTECAMSTICK,STRINGID_ALWAYSRELOADPARAMS,STRINGID_EXPERTMODE,STRINGID_DEVMODE}}; |
304,7 → 345,7 |
,13 |
//#endif |
} , {2,3 } , {4,5,6,7,8} , {9,10,11},{SETTINGS_POS_BITFIELD1*8 +6,SETTINGS_POS_BITFIELD1*8 +7, SETTINGS_POS_GRAPHINTERVAL} , |
{10,SETTINGS_POS_BITFIELD2*8+0,SETTINGS_POS_VOICEDELAY,SETTINGS_POS_BITFIELD2*8+2,SETTINGS_POS_VOICEVOLUME }, |
{10,SETTINGS_POS_BITFIELD2*8+0,SETTINGS_POS_VOICEDELAY,SETTINGS_POS_BITFIELD2*8+2,SETTINGS_POS_ALTSTEPS,SETTINGS_POS_VOICEVOLUME }, |
{SETTINGS_POS_BITFIELD2*8+6,SETTINGS_POS_BITFIELD2*8+5,SETTINGS_POS_BITFIELD2*8+3,SETTINGS_POS_BITFIELD2*8+4}, |
{SETTINGS_POS_BITFIELD3*8+0,SETTINGS_POS_BITFIELD1*8+3,12,SETTINGS_POS_BITFIELD2*8+1,SETTINGS_POS_BITFIELD1*8+4,SETTINGS_POS_BITFIELD2*8+7} |
}; |
313,7 → 354,7 |
,PARAMTYPE_BITSWITCH |
//#endif |
} , {PARAMTYPE_CHOICE+2,PARAMTYPE_CHOICE+3} , {PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_KEY,PARAMTYPE_KEY,PARAMTYPE_KEY} , {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE}, |
{PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE} , |
{PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE,PARAMTYPE_BYTE} , |
{PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH}, |
{PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_STICK,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH} |
}; |
402,9 → 443,9 |
{ } |
for ( int i=0;i<SETTINGS_FIELD_LENGTH;i++) |
field2setting(i,settings_field[i]); |
process_all_settings(); |
} |
/DUBwise/trunk/j2me/src/DUBwiseUIDefinitions.java |
---|
48,11 → 48,11 |
public final static byte STATEID_PARAM_MASSWRITE =33; |
public final static byte STATEID_SELECT_FIRMWARE =34; |
public final static byte STATEID_SHOWPHONEGPS =35; |
public final static byte STATEID_SETTING_OPTIONS =36; |
public final static byte STATEID_COUNT =37; |
public final static byte STATEID_COUNT =36; |
public final static byte ACTIONID_SETTINGS = 0; |
public final static byte ACTIONID_DEVICESELECT = 1; |
public final static byte ACTIONID_DEBUG = 2; |
95,6 → 95,11 |
public final static byte ACTIONID_SELECT_FIRMWARE = 39; |
public final static byte ACTIONID_UPDATE_DUBWISE = 40; |
public final static byte ACTIONID_SHOWPHONEGPS = 41; |
public final static byte ACTIONID_RECONNECT = 42; |
public final static byte ACTIONID_SETTING_OPTIONS = 43; |
public final static byte ACTIONID_SETTING_LOADPLAIN = 44; |
public final static byte ACTIONID_SETTING_LOADFANCY = 45; |
public final static byte ACTIONID_QUIT = 100; |
/DUBwise/trunk/j2me/src/MKStatusVoice.java |
---|
145,20 → 145,20 |
if (canvas.settings.do_altimeter_sound) |
{ |
if (last_alt==-1) last_alt=mk.Alt(); |
int alt_diff=10; |
if (last_alt>mk.Alt()+alt_diff) |
if (last_alt>mk.Alt()+canvas.settings.altsteps) |
{ |
start_playing("down"); |
wait_for_end(); |
last_alt-=alt_diff; |
last_alt-=canvas.settings.altsteps; |
} |
if (last_alt<mk.Alt()-alt_diff) |
if (last_alt<mk.Alt()-canvas.settings.altsteps) |
{ |
start_playing("up"); |
wait_for_end(); |
last_alt+=alt_diff; |
last_alt+=canvas.settings.altsteps; |
} |
} |
else |