| 98,7 → 98,8 |
|---|
| |
| /* Graph Vars */ |
| public final static int GRAPH_COUNT=4; |
| public final static int[] graph_colors={0x156315,0xCC1315,0xf8ef02,0x19194d}; |
| // public final static int[] graph_colors={0x156315,0xCC1315,0xf8ef02,0x19194d}; |
| public final static int[] graph_colors={0x0aff15,0xCC1315,0xf8ef02,0x1638ff}; |
| public int[] graph_sources={0,1,2,3}; |
| public String[] graph_names={"nick int","roll int","nick acc","roll acc"}; |
| // public int[][] graph_data; |
| 222,9 → 223,9 |
|---|
| |
| tmp_menu_add(l(STRINGID_SELECT_FIRMWARE),ACTIONID_SELECT_FIRMWARE); |
| tmp_menu_add("UPDATE_DUBWISE",ACTIONID_UPDATE_DUBWISE); |
| tmp_menu_add("Phone GPS",ACTIONID_SHOWPHONEGPS); |
| |
| |
| |
| if (settings.expert_mode) |
| tmp_menu_add(l(STRINGID_DEBUG),ACTIONID_DEBUG); |
| |
| 235,15 → 236,19 |
|---|
| tmp_menu_add(l(STRINGID_KEYCONTROL),ACTIONID_KEYCONTROL); |
| tmp_menu_add(l(STRINGID_RCDATA),ACTIONID_RCDATA); |
| tmp_menu_add(l(STRINGID_FLIGHTSETTINGS),ACTIONID_PARAM_MENU); |
| tmp_menu_add(l(STRINGID_HORIZON),ACTIONID_HORIZON); |
| |
| } |
| |
| |
| |
| if ( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk() ) |
| tmp_menu_add(l(STRINGID_LCD),ACTIONID_LCD); |
| |
| // if ( mk.ufo_prober.is_mk() ) |
| { |
| tmp_menu_add(l(STRINGID_HORIZON),ACTIONID_HORIZON); |
| tmp_menu_add(l(STRINGID_LCD),ACTIONID_LCD); |
| tmp_menu_add("Follow Me",ACTIONID_SHOWPHONEGPS); |
| } |
| |
| if ( mk.ufo_prober.is_mk() ) |
| tmp_menu_add(l(STRINGID_GRAPH),ACTIONID_GRAPH); |
| |
| if (( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk()||mk.ufo_prober.is_mk3mag() )) |
| 675,8 → 680,10 |
|---|
| |
| if(c != null ) { |
| // Use coordinate information |
| //#if cldc11=="on" |
| phone_lat= c.getLatitude(); |
| phone_long = c.getLongitude(); |
| //#endif |
| } |
| } |
| catch (Exception e) |
| 1171,14 → 1178,6 |
|---|
| |
| symbol_paint(g,symbol_left,(mk.gps_position.SatsInUse)%10,1); |
| symbol_left+=6*(symbols_img_tile_width)/4; |
| |
| |
| g.setClip(symbol_left,0,(symbols_img.getWidth()/10),symbols_img.getHeight()); |
| g.drawImage(symbols_img,(-5)*(symbols_img.getWidth()/10) + symbol_left,0, g.TOP | g.LEFT); |
| g.setClip(0,0,canvas_width,canvas_height); |
| symbol_left+=2+(symbols_img.getWidth()/10); |
| g.drawString(""+mk.gps_position.SatsInUse ,symbol_left,y_off,Graphics.TOP | Graphics.LEFT); |
| |
| } |
| |
| } |
| 1203,7 → 1202,7 |
|---|
| int horizon_middle=y_off+horizon_height; |
| |
| |
| int horizon_roll_pixels= (mk.angle_roll*horizon_height)/600; |
| int horizon_roll_pixels= (mk.AngleRoll()*horizon_height)/600; |
| int horizon_roll_pixels_=horizon_roll_pixels; |
| |
| |
| 1212,13 → 1211,13 |
|---|
| |
| |
| int nick_size=canvas_width/4; |
| int nick_pixels_y=(mk.angle_nick*horizon_height)/900; |
| int nick_pixels_y=(mk.AngleNick()*horizon_height)/900; |
| |
| int nick_pixels_x; |
| if ((mk.angle_roll*mk.angle_nick)>1) |
| nick_pixels_x=-((int)Math.sqrt(mk.angle_roll*mk.angle_nick)*(canvas_width/2))/(900); |
| if ((mk.AngleRoll()*mk.AngleNick())>1) |
| nick_pixels_x=-((int)Math.sqrt(mk.AngleRoll()*mk.AngleNick())*(canvas_width/2))/(900); |
| else |
| nick_pixels_x=((int)Math.sqrt(-mk.angle_roll*mk.angle_nick)*(canvas_width/2))/(900); |
| nick_pixels_x=((int)Math.sqrt(-mk.AngleRoll()*mk.AngleNick())*(canvas_width/2))/(900); |
| |
| while (horizon_roll_pixels!=0) |
| { |
| 1283,10 → 1282,10 |
|---|
| |
| if (settings.expert_mode) |
| { |
| g.drawString("nick => " + mk.angle_nick,0,y_off,Graphics.TOP | Graphics.LEFT); |
| g.drawString("nick => " + mk.AngleNick(),0,y_off,Graphics.TOP | Graphics.LEFT); |
| y_off+=spacer; |
| |
| g.drawString("roll => " + mk.angle_roll,0,y_off,Graphics.TOP | Graphics.LEFT); |
| g.drawString("roll => " + mk.AngleRoll(),0,y_off,Graphics.TOP | Graphics.LEFT); |
| y_off+=spacer; |
| } |
| break; |
| 1509,11 → 1508,12 |
|---|
| |
| |
| case STATEID_SHOWPHONEGPS: |
| //#if cldc11=="on" |
| y_off+=spacer; |
| g.drawString("lat" + phone_lat ,0,y_off,Graphics.TOP | Graphics.LEFT); |
| y_off+=spacer; |
| g.drawString("long" + phone_long ,0,y_off,Graphics.TOP | Graphics.LEFT); |
| |
| //#endif |
| break; |
| |
| |
| 1884,6 → 1884,7 |
|---|
| // boolean init_bootloader=false; |
| String success_msg=""; |
| |
| |
| public void chg_state(byte next_state) |
| { |
| settings_editor = null; |
| 1891,6 → 1892,9 |
|---|
| err_img=null; |
| // graph_data=null; |
| mk.destroy_debug_buff(); |
| mk.user_intent=USER_INTENT_NONE; |
| mk.set_debug_interval(100); |
| mk.set_gpsosd_interval(0); |
| act_menu_select_bak[state]=act_menu_select; |
| act_menu_select=act_menu_select_bak[next_state]; |
| |
| 1913,6 → 1917,10 |
|---|
| |
| //break; |
| |
| case STATEID_GPSVIEW: |
| |
| mk.user_intent=USER_INTENT_GPSOSD; |
| break; |
| case STATEID_SELECT_FIRMWARE: |
| |
| |
| 2121,10 → 2129,15 |
|---|
| mk.user_intent=USER_INTENT_RAWDEBUG; |
| break; |
| |
| case STATEID_HORIZON: |
| // mk.user_intent=USER_INTENT_GRAPH; |
| if (mk.ufo_prober.is_navi()) |
| mk.set_debug_interval(10); |
| break; |
| |
| case STATEID_GRAPH: |
| //mk.set_debug_interval(1); |
| |
| |
| mk.setup_debug_buff(graph_sources,this.getWidth(),settings.graph_interval); |
| |
| mk.user_intent=USER_INTENT_GRAPH; |
| 2234,9 → 2247,10 |
|---|
| int[][] params2masswrite; |
| int param_masswrite_write_pos; |
| |
| |
| //#if cldc11=="on" |
| double phone_lat=0.0; |
| double phone_long=0.0; |
| //#endif |
| |
| public void process_action(byte actionid) |
| { |
| 2551,6 → 2565,8 |
|---|
| |
| public void keyPressed(int keyCode) |
| { |
| if (keyCode==this.KEY_NUM9) |
| mk.set_debug_interval(1); |
| if (last_keycode==keyCode) |
| repeat_keycode++; |
| else |