Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 228 → Rev 229

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
53,7 → 53,7
 
//#if voice_mode!="no_voice"
private MKStatusVoice status_voice;
public MKStatusVoice status_voice;
//#endif
 
 
96,7 → 96,9
int rawdebug_off_y=0;
 
public int line_middle_y;
public int graph_height;
 
 
boolean quit=false;
 
int bg_offset=0;
146,8 → 148,6
 
}
 
 
 
if (mk.ufo_prober.is_mk() )
{
tmp_actions[setup_pos]=ACTIONID_MOTORTEST;
215,22 → 215,26
 
 
//if ((settings.expert_mode)&& ( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk()||mk.ufo_prober.is_mk3mag()||mk.ufo_prober.is_incompatible() ))
{
tmp_actions[setup_pos]=ACTIONID_FLASH;
tmp_items[setup_pos++] ="Flash Firmware";
}
 
if (settings.expert_mode)
{
tmp_actions[setup_pos]=ACTIONID_FLASH;
tmp_items[setup_pos++] ="Flash Firmware";
}
if ((settings.expert_mode)&& ( mk.ufo_prober.is_mk() ))
{
tmp_actions[setup_pos]=ACTIONID_CAM;
tmp_items[setup_pos++] ="Remote Cam";
}
{
tmp_actions[setup_pos]=ACTIONID_CAM;
tmp_items[setup_pos++] ="Remote Cam";
}
 
 
if (!settings.expert_mode)
{
tmp_actions[setup_pos]=ACTIONID_ABOUT;
tmp_items[setup_pos++] ="About";
}
 
tmp_actions[setup_pos]=ACTIONID_ABOUT;
tmp_items[setup_pos++] ="About";
 
tmp_actions[setup_pos]=ACTIONID_QUIT;
tmp_items[setup_pos++] ="Quit";
 
402,6 → 406,12
root=_root;
 
mk = new org.ligi.ufo.MKCommunicator();
 
 
//#if voice_mode!="no_voice"
status_voice=new MKStatusVoice(mk,this);
//#endif
 
settings = new DUBwiseSettings(this);
settings.load();
load_global_images();
411,10 → 421,6
bt_scanner = new BTSearcher();
//#endif
 
 
//#if voice_mode!="no_voice"
status_voice=new MKStatusVoice(mk,this);
//#endif
 
469,6 → 475,8
{
case STATEID_RESET_PARAMS:
mk.watchdog.act_paramset=0;
mk.params.reset();
if (mk.bootloader_finish_ok)
{
nextstate=STATEID_PARAM_MENU;
714,8 → 722,8
canvas_width=this.getWidth();
canvas_height=this.getHeight();
 
line_middle_y=canvas_height/2;
 
 
if (debug.showing)
{
debug.paint(g);
853,6 → 861,8
g.setClip(0,0,canvas_width,canvas_height);
 
y_off+=symbols_img.getHeight();
graph_height=(canvas_height-y_off)/2;
line_middle_y=graph_height+y_off;
g.setColor(skin_fg_color());
switch(state)
1315,34 → 1325,58
 
g.setStrokeStyle(Graphics.DOTTED);
g.setColor(0xe1dddd);
 
 
 
 
for (int d=0;d<GRAPH_COUNT;d++)
{
g.setFont(f2);
// LEGEND
if (settings.graph_legend) for (int d=0;d<GRAPH_COUNT;d++)
{/*
g.setColor(graph_colors[d]);
g.fillRect(0,y_off +spacer1/2-2 ,20,4);
g.setColor(skin_fg_color());
g.drawString(graph_names[d],23,y_off,Graphics.TOP | Graphics.LEFT);
g.drawString(graph_names[d] + mk.debug_data.analog[graph_sources[d]],23,y_off,Graphics.TOP | Graphics.LEFT);
y_off+=spacer1;
 
*/
g.setColor(graph_colors[d]);
g.fillRect(canvas_width-20,canvas_height-spacer*(d+1)+(spacer)/2-2 ,20,4);
g.setColor(skin_fg_color());
g.drawString(graph_names[d] /*+ mk.debug_data.analog[graph_sources[d]]*/,canvas_width-23,canvas_height-spacer*(d+1),Graphics.TOP | Graphics.RIGHT);
// y_off+=spacer1;
 
}
 
/*
g.drawString("scale:"+scale + "line scaler" + line_scaler,0,y_off,Graphics.TOP | Graphics.LEFT);
if (settings.graph_scale)
{
int scale=10;
// if ((10/line_scaler)<5)scale =1;
if (((10/line_scaler)*2)<(canvas_height/2) )scale =10;
if (((50/line_scaler)*2)<(canvas_height/2) )scale =50;
if (((100/line_scaler)*2)<(canvas_height/2) )scale =100;
if (((250/line_scaler)*2)<(canvas_height/2) )scale =250;
if (((500/line_scaler)*2)<(canvas_height/2) )scale =500;
if (((1000/line_scaler)*2)<(canvas_height/2) )scale =1000;
if (((10000/line_scaler)*2)<(canvas_height/2) )scale =10000;
 
 
int jump=0;
g.drawLine(0,line_middle_y,canvas_width,line_middle_y);
 
while (jump<canvas_height/2)
{
g.drawLine(0,line_middle_y - jump/line_scaler,canvas_width,line_middle_y - jump/line_scaler);
g.drawLine(0,line_middle_y + jump/line_scaler,canvas_width,line_middle_y + jump/line_scaler);
jump+=scale;
 
// g.drawString("scale:"+scale + "line scaler" + line_scaler,0,y_off,Graphics.TOP | Graphics.LEFT);
 
 
int jump=0;
 
g.drawLine(0,line_middle_y,canvas_width,line_middle_y);
while ((jump/line_scaler)<graph_height)
{
g.drawString(""+jump,0,line_middle_y - jump/line_scaler,Graphics.TOP | Graphics.LEFT);
if (jump!=0)g.drawString("-"+jump,0,line_middle_y + jump/line_scaler,Graphics.TOP | Graphics.LEFT);
g.drawLine(0,line_middle_y - jump/line_scaler,canvas_width,line_middle_y - jump/line_scaler);
g.drawLine(0,line_middle_y + jump/line_scaler,canvas_width,line_middle_y + jump/line_scaler);
jump+=scale;
}
}
*/
 
 
 
1351,9 → 1385,6
 
 
// !!TODO checkme
 
 
 
g.setColor(graph_colors[gr]);
 
graph_data[gr][-graph_offset]=check_local_max(mk.debug_data.analog[graph_sources[gr]]);
1360,7 → 1391,7
 
line_scaler= local_max/(canvas_height/2)+1;
line_scaler= local_max/graph_height+1;
 
 
for ( int x=0;x<canvas_width;x++)
1503,6 → 1534,17
 
act_menu_select_bak[state]=act_menu_select;
act_menu_select=act_menu_select_bak[next_state];
 
 
/*
// tasks on state exit
switch(next_state)
{
case STATEID_SETTINGSMENU:
 
break;
}
*/
// prepare next state
switch(next_state)
{
1853,20 → 1895,10
debug.process_key(keyCode);
if ((keyCode==KEY_STAR) || (keyCode==settings.key_back) )//&&(state!= STATEID_STRINGINPUT))
if (((keyCode==KEY_STAR) || (keyCode==settings.key_back) )&&(state!=STATEID_KEYCONTROL))//&&(state!= STATEID_STRINGINPUT))
{
if (state==STATEID_EDIT_PARAMS)
{
chg_state(STATEID_HANDLE_PARAMS);
return;
}
else
if (state!=STATEID_KEYCONTROL)
{
chg_state(STATEID_MAINMENU);
return;
}
 
chg_state(STATEID_MAINMENU);
return;
}
 
 
2314,6 → 2346,12
break;
case ACTIONID_SELECT_PARAMS:
select_paramset4edit=true;
if (settings.reload_settings)
{
mk.watchdog.act_paramset=0;
mk.params.reset();
}
 
if (mk.watchdog.act_paramset<5)
chg_state(STATEID_READ_PARAMS);
else
/DUBwise/trunk/j2me/src/DUBwiseSettings.java
29,6 → 29,11
public int key_fullscreen;
public int key_clear;
 
public int voice_delay;
public int voice_volume;
 
 
 
public int remote_cam_stick;
 
public String connection_name="";
40,6 → 45,12
public boolean do_scrollbg=false;
public boolean expert_mode=false;
 
public boolean reload_settings=false;
 
 
public boolean graph_legend;
public boolean graph_scale;
 
//#if devicecontrol=="on"
public boolean keep_lighton=false;
//#endif
80,6 → 91,9
public final static int SETTINGS_POS_KEY_BACK=9;
public final static int SETTINGS_POS_KEY_FULL=10;
public final static int SETTINGS_POS_KEY_CLEAR=11;
public final static int SETTINGS_POS_VOICEVOLUME=12;
public final static int SETTINGS_POS_VOICEDELAY=13;
public final static int SETTINGS_POS_BITFIELD2=14;
 
 
public void field2setting(int pos,int val)
114,6 → 128,7
do_scrollbg=false;
canvas.load_skin_images();
}
 
if (pos==SETTINGS_POS_BITFIELD1)
do_sound=((val&4)!=0);
127,6 → 142,14
if (pos==SETTINGS_POS_BITFIELD1)
keep_lighton=((val&32)!=0);
 
if (pos==SETTINGS_POS_BITFIELD1)
graph_legend=((val&64)!=0);
 
if (pos==SETTINGS_POS_BITFIELD1)
graph_scale=((val&128)!=0);
 
 
 
if (pos==SETTINGS_POS_GPS_FORMAT)
gps_format=(byte)val;
 
160,6 → 183,30
 
if (pos==12)
remote_cam_stick=val;
 
 
if(pos==SETTINGS_POS_VOICEVOLUME)
{
voice_volume=val;
//#if voice_mode!="no_voice"
canvas.status_voice.volume=voice_volume;
//#endif
}
if(pos==SETTINGS_POS_VOICEDELAY)
{
voice_delay=val;
//#if voice_mode!="no_voice"
canvas.status_voice.delay=voice_delay;
//#endif
}
 
if (pos==SETTINGS_POS_BITFIELD2)
do_sound=((val&1)!=0); // TODO: FIXME - extra var
 
if (pos==SETTINGS_POS_BITFIELD2)
reload_settings=((val&2)!=0);
}
 
 
168,13 → 215,13
 
/* end of all settings hold here */
 
public String[] _tab_names={"User Interface","GPS","Keycontrol","Special Keys","Other" };
public String[] _tab_names={"User Interface","GPS","Keycontrol","Special Keys","Graph","Voice","Other" };
 
public String[][] _field_names={ { "Skin","Fullscreen","Scroll Background"
//#if devicecontrol=="on"
,"Permanent Light"
//#endif
} , {"GPS Format","Speed Format"},{"Nick","Roll","Gier","Gas Increase","Height Increase"},{"Back","Fullscreen","Clear"},{"Sound","Vibra","Remote Cam Stick","Expert-Mode"} };
} , {"GPS Format","Speed Format"},{"Nick","Roll","Gier","Gas Increase","Height Increase"},{"Back to Main-Menu","Fullscreen","Clear"},{"Legend","Scale-Grid"},{"Volts Output","Delay in Seconds","Volume"},{"Sound","Vibra","Remote Cam Stick","Always Reload Params","Expert-Mode"} };
 
public String[][] _choice_strings={ { "Dark","Light" } , {"km/h","mp/h","cm/s"},{"decimal","min sec"}} ;
public int[][] _field_positions={ {SETTINGS_POS_SKIN,8,9
181,15 → 228,16
//#if devicecontrol=="on"
,13
//#endif
} , {2,3} , {4,5,6,7,8} , {9,10,11}, {10,11,12,12}};
} , {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}};
public int[][] _field_types={ {PARAMTYPE_CHOICE+0,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH
//#if devicecontrol=="on"
,PARAMTYPE_BITSWITCH
//#endif
} , {PARAMTYPE_CHOICE+1,PARAMTYPE_CHOICE+2} , {PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_KEY,PARAMTYPE_KEY,PARAMTYPE_KEY} , {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_STICK,PARAMTYPE_BITSWITCH}};
} , {PARAMTYPE_CHOICE+1,PARAMTYPE_CHOICE+2} , {PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_KEY,PARAMTYPE_KEY,PARAMTYPE_KEY} , {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH}, {PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_STICK,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH}};
DUBwiseCanvas canvas;
 
 
 
public final static int SETTINGS_FIELD_LENGTH=42;
public DUBwiseSettings(DUBwiseCanvas _canvas)
{
/DUBwise/trunk/j2me/src/MKStatusVoice.java
24,6 → 24,10
public final int PLAYERSTATE_PLAYING=1;
public final int PLAYERSTATE_FIN=2;
 
 
public int volume=100;
public int delay=5;
 
int act_player_state=PLAYERSTATE_IDLE;
VolumeControl vc;
 
79,7 → 83,7
 
vc = (VolumeControl) player.getControl("VolumeControl");
if(vc != null) {
vc.setLevel(100);
vc.setLevel(volume);
}
 
player.prefetch();
129,7 → 133,12
}
 
try { Thread.sleep(5000); }
try {
if (delay<1)
Thread.sleep(1000);
else
Thread.sleep(delay*1000);
}
catch (Exception e) { }
}