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 |