Rev 82 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 82 | Rev 135 | ||
---|---|---|---|
Line 14... | Line 14... | ||
14 | import javax.microedition.media.*; |
14 | import javax.microedition.media.*; |
15 | import javax.microedition.media.control.*; |
15 | import javax.microedition.media.control.*; |
Line 16... | Line 16... | ||
16 | 16 | ||
17 | public class DUBwiseCanvas |
17 | public class DUBwiseCanvas |
18 | extends Canvas |
18 | extends Canvas |
19 | implements Runnable |
19 | implements Runnable,DUBwiseDefinitions |
Line -... | Line 20... | ||
- | 20 | { |
|
- | 21 | ||
20 | { |
22 | int act_wp; |
21 | 23 | ||
Line 22... | Line 24... | ||
22 | // name/handle for the recordStore to memorize some stuff |
24 | // name/handle for the recordStore to memorize some stuff |
23 | private final static String RECORD_STORE_NAME="DUBSETT"; |
25 | private final static String RECORD_STORE_NAME="DUBSETT"; |
Line 33... | Line 35... | ||
33 | //#endif |
35 | //#endif |
Line 34... | Line 36... | ||
34 | 36 | ||
35 | private String err=""; |
37 | private String err=""; |
Line 36... | Line 38... | ||
36 | private DUBwise root; |
38 | private DUBwise root; |
Line 37... | Line 39... | ||
37 | 39 | ||
Line 38... | Line 40... | ||
38 | private UFOProber ufo_prober; |
40 | public UFOProber ufo_prober; |
39 | 41 | ||
Line 48... | Line 50... | ||
48 | private Image bt_img; |
50 | private Image bt_img; |
49 | private Image lcd_img; |
51 | private Image lcd_img; |
50 | private Image load_img; |
52 | private Image load_img; |
Line -... | Line 53... | ||
- | 53 | ||
- | 54 | ||
- | 55 | public boolean fullscreen=false; |
|
- | 56 | public int act_motor=0; |
|
- | 57 | public int act_motor_increase=0; |
|
- | 58 | public boolean motor_test_sel_all=false; |
|
51 | 59 | ||
52 | 60 | ||
Line 53... | Line 61... | ||
53 | final static int SKINID_DARK= 0; |
61 | final static int SKINID_DARK= 0; |
54 | final static int SKINID_LIGHT = 1; |
62 | final static int SKINID_LIGHT = 1; |
Line 65... | Line 73... | ||
65 | 73 | ||
66 | public int lcd_char_width=0; |
74 | public int lcd_char_width=0; |
Line 67... | Line 75... | ||
67 | public int lcd_char_height=0; |
75 | public int lcd_char_height=0; |
- | 76 | ||
- | 77 | public int frame_pos=0; |
|
Line 68... | Line 78... | ||
68 | 78 | ||
Line 69... | Line 79... | ||
69 | public int frame_pos=0; |
79 | public int user_intent=USER_INTENT_NONE; |
70 | 80 | ||
Line 80... | Line 90... | ||
80 | int bg_offset=0; |
90 | int bg_offset=0; |
Line 81... | Line 91... | ||
81 | 91 | ||
82 | // variable to hold the current state |
92 | // variable to hold the current state |
Line 83... | Line -... | ||
83 | public int state=-1; |
- | |
84 | - | ||
85 | // id for each state - must just be uniq - order isnt important |
- | |
86 | public final static int STATEID_SCANNING =0; |
- | |
87 | public final static int STATEID_DEVICESELECT =1; |
- | |
88 | public final static int STATEID_MAINMENU =2; |
- | |
89 | public final static int STATEID_MOTORTEST =3; |
- | |
90 | public final static int STATEID_SELECT_PARAMSET =4; |
- | |
91 | public final static int STATEID_EDIT_PARAMS =5; |
- | |
92 | public final static int STATEID_HANDLE_PARAMS =6; |
- | |
93 | public final static int STATEID_FLIGHTVIEW =7; |
- | |
94 | public final static int STATEID_RAWDEBUG =8; |
- | |
95 | public final static int STATEID_KEYCONTROL =9; |
- | |
96 | public final static int STATEID_SETTINGSMENU =10; |
- | |
97 | public final static int STATEID_STICKVIEW =11; |
- | |
98 | public final static int STATEID_CAMMODE =12; |
- | |
99 | - | ||
100 | - | ||
101 | public boolean fullscreen=false; |
- | |
102 | public int act_motor=0; |
- | |
103 | public int act_motor_increase=0; |
- | |
104 | public boolean motor_test_sel_all=false; |
- | |
105 | - | ||
106 | public String[] main_menu_items={"Telemetry","Raw Debug", "view RC-data", "MK-KeyControl", "Motor Test" , "Flight Settings","Tool Settings","Remote Cam","Proxy","Change Device" , "Quit " }; |
- | |
107 | public final static int MAINMENU_TELEMETRY =0; |
- | |
108 | public final static int MAINMENU_RAWDEBUG =1+MAINMENU_TELEMETRY; |
- | |
109 | public final static int MAINMENU_STICKS =1+MAINMENU_RAWDEBUG; |
- | |
110 | public final static int MAINMENU_KEYCONTROL =1+MAINMENU_STICKS; |
- | |
111 | public final static int MAINMENU_MOTORTEST =1+MAINMENU_KEYCONTROL; |
- | |
112 | public final static int MAINMENU_PARAMS =1+MAINMENU_MOTORTEST; |
- | |
113 | public final static int MAINMENU_SETTINGSMENU =1+MAINMENU_PARAMS; |
- | |
114 | public final static int MAINMENU_CAMMODE =1+MAINMENU_SETTINGSMENU; |
- | |
115 | public final static int MAINMENU_PROXY =1+MAINMENU_CAMMODE; |
- | |
116 | public final static int MAINMENU_DEVICESELECT =1+MAINMENU_PROXY; |
- | |
117 | public final static int MAINMENU_QUIT =1+MAINMENU_DEVICESELECT; |
- | |
118 | - | ||
119 | public String[] settings_menu_items={"Skin ","Sound ","Vibra " ,"Graph ","FullScreen " ,"Keep BGLight " ,"Back" }; |
- | |
120 | public final static int SETTINGSMENU_CHANGESKIN =0; |
- | |
121 | public final static int SETTINGSMENU_SOUNDTOGGLE =1; |
- | |
122 | public final static int SETTINGSMENU_VIBRATOGGLE =2; |
- | |
123 | public final static int SETTINGSMENU_GRAPHTOGGLE =3; |
- | |
124 | public final static int SETTINGSMENU_FULLSCREENTOGGLE =4; |
- | |
125 | public final static int SETTINGSMENU_LIGHTTOGGLE =5; |
- | |
Line 126... | Line 93... | ||
126 | public final static int SETTINGSMENU_BACK =6; |
93 | public int state=-1; |
Line 127... | Line 94... | ||
127 | 94 | ||
Line 254... | Line 221... | ||
254 | { |
221 | { |
Line 255... | Line 222... | ||
255 | 222 | ||
Line 256... | Line 223... | ||
256 | 223 | ||
Line 257... | Line 224... | ||
257 | root=_root; |
224 | root=_root; |
258 | 225 | ||
259 | debug = new DUBwiseDebug(); |
226 | debug = new DUBwiseDebug(this); |
Line 372... | Line 339... | ||
372 | break; |
339 | break; |
373 | case STATEID_KEYCONTROL: |
340 | case STATEID_KEYCONTROL: |
374 | mk.send_keys(keycontrol_bitfield); |
341 | mk.send_keys(keycontrol_bitfield); |
375 | break; |
342 | break; |
Line -... | Line 343... | ||
- | 343 | ||
- | 344 | case STATEID_READ_PARAMS: |
|
- | 345 | if (mk.watchdog.act_paramset==5) |
|
- | 346 | chg_state(STATEID_SELECT_PARAMSET); |
|
- | 347 | else |
|
- | 348 | { |
|
- | 349 | lcd_lines[0]="Reading Settings "; |
|
- | 350 | lcd_lines[1]=mk.watchdog.act_paramset+"/5 |"+ (mk.watchdog.act_paramset>0?"#":"_") + (mk.watchdog.act_paramset>1?"#":"_") + (mk.watchdog.act_paramset>2?"#":"_")+ (mk.watchdog.act_paramset>3?"#":"_")+ (mk.watchdog.act_paramset>4?"#":"_") + "| "; |
|
- | 351 | } |
|
- | 352 | break; |
|
376 | 353 | ||
Line 377... | Line 354... | ||
377 | case STATEID_MOTORTEST: |
354 | case STATEID_MOTORTEST: |
378 | 355 | ||
379 | if (motor_test_sel_all) |
356 | if (motor_test_sel_all) |
Line 391... | Line 368... | ||
391 | } |
368 | } |
Line 392... | Line 369... | ||
392 | 369 | ||
393 | mk.motor_test(motor_test); |
370 | mk.motor_test(motor_test); |
Line -... | Line 371... | ||
- | 371 | break; |
|
- | 372 | ||
- | 373 | case STATEID_MAINMENU: |
|
- | 374 | if (ufo_prober.change_notify) |
|
- | 375 | { |
|
- | 376 | ufo_prober.change_notify=false; |
|
- | 377 | chg_state(STATEID_MAINMENU); |
|
- | 378 | } |
|
394 | break; |
379 | break; |
395 | 380 | ||
396 | case STATEID_SCANNING: |
381 | case STATEID_SCANNING: |
397 | intro_str_delay--; |
382 | intro_str_delay--; |
398 | if (intro_str_delay<0) |
383 | if (intro_str_delay<0) |
Line 583... | Line 568... | ||
583 | 568 | ||
584 | 569 | ||
Line -... | Line 570... | ||
- | 570 | switch(state) |
|
- | 571 | { |
|
- | 572 | ||
- | 573 | case STATEID_GPSVIEW: |
|
- | 574 | g.drawString("GPS-Packages: " + mk.navi_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 575 | y_off+=spacer; |
|
- | 576 | g.drawString("Used Sats: " + mk.gps_position.Used_Sat ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 577 | y_off+=spacer; |
|
- | 578 | g.drawString("Latitude: " + mk.gps_position.Latitude_str() ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 579 | y_off+=spacer; |
|
- | 580 | g.drawString("=>: " + mk.gps_position.Latitude_min_sec() ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 581 | y_off+=spacer; |
|
- | 582 | g.drawString("Longitude: " + mk.gps_position.Longitude_str() ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 583 | y_off+=spacer; |
|
- | 584 | g.drawString("=> " + mk.gps_position.Longitude_min_sec() ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 585 | y_off+=spacer; |
|
- | 586 | ||
- | 587 | g.drawString("Target-Lat: " + mk.gps_position.TargetLatitude ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 588 | y_off+=spacer; |
|
- | 589 | g.drawString("Target-Long: " + mk.gps_position.TargetLongitude ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 590 | y_off+=spacer; |
|
- | 591 | g.drawString("Distance : " + mk.gps_position.Distance2Target ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 592 | y_off+=spacer; |
|
- | 593 | g.drawString("Angle: " + mk.gps_position.Angle2Target ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 594 | y_off+=spacer; |
|
- | 595 | ||
- | 596 | g.drawString("WayPoints: " + act_wp + "/" + mk.gps_position.last_wp ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 597 | y_off+=spacer; |
|
- | 598 | ||
- | 599 | g.drawString(" " + mk.gps_position.WP_Latitude_min_sec(act_wp) ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 600 | y_off+=spacer; |
|
- | 601 | ||
- | 602 | g.drawString(" " + mk.gps_position.WP_Longitude_min_sec(act_wp) ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 603 | y_off+=spacer; |
|
- | 604 | ||
585 | switch(state) |
605 | |
Line 586... | Line 606... | ||
586 | { |
606 | break; |
587 | 607 | ||
588 | case STATEID_CAMMODE: |
608 | case STATEID_CAMMODE: |
Line 643... | Line 663... | ||
643 | 663 | ||
644 | case STATEID_EDIT_PARAMS: |
664 | case STATEID_EDIT_PARAMS: |
645 | params_editor.paint(g); |
665 | params_editor.paint(g); |
Line -... | Line 666... | ||
- | 666 | break; |
|
- | 667 | ||
- | 668 | ||
- | 669 | case STATEID_READ_PARAMS: |
|
- | 670 | paint_lcd(g,true); |
|
- | 671 | ||
- | 672 | g.setClip(this.getWidth()/2-load_img.getWidth()/6+1,this.getHeight()/2-load_img.getHeight()/8+1, load_img.getWidth()/4,load_img.getHeight()/3);; |
|
- | 673 | g.drawImage(load_img,this.getWidth()/2-load_img.getWidth()/8 - ((((frame_pos/3)%12)%4)*(load_img.getWidth()/4)) ,this.getHeight()/2-load_img.getHeight()/6- ((((frame_pos/3)%12)/4)*(load_img.getHeight()/3)), g.TOP | g.LEFT); |
|
- | 674 | g.drawImage(bt_img,this.getWidth()/2 ,this.getHeight()/2 , g.HCENTER | g.VCENTER); |
|
- | 675 | break; |
|
646 | break; |
676 | |
647 | 677 | ||
Line 648... | Line 678... | ||
648 | case STATEID_SCANNING: |
678 | case STATEID_SCANNING: |
649 | paint_lcd(g,true); |
679 | paint_lcd(g,true); |
Line 688... | Line 718... | ||
688 | 718 | ||
Line 689... | Line 719... | ||
689 | break; |
719 | break; |
690 | - | ||
691 | - | ||
692 | case STATEID_MAINMENU: |
- | |
693 | g.drawString("probed_device" + ufo_prober.probe_result + " by " + ufo_prober.reply,0,y_off,Graphics.TOP | Graphics.LEFT); |
- | |
694 | y_off+=spacer; |
720 | |
- | 721 | ||
- | 722 | case STATEID_MAINMENU: |
|
- | 723 | g.setFont(f2); |
|
- | 724 | g.drawString(ufo_prober.extended_name()+ " (" + (mk.connected?("open"+((System.currentTimeMillis()- mk.connection_start_time)/1000)+"s"):"closed")+"):",0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 725 | y_off+=spacer1; |
|
- | 726 | g.drawString(" Version:" + mk.version.str ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
695 | g.drawString("MK-Connection(" + (mk.connected?("open"+((System.currentTimeMillis()- mk.connection_start_time)/1000)+"s"):"close")+"):",0,y_off,Graphics.TOP | Graphics.LEFT); |
727 | y_off+=spacer1; |
696 | y_off+=spacer; |
728 | /* |
697 | g.setFont(f2); |
729 | |
698 | g.drawString(" Name:" + mk.name,0,y_off,Graphics.TOP | Graphics.LEFT); |
730 | g.drawString(" Name:" + mk.name,0,y_off,Graphics.TOP | Graphics.LEFT); |
699 | y_off+=spacer1; |
- | |
700 | g.drawString(" URL:" + mk.mk_url,0,y_off,Graphics.TOP | Graphics.LEFT); |
- | |
701 | y_off+=spacer1; |
731 | y_off+=spacer1; |
702 | g.drawString(" Version:" + mk.version.str,0,y_off,Graphics.TOP | Graphics.LEFT); |
732 | g.drawString(" URL:" + mk.mk_url,0,y_off,Graphics.TOP | Graphics.LEFT); |
703 | y_off+=spacer1; |
733 | y_off+=spacer1; |
704 | 734 | |
|
705 | g.setFont(f1); |
735 | g.setFont(f1); |
706 | g.drawString("Packet Traffic:",0,y_off,Graphics.TOP | Graphics.LEFT); |
736 | g.drawString("Packet Traffic:",0,y_off,Graphics.TOP | Graphics.LEFT); |
707 | y_off+=spacer; |
737 | y_off+=spacer; |
708 | g.setFont(f2); |
738 | g.setFont(f2);*/ |
- | 739 | g.drawString( " debug:"+mk.debug_data_count+ " LCD:" + mk.lcd_data_count + " vers:" + mk.version_data_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
- | 740 | y_off+=spacer1; |
|
- | 741 | g.drawString( " other:"+mk.other_data_count+" params:"+mk.params_data_count + " GPS:"+mk.navi_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
Line 709... | Line 742... | ||
709 | g.drawString( " debug:"+mk.debug_data_count+ " LCD:" + mk.lcd_data_count + " vers:" + mk.version_data_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
742 | y_off+=spacer1; |
710 | y_off+=spacer1; |
743 | g.drawString( " debug_names:" + mk.debug_names_count + " angles:" + mk.angle_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
Line 748... | Line 781... | ||
748 | g.drawString("time conn:" +((System.currentTimeMillis()- mk.connection_start_time)/1000)+"s" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
781 | g.drawString("time conn:" +((System.currentTimeMillis()- mk.connection_start_time)/1000)+"s" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
749 | y_off+=spacer; |
782 | y_off+=spacer; |
750 | g.drawString("time motor>15:" +(mk_stat.motor_on_time/1000) +"s" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
783 | g.drawString("time motor>15:" +(mk_stat.motor_on_time/1000) +"s" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
751 | y_off+=spacer; |
784 | y_off+=spacer; |
752 | g.drawString("time motor=15:" +(mk_stat.motor_stand_time/1000) +"s" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
785 | g.drawString("time motor=15:" +(mk_stat.motor_stand_time/1000) +"s" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
753 | } |
786 | y_off+=spacer; |
- | 787 | g.drawString("act_lcd_page:" + mk.LCD.act_mk_page + "/" + mk.LCD.pages + " ( wanted: " + mk.LCD.act_user_page +")" ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
Line -... | Line 788... | ||
- | 788 | ||
- | 789 | } |
|
Line 754... | Line 790... | ||
754 | 790 | ||
Line 755... | Line 791... | ||
755 | 791 | ||
756 | y_off=this.getHeight()-4*lcd_img.getHeight(); |
792 | y_off=this.getHeight()-4*lcd_img.getHeight(); |
Line 888... | Line 924... | ||
888 | break; |
924 | break; |
889 | case STATEID_KEYCONTROL: |
925 | case STATEID_KEYCONTROL: |
890 | keycontrol_exit=0; |
926 | keycontrol_exit=0; |
891 | break; |
927 | break; |
Line -... | Line 928... | ||
- | 928 | ||
- | 929 | case STATEID_READ_PARAMS: |
|
- | 930 | user_intent=USER_INTENT_PARAMS; |
|
- | 931 | lcd_lines=new String[2]; |
|
- | 932 | lcd_lines[0]="Reading Settings "; |
|
- | 933 | lcd_lines[1]=mk.watchdog.act_paramset+"/5 |"+ (mk.watchdog.act_paramset>0?"#":"_") + (mk.watchdog.act_paramset>1?"#":"_") + (mk.watchdog.act_paramset>2?"#":"_")+ (mk.watchdog.act_paramset>3?"#":"_")+ (mk.watchdog.act_paramset>4?"#":"_") + "| "; |
|
- | 934 | ||
- | 935 | break; |
|
- | 936 | ||
892 | 937 | ||
893 | case STATEID_SCANNING: |
938 | case STATEID_SCANNING: |
894 | lcd_lines=new String[4]; |
939 | lcd_lines=new String[4]; |
895 | lcd_lines[0]="Scanning for Devices"; |
940 | lcd_lines[0]="Scanning for Devices"; |
Line 926... | Line 971... | ||
926 | lcd_lines=new String[bt_scanner.remote_device_count+1]; |
971 | lcd_lines=new String[bt_scanner.remote_device_count+1]; |
927 | break; |
972 | break; |
Line 928... | Line 973... | ||
928 | 973 | ||
- | 974 | ||
- | 975 | case STATEID_MAINMENU: |
|
- | 976 | if (ufo_prober.is_navi()) |
|
929 | 977 | menu_items=main_menu_items_navi; |
|
- | 978 | else if (ufo_prober.is_mk()) |
|
- | 979 | menu_items=main_menu_items_mk; |
|
- | 980 | else |
|
930 | case STATEID_MAINMENU: |
981 | menu_items=main_menu_items_no_connection; |
931 | menu_items=main_menu_items; |
982 | |
Line 932... | Line 983... | ||
932 | lcd_lines=new String[menu_items.length]; |
983 | lcd_lines=new String[menu_items.length]; |
Line 946... | Line 997... | ||
946 | menu_items[5]+=(!keep_lighton)?"Off":"On"; |
997 | menu_items[5]+=(!keep_lighton)?"Off":"On"; |
Line 947... | Line 998... | ||
947 | 998 | ||
948 | lcd_lines=new String[menu_items.length]; |
999 | lcd_lines=new String[menu_items.length]; |
Line -... | Line 1000... | ||
- | 1000 | break; |
|
- | 1001 | ||
- | 1002 | case STATEID_RAWDEBUG: |
|
- | 1003 | user_intent=USER_INTENT_RAWDEBUG; |
|
949 | break; |
1004 | break; |
- | 1005 | ||
- | 1006 | } |
|
- | 1007 | ||
Line 950... | Line 1008... | ||
950 | 1008 | ||
951 | } |
1009 | |
952 | 1010 | ||
Line 1065... | Line 1123... | ||
1065 | setFullScreenMode(fullscreen); |
1123 | setFullScreenMode(fullscreen); |
1066 | return; |
1124 | return; |
1067 | } |
1125 | } |
1068 | switch(state) |
1126 | switch(state) |
1069 | { |
1127 | { |
- | 1128 | case STATEID_GPSVIEW: |
|
- | 1129 | if (keyCode == this.KEY_NUM0) |
|
- | 1130 | mk.set_gps_target(mk.gps_position.Latitude,mk.gps_position.Longitude); |
|
- | 1131 | ||
- | 1132 | if (keyCode == this.KEY_NUM1) |
|
- | 1133 | mk.gps_position.push_wp(); |
|
- | 1134 | ||
- | 1135 | ||
- | 1136 | switch (getGameAction (keyCode)) |
|
- | 1137 | { |
|
- | 1138 | case UP: |
|
- | 1139 | if (act_wp!=0) act_wp--; |
|
- | 1140 | break; |
|
- | 1141 | ||
- | 1142 | case DOWN: |
|
- | 1143 | if (act_wp<mk.gps_position.last_wp) act_wp++; |
|
- | 1144 | ||
- | 1145 | break; |
|
- | 1146 | ||
- | 1147 | ||
- | 1148 | } |
|
- | 1149 | ||
- | 1150 | ||
- | 1151 | break; |
|
- | 1152 | ||
1070 | case STATEID_RAWDEBUG: |
1153 | case STATEID_RAWDEBUG: |
Line 1071... | Line 1154... | ||
1071 | 1154 | ||
1072 | switch (getGameAction (keyCode)) |
1155 | switch (getGameAction (keyCode)) |
1073 | { |
1156 | { |
Line 1083... | Line 1166... | ||
1083 | rawdebug_cursor_y=0; |
1166 | rawdebug_cursor_y=0; |
1084 | else |
1167 | else |
1085 | rawdebug_cursor_y++; |
1168 | rawdebug_cursor_y++; |
1086 | break; |
1169 | break; |
Line -... | Line 1170... | ||
- | 1170 | ||
1087 | 1171 | ||
1088 | } |
1172 | } |
1089 | break; |
1173 | break; |
1090 | case STATEID_KEYCONTROL: |
1174 | case STATEID_KEYCONTROL: |
1091 | if (keyCode==KEY_POUND) |
1175 | if (keyCode==KEY_POUND) |
Line 1216... | Line 1300... | ||
1216 | else menu_keypress(keyCode); |
1300 | else menu_keypress(keyCode); |
1217 | break; |
1301 | break; |
Line 1218... | Line 1302... | ||
1218 | 1302 | ||
1219 | case STATEID_MAINMENU: |
1303 | case STATEID_MAINMENU: |
- | 1304 | if ( getGameAction (keyCode)==FIRE ) |
|
- | 1305 | { |
|
- | 1306 | ||
1220 | if ( getGameAction (keyCode)==FIRE ) |
1307 | if (ufo_prober.is_mk()) |
1221 | switch(act_menu_select) |
1308 | switch(act_menu_select) |
1222 | { |
1309 | { |
1223 | case MAINMENU_CAMMODE: |
1310 | case MAINMENU_MK_CAMMODE: |
1224 | chg_state(STATEID_CAMMODE); |
1311 | chg_state(STATEID_CAMMODE); |
Line 1225... | Line 1312... | ||
1225 | break; |
1312 | break; |
1226 | 1313 | ||
1227 | case MAINMENU_SETTINGSMENU: |
1314 | case MAINMENU_MK_SETTINGSMENU: |
1228 | chg_state(STATEID_SETTINGSMENU); |
1315 | chg_state(STATEID_SETTINGSMENU); |
1229 | break; |
1316 | break; |
1230 | case MAINMENU_STICKS: |
1317 | case MAINMENU_MK_STICKS: |
Line 1231... | Line 1318... | ||
1231 | chg_state(STATEID_STICKVIEW); |
1318 | chg_state(STATEID_STICKVIEW); |
1232 | break; |
1319 | break; |
1233 | 1320 | ||
Line 1234... | Line 1321... | ||
1234 | case MAINMENU_KEYCONTROL: |
1321 | case MAINMENU_MK_KEYCONTROL: |
1235 | chg_state(STATEID_KEYCONTROL); |
1322 | chg_state(STATEID_KEYCONTROL); |
1236 | break; |
1323 | break; |
Line 1237... | Line 1324... | ||
1237 | 1324 | ||
1238 | case MAINMENU_TELEMETRY : |
1325 | case MAINMENU_MK_TELEMETRY : |
1239 | chg_state(STATEID_FLIGHTVIEW); |
1326 | chg_state(STATEID_FLIGHTVIEW); |
Line 1240... | Line 1327... | ||
1240 | break; |
1327 | break; |
- | 1328 | ||
- | 1329 | case MAINMENU_MK_MOTORTEST : |
|
- | 1330 | chg_state(STATEID_MOTORTEST); |
|
1241 | 1331 | break; |
|
1242 | case MAINMENU_MOTORTEST : |
1332 | |
Line 1243... | Line 1333... | ||
1243 | chg_state(STATEID_MOTORTEST); |
1333 | case MAINMENU_MK_PARAMS : |
1244 | break; |
1334 | if (mk.watchdog.act_paramset<5) |
1245 | 1335 | chg_state(STATEID_READ_PARAMS); |
|
Line 1246... | Line 1336... | ||
1246 | case MAINMENU_PARAMS : |
1336 | else |
1247 | chg_state(STATEID_SELECT_PARAMSET); |
1337 | chg_state(STATEID_SELECT_PARAMSET); |
1248 | break; |
1338 | break; |
Line 1249... | Line 1339... | ||
1249 | 1339 | ||
1250 | 1340 | ||
1251 | case MAINMENU_PROXY: |
1341 | case MAINMENU_MK_PROXY: |
Line 1252... | Line 1342... | ||
1252 | mk.do_proxy("socket://192.168.1.42:2323"); |
1342 | mk.do_proxy("socket://192.168.1.42:2323"); |
1253 | break; |
1343 | break; |
1254 | 1344 | ||
1255 | case MAINMENU_DEVICESELECT: |
1345 | case MAINMENU_MK_DEVICESELECT: |
Line 1256... | Line 1346... | ||
1256 | chg_state(STATEID_SCANNING); |
1346 | chg_state(STATEID_SCANNING); |
- | 1347 | break; |
|
- | 1348 | ||
- | 1349 | case MAINMENU_MK_RAWDEBUG: |
|
- | 1350 | chg_state(STATEID_RAWDEBUG); |
|
- | 1351 | break; |
|
- | 1352 | ||
- | 1353 | case MAINMENU_MK_QUIT: |
|
- | 1354 | // set quit Flag |
|
- | 1355 | quit=true; |
|
- | 1356 | break; |
|
- | 1357 | ||
- | 1358 | } |
|
- | 1359 | else if (ufo_prober.is_navi()) |
|
- | 1360 | switch(act_menu_select) |
|
- | 1361 | { |
|
- | 1362 | ||
- | 1363 | ||
- | 1364 | ||
- | 1365 | case MAINMENU_NAVI_SETTINGS: |
|
- | 1366 | chg_state(STATEID_SETTINGSMENU); |
|
- | 1367 | break; |
|
- | 1368 | ||
- | 1369 | case MAINMENU_NAVI_TELEMETRY : |
|
- | 1370 | chg_state(STATEID_FLIGHTVIEW); |
|
- | 1371 | break; |
|
- | 1372 | ||
- | 1373 | ||
- | 1374 | case MAINMENU_NAVI_RAWDEBUG: |
|
- | 1375 | chg_state(STATEID_RAWDEBUG); |
|
- | 1376 | break; |
|
- | 1377 | ||
- | 1378 | case MAINMENU_NAVI_GPSVIEW: |
|
- | 1379 | chg_state(STATEID_GPSVIEW); |
|
- | 1380 | break; |
|
- | 1381 | ||
- | 1382 | case MAINMENU_NAVI_DEVICESELECT: |
|
- | 1383 | chg_state(STATEID_SCANNING); |
|
- | 1384 | break; |
|
- | 1385 | ||
- | 1386 | ||
- | 1387 | case MAINMENU_NAVI_QUIT: |
|
- | 1388 | // set quit Flag |
|
- | 1389 | quit=true; |
|
- | 1390 | break; |
|
- | 1391 | } |
|
- | 1392 | ||
- | 1393 | else |
|
- | 1394 | switch(act_menu_select) |
|
- | 1395 | { |
|
- | 1396 | ||
- | 1397 | ||
- | 1398 | ||
- | 1399 | case MAINMENU_NO_CONN_SETTINGS: |
|
- | 1400 | chg_state(STATEID_SETTINGSMENU); |
|
- | 1401 | break; |
|
- | 1402 | ||
- | 1403 | case MAINMENU_NO_CONN_DEVICESELECT: |
|
1257 | break; |
1404 | chg_state(STATEID_SCANNING); |
1258 | 1405 | break; |
|
Line 1259... | Line 1406... | ||
1259 | case MAINMENU_RAWDEBUG: |
1406 | |
1260 | chg_state(STATEID_RAWDEBUG); |
1407 | |
Line 1295... | Line 1442... | ||
1295 | 1442 | ||
1296 | if (bt_scanner.remote_device_count > act_menu_select) |
1443 | if (bt_scanner.remote_device_count > act_menu_select) |
1297 | { |
1444 | { |
1298 | connect_mk("btspp://"+bt_scanner.remote_device_mac[act_menu_select] + ":1",bt_scanner.remote_device_name[act_menu_select]); |
1445 | connect_mk("btspp://"+bt_scanner.remote_device_mac[act_menu_select] + ":1",bt_scanner.remote_device_name[act_menu_select]); |
- | 1446 | chg_state(STATEID_MAINMENU); |
|
1299 | chg_state(STATEID_MAINMENU); |
1447 | // keyCode=-1; |
1300 | } |
1448 | } |
1301 | else |
1449 | else |
1302 | chg_state(STATEID_SCANNING); |
1450 | chg_state(STATEID_SCANNING); |
1303 | } |
1451 | } |