Rev 214 | Rev 220 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 214 | Rev 219 | ||
|---|---|---|---|
| Line 7... | Line 7... | ||
| 7 | * |
7 | * |
| 8 | ***************************************************************/ |
8 | ***************************************************************/ |
| Line 9... | Line 9... | ||
| 9 | 9 | ||
| Line 10... | Line -... | ||
| 10 | import javax.microedition.lcdui.*; |
- | |
| 11 | 10 | import javax.microedition.lcdui.*; |
|
| 12 | 11 | ||
| Line 13... | Line 12... | ||
| 13 | import javax.microedition.media.*; |
12 | import javax.microedition.media.*; |
| Line 235... | Line 234... | ||
| 235 | tmp_actions[setup_pos]=ACTIONID_SWITCH_NC; |
234 | tmp_actions[setup_pos]=ACTIONID_SWITCH_NC; |
| 236 | tmp_items[setup_pos++] ="switch to Navi"; |
235 | tmp_items[setup_pos++] ="switch to Navi"; |
| 237 | } |
236 | } |
| Line 238... | Line 237... | ||
| 238 | 237 | ||
| 239 | 238 | ||
| 240 | if ((settings.expert_mode)&& ( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk()||mk.ufo_prober.is_mk3mag()||mk.ufo_prober.is_incompatible() )) |
239 | //if ((settings.expert_mode)&& ( mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk()||mk.ufo_prober.is_mk3mag()||mk.ufo_prober.is_incompatible() )) |
| 241 | { |
240 | { |
| 242 | tmp_actions[setup_pos]=ACTIONID_FLASH; |
241 | tmp_actions[setup_pos]=ACTIONID_FLASH; |
| Line 264... | Line 263... | ||
| 264 | for ( int tmp_p=0;tmp_p<setup_pos;tmp_p++) |
263 | for ( int tmp_p=0;tmp_p<setup_pos;tmp_p++) |
| 265 | { |
264 | { |
| 266 | tmp_actions_fin[tmp_p]=tmp_actions[tmp_p]; |
265 | tmp_actions_fin[tmp_p]=tmp_actions[tmp_p]; |
| 267 | tmp_items_fin[tmp_p] =tmp_items[tmp_p]; |
266 | tmp_items_fin[tmp_p] =tmp_items[tmp_p]; |
| 268 | } |
267 | } |
| - | 268 | act_menu_select=0; |
|
| 269 | setup_menu(tmp_items_fin,tmp_actions_fin); |
269 | setup_menu(tmp_items_fin,tmp_actions_fin); |
| 270 | } |
270 | } |
| Line 271... | Line 271... | ||
| 271 | 271 | ||
| Line 516... | Line 516... | ||
| 516 | { |
516 | { |
| 517 | debug.log(e.toString()); |
517 | debug.log(e.toString()); |
| 518 | } |
518 | } |
| 519 | break; |
519 | break; |
| 520 | case STATEID_KEYCONTROL: |
520 | case STATEID_KEYCONTROL: |
| 521 | mk.send_keys(keycontrol_bitfield); |
521 | //mk.send_keys(keycontrol_bitfield); |
| 522 | break; |
522 | break; |
| Line 523... | Line 523... | ||
| 523 | 523 | ||
| 524 | case STATEID_NC_ERRORS: |
524 | case STATEID_NC_ERRORS: |
| 525 | lcd_lines[0]=""+mk.error_str; |
525 | lcd_lines[0]=""+mk.error_str; |
| Line 769... | Line 769... | ||
| 769 | g.setClip(bar*(symbols_img.getWidth()/10),0,(symbols_img.getWidth()/10),symbols_img.getHeight());; |
769 | g.setClip(bar*(symbols_img.getWidth()/10),0,(symbols_img.getWidth()/10),symbols_img.getHeight());; |
| 770 | g.drawImage(symbols_img,bar*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
770 | g.drawImage(symbols_img,bar*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
| 771 | } |
771 | } |
| Line 772... | Line 772... | ||
| 772 | 772 | ||
| - | 773 | int symbol_left=0; |
|
| Line 773... | Line 774... | ||
| 773 | int symbol_left=0; |
774 | int symbol_spacer=5; |
| 774 | 775 | ||
| 775 | g.setClip(symbol_left,0,(symbols_img.getWidth()/10),symbols_img.getHeight());; |
776 | g.setClip(symbol_left,0,(symbols_img.getWidth()/10),symbols_img.getHeight());; |
| Line 776... | Line 777... | ||
| 776 | if ((mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk())) |
777 | if (mk.connected) |
| 777 | { |
778 | { |
| 778 | 779 | ||
| 779 | if (((mk.stats.bytes_in>>3)&1)==1) |
780 | if (((mk.stats.bytes_in>>3)&1)==1) |
| Line 780... | Line -... | ||
| 780 | g.drawImage(symbols_img,(-2)*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
- | |
| - | 781 | g.drawImage(symbols_img,(-2)*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
|
| 781 | else |
782 | else |
| - | 783 | g.drawImage(symbols_img,(-3)*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
|
| - | 784 | ||
| - | 785 | ||
| - | 786 | ||
| - | 787 | symbol_left+=symbol_spacer+(symbols_img.getWidth()/10); |
|
| - | 788 | ||
| - | 789 | ||
| - | 790 | } |
|
| - | 791 | else |
|
| - | 792 | g.drawImage(symbols_img,(-1)*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
|
| - | 793 | ||
| - | 794 | ||
| - | 795 | ||
| - | 796 | ||
| 782 | g.drawImage(symbols_img,(-3)*(symbols_img.getWidth()/10),0, g.TOP | g.LEFT); |
797 | |
| Line 783... | Line 798... | ||
| 783 | 798 | ||
| 784 | 799 | if ((mk.ufo_prober.is_navi()||mk.ufo_prober.is_mk())) |
|
| 785 | int symbol_spacer=5; |
800 | { |
| Line 821... | Line 836... | ||
| 821 | 836 | ||
| Line 822... | Line 837... | ||
| 822 | } |
837 | } |
| Line 823... | Line -... | ||
| 823 | - | ||
| 824 | } |
- | |
| Line 825... | Line 838... | ||
| 825 | 838 | ||
| Line 826... | Line 839... | ||
| 826 | else |
839 | } |
| Line 959... | Line 972... | ||
| 959 | 972 | ||
| Line 960... | Line 973... | ||
| 960 | 973 | ||
| - | 974 | break; |
|
| 961 | break; |
975 | |
| 962 | 976 | case STATEID_FLASHING: |
|
| 963 | case STATEID_FLASHING: |
977 | g.setFont(f2); |
| 964 | int msg_pos=0; |
978 | int msg_pos=0; |
| 965 | while (mk.flash_msgs[msg_pos]!=null) |
979 | while (mk.flash_msgs[msg_pos]!=null) |
| 966 | { |
980 | { |
| 967 | g.drawString(mk.flash_msgs[msg_pos] ,0,y_off,Graphics.TOP | Graphics.LEFT); |
981 | g.drawString(mk.flash_msgs[msg_pos] ,0,y_off,Graphics.TOP | Graphics.LEFT); |
| 968 | y_off+=spacer; |
982 | y_off+=spacer1; |
| Line 969... | Line 983... | ||
| 969 | msg_pos++; |
983 | msg_pos++; |
| Line 991... | Line 1005... | ||
| 991 | } |
1005 | } |
| 992 | break; |
1006 | break; |
| Line 993... | Line 1007... | ||
| 993 | 1007 | ||
| Line 994... | Line -... | ||
| 994 | case STATEID_KEYCONTROL: |
- | |
| 995 | 1008 | case STATEID_KEYCONTROL: |
|
| 996 | 1009 | ||
| 997 | y_off+=spacer; |
1010 | y_off+=spacer; |
| 998 | g.drawString("UP&DOWN => nick",0,y_off,Graphics.TOP | Graphics.LEFT); |
1011 | g.drawString("UP&DOWN => nick " + mk.extern_control[EXTERN_CONTROL_NICK],0,y_off,Graphics.TOP | Graphics.LEFT); |
| - | 1012 | y_off+=spacer; |
|
| - | 1013 | g.drawString("LEFT&RIGHT => roll " + mk.extern_control[EXTERN_CONTROL_ROLL],0,y_off,Graphics.TOP | Graphics.LEFT); |
|
| - | 1014 | y_off+=spacer; |
|
| 999 | y_off+=spacer; |
1015 | g.drawString("1&4 => altitude " + mk.extern_control[EXTERN_CONTROL_HIGHT],0,y_off,Graphics.TOP | Graphics.LEFT); |
| 1000 | g.drawString("LEFT&RIGHT => roll",0,y_off,Graphics.TOP | Graphics.LEFT); |
1016 | |
| Line 1001... | Line 1017... | ||
| 1001 | y_off+=spacer; |
1017 | y_off+=spacer; |
| 1002 | g.drawString("1&4 => altitude",0,y_off,Graphics.TOP | Graphics.LEFT); |
1018 | g.drawString("2&3 => gier " + mk.extern_control[EXTERN_CONTROL_GIER],0,y_off,Graphics.TOP | Graphics.LEFT); |
| Line 1003... | Line 1019... | ||
| 1003 | 1019 | ||
| 1004 | y_off+=spacer; |
1020 | y_off+=spacer; |
| 1005 | g.drawString("2&3 => gier",0,y_off,Graphics.TOP | Graphics.LEFT); |
1021 | g.drawString("6&9 => gas " + mk.extern_control[EXTERN_CONTROL_GAS],0,y_off,Graphics.TOP | Graphics.LEFT); |
| 1006 | 1022 | ||
| 1007 | y_off+=spacer; |
1023 | y_off+=spacer; |
| - | 1024 | g.drawString("Press # and * at once",0,y_off,Graphics.TOP | Graphics.LEFT); |
|
| - | 1025 | y_off+=spacer; |
|
| - | 1026 | g.drawString("to quit KeyControl",0,y_off,Graphics.TOP | Graphics.LEFT); |
|
| 1008 | g.drawString("Press # and * at once",0,y_off,Graphics.TOP | Graphics.LEFT); |
1027 | y_off+=spacer; |
| 1009 | y_off+=spacer; |
1028 | |
| Line 1010... | Line 1029... | ||
| 1010 | g.drawString("to quit KeyControl",0,y_off,Graphics.TOP | Graphics.LEFT); |
1029 | g.drawString("sent:" + mk.stats.external_control_request_count +"confirm:" + mk.stats.external_control_confirm_frame_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
| Line 1011... | Line 1030... | ||
| 1011 | y_off+=spacer; |
1030 | y_off+=spacer; |
| 1012 | g.drawString("bf1:"+ keycontrol_bitfield[0] ,0,y_off,Graphics.TOP | Graphics.LEFT); |
1031 | // g.drawString("bf1:"+ keycontrol_bitfield[0] ,0,y_off,Graphics.TOP | Graphics.LEFT); |
| Line 1121... | Line 1140... | ||
| 1121 | 1140 | ||
| 1122 | 1141 | ||
| 1123 | 1142 | ||
| 1124 | g.drawString( " debug:"+mk.stats.debug_data_count+ " LCD:" + mk.stats.lcd_data_count + " vers:" + mk.stats.version_data_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
1143 | g.drawString( " debug:"+mk.stats.debug_data_count+ " LCD:" + mk.stats.lcd_data_count + " vers:" + mk.stats.version_data_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
| 1125 | y_off+=spacer1; |
1144 | y_off+=spacer1; |
| Line -... | Line 1145... | ||
| - | 1145 | g.drawString( " rc:"+mk.stats.stick_data_count+" params:"+mk.stats.params_data_count + " GPS:"+mk.stats.navi_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
| - | 1146 | y_off+=spacer1; |
|
| 1126 | g.drawString( " other:"+mk.stats.other_data_count+" params:"+mk.stats.params_data_count + " GPS:"+mk.stats.navi_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
1147 | g.drawString( " debug_names:" + mk.stats.debug_names_count + " angles:" + mk.stats.angle_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
| 1127 | y_off+=spacer1; |
1148 | |
| 1128 | g.drawString( " debug_names:" + mk.stats.debug_names_count + " angles:" + mk.stats.angle_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
1149 | |
| 1129 | 1150 | g.drawString( " other:"+mk.stats.other_data_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
|
| 1130 | 1151 | ||
| - | 1152 | y_off+=spacer1+3; |
|
| - | 1153 | g.drawString( "<<out:"+mk.stats.bytes_out + " bytes =>" + mk.stats.bytes_out/mk.conn_time_in_s() + "bytes/s", 0,y_off,Graphics.TOP | Graphics.LEFT); |
|
| - | 1154 | y_off+=spacer1; |
|
| 1131 | y_off+=spacer1+3; |
1155 | g.drawString( " LCD:" + mk.stats.lcd_data_request_count + " vers:" + mk.stats.version_data_request_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
| 1132 | g.drawString( "<<out:"+mk.stats.bytes_out + " bytes =>" + mk.stats.bytes_out/mk.conn_time_in_s() + "bytes/s", 0,y_off,Graphics.TOP | Graphics.LEFT); |
1156 | y_off+=spacer1; |
| Line 1133... | Line 1157... | ||
| 1133 | y_off+=spacer1; |
1157 | g.drawString( " params:"+mk.stats.params_data_request_count +" rc:" + mk.stats.stick_data_request_count ,0,y_off,Graphics.TOP | Graphics.LEFT); |
| 1134 | g.drawString( " LCD:" + mk.stats.lcd_data_request_count + " vers:" + mk.stats.version_data_request_count,0,y_off,Graphics.TOP | Graphics.LEFT); |
1158 | y_off+=spacer1; |
| Line 1339... | Line 1363... | ||
| 1339 | 1363 | ||
| Line 1340... | Line 1364... | ||
| 1340 | // public final String intro_str=" Digital Ufo Broadcasting with intelligent service equipment by Marcus -LiGi- Bueschleb ; Big Up Holger&Ingo for the MikroKopter Project (http://www.mikrokopter.de) "; |
1364 | // public final String intro_str=" Digital Ufo Broadcasting with intelligent service equipment by Marcus -LiGi- Bueschleb ; Big Up Holger&Ingo for the MikroKopter Project (http://www.mikrokopter.de) "; |
| 1341 | 1365 | ||
| 1342 | // int intro_str_pos=0; |
1366 | // int intro_str_pos=0; |
| Line 1343... | Line 1367... | ||
| 1343 | // int intro_str_delay=3; |
1367 | // int intro_str_delay=3; |
| 1344 | boolean init_bootloader=false; |
1368 | // boolean init_bootloader=false; |
| 1345 | 1369 | ||
| 1346 | public void chg_state(byte next_state) |
1370 | public void chg_state(byte next_state) |
| Line 1358... | Line 1382... | ||
| 1358 | case STATEID_FLIGHTVIEW: |
1382 | case STATEID_FLIGHTVIEW: |
| 1359 | mk.user_intent=USER_INTENT_LCD; |
1383 | mk.user_intent=USER_INTENT_LCD; |
| 1360 | break; |
1384 | break; |
| 1361 | case STATEID_FLASHING: |
1385 | case STATEID_FLASHING: |
| 1362 | mk.bootloader_intension_flash=true; |
1386 | mk.bootloader_intension_flash=true; |
| - | 1387 | mk.bl_retrys=0; |
|
| 1363 | init_bootloader=true; |
1388 | mk.init_bootloader=true; |
| 1364 | break; |
1389 | break; |
| Line 1365... | Line 1390... | ||
| 1365 | 1390 | ||
| 1366 | //#if fileapi=="on" |
1391 | //#if fileapi=="on" |
| 1367 | case STATEID_FILEOPEN: |
1392 | case STATEID_FILEOPEN: |
| Line 1499... | Line 1524... | ||
| 1499 | } |
1524 | } |
| Line 1500... | Line 1525... | ||
| 1500 | 1525 | ||
| 1501 | 1526 | ||
| - | 1527 | break; |
|
| 1502 | break; |
1528 | case STATEID_KEYCONTROL: |
| 1503 | case STATEID_KEYCONTROL: |
1529 | mk.user_intent= USER_INTENT_EXTERNAL_CONTROL; |
| Line 1504... | Line 1530... | ||
| 1504 | keycontrol_exit=0; |
1530 | keycontrol_exit=0; |
| 1505 | break; |
1531 | break; |
| Line 1617... | Line 1643... | ||
| 1617 | keycontrol_exit &= 255^1; |
1643 | keycontrol_exit &= 255^1; |
| 1618 | else |
1644 | else |
| 1619 | if (keyCode==KEY_STAR) |
1645 | if (keyCode==KEY_STAR) |
| 1620 | keycontrol_exit &= 255^2; |
1646 | keycontrol_exit &= 255^2; |
| 1621 | else |
1647 | else |
| 1622 | if ((keyCode >= this.KEY_NUM0) && (keyCode < this.KEY_NUM8)) |
- | |
| 1623 | keycontrol_bitfield[0]&=255^( 1<<(keyCode-this.KEY_NUM0)); |
1648 | mod_external_control_by_keycode(keyCode,(byte)0); |
| 1624 | else |
- | |
| 1625 | if ((keyCode >= this.KEY_NUM8) && (keyCode <= this.KEY_NUM9)) |
- | |
| 1626 | keycontrol_bitfield[1]&=255^( 1<<(keyCode-this.KEY_NUM8)); |
- | |
| 1627 | else |
- | |
| 1628 | switch (getGameAction (keyCode)) |
- | |
| 1629 | { |
- | |
| 1630 | case UP: |
- | |
| 1631 | keycontrol_bitfield[1]&=255^4; |
- | |
| 1632 | break; |
- | |
| 1633 | - | ||
| 1634 | case DOWN: |
- | |
| 1635 | keycontrol_bitfield[1]&=255^8; |
- | |
| 1636 | break; |
- | |
| Line 1637... | Line -... | ||
| 1637 | - | ||
| 1638 | - | ||
| 1639 | case LEFT: |
- | |
| 1640 | keycontrol_bitfield[1]&=255^16; |
- | |
| 1641 | break; |
- | |
| 1642 | - | ||
| 1643 | case RIGHT: |
- | |
| 1644 | keycontrol_bitfield[1]&=255^32; |
- | |
| 1645 | break; |
- | |
| 1646 | - | ||
| 1647 | case FIRE: |
- | |
| 1648 | keycontrol_bitfield[1]&=255^64; |
- | |
| 1649 | break; |
- | |
| 1650 | - | ||
| 1651 | 1649 | ||
| 1652 | } |
1650 | /* |
| - | 1651 | mk.send_keys(keycontrol_bitfield); |
|
| 1653 | mk.send_keys(keycontrol_bitfield); |
1652 | */ |
| 1654 | break; |
1653 | break; |
| Line 1655... | Line 1654... | ||
| 1655 | } |
1654 | } |
| Line -... | Line 1655... | ||
| - | 1655 | ||
| - | 1656 | } |
|
| - | 1657 | ||
| - | 1658 | ||
| - | 1659 | public void mod_external_control_by_keycode(int keyCode,byte mul) |
|
| - | 1660 | { |
|
| - | 1661 | ||
| - | 1662 | if (keyCode==this.KEY_NUM2) |
|
| - | 1663 | mk.extern_control[EXTERN_CONTROL_GIER]=(byte)(-mul*settings.default_extern_control[EXTERN_CONTROL_GIER]); |
|
| - | 1664 | else if (keyCode==this.KEY_NUM3) |
|
| - | 1665 | mk.extern_control[EXTERN_CONTROL_GIER]=(byte)(mul*settings.default_extern_control[EXTERN_CONTROL_GIER]); |
|
| - | 1666 | ||
| - | 1667 | else if (keyCode==this.KEY_NUM1) |
|
| - | 1668 | mk.extern_control[EXTERN_CONTROL_HIGHT]+=mul; |
|
| - | 1669 | else if (keyCode==this.KEY_NUM4) |
|
| - | 1670 | mk.extern_control[EXTERN_CONTROL_HIGHT]-=mul; |
|
| - | 1671 | ||
| - | 1672 | ||
| - | 1673 | else if (keyCode==this.KEY_NUM6) |
|
| - | 1674 | { if ( mk.extern_control[EXTERN_CONTROL_GAS]<255) mk.extern_control[EXTERN_CONTROL_GAS]+=mul; } |
|
| - | 1675 | else if (keyCode==this.KEY_NUM9) |
|
| - | 1676 | { if ( mk.extern_control[EXTERN_CONTROL_GAS]>0) mk.extern_control[EXTERN_CONTROL_GAS]-=mul; } |
|
| - | 1677 | ||
| - | 1678 | else switch (getGameAction (keyCode)) |
|
| - | 1679 | { |
|
| - | 1680 | case UP: |
|
| - | 1681 | mk.extern_control[EXTERN_CONTROL_NICK]=(byte)(mul*settings.default_extern_control[EXTERN_CONTROL_NICK]); |
|
| - | 1682 | break; |
|
| - | 1683 | ||
| - | 1684 | case DOWN: |
|
| - | 1685 | mk.extern_control[EXTERN_CONTROL_NICK]=(byte)(-mul*settings.default_extern_control[EXTERN_CONTROL_NICK]); |
|
| - | 1686 | ||
| - | 1687 | break; |
|
| - | 1688 | ||
| - | 1689 | ||
| - | 1690 | case LEFT: |
|
| - | 1691 | mk.extern_control[EXTERN_CONTROL_ROLL]=(byte)(mul*settings.default_extern_control[EXTERN_CONTROL_ROLL]); |
|
| - | 1692 | break; |
|
| - | 1693 | ||
| - | 1694 | case RIGHT: |
|
| - | 1695 | mk.extern_control[EXTERN_CONTROL_ROLL]=(byte)(-mul*settings.default_extern_control[EXTERN_CONTROL_ROLL]); |
|
| - | 1696 | break; |
|
| - | 1697 | ||
| - | 1698 | case FIRE: |
|
| - | 1699 | ||
| - | 1700 | break; |
|
| - | 1701 | ||
| - | 1702 | ||
| - | 1703 | } |
|
| 1656 | 1704 | ||
| Line 1657... | Line 1705... | ||
| 1657 | } |
1705 | } |
| Line 1658... | Line 1706... | ||
| 1658 | 1706 | ||
| 1659 | 1707 | // to check if 2 keys are pressed |
|
| 1660 | byte keycontrol_exit=0; |
1708 | byte keycontrol_exit=0; |
| Line 1704... | Line 1752... | ||
| 1704 | debug.log("KeyCode:"+keyCode); |
1752 | debug.log("KeyCode:"+keyCode); |
| 1705 | // key-actions common in all states |
1753 | // key-actions common in all states |
| 1706 | debug.process_key(keyCode); |
1754 | debug.process_key(keyCode); |
| Line 1707... | Line -... | ||
| 1707 | - | ||
| 1708 | - | ||
| 1709 | if ((keyCode==KEY_NUM9)) |
- | |
| 1710 | { chg_state(STATEID_STRINGINPUT); } |
- | |
| 1711 | - | ||
| 1712 | - | ||
| 1713 | - | ||
| 1714 | - | ||
| 1715 | 1755 | ||
| 1716 | 1756 | ||
| 1717 | if (((keyCode==KEY_STAR) || (keyCode==113) ))//&&(state!= STATEID_STRINGINPUT)) |
1757 | if (((keyCode==KEY_STAR) || (keyCode==113) ))//&&(state!= STATEID_STRINGINPUT)) |
| 1718 | { |
1758 | { |
| 1719 | if (state==STATEID_EDIT_PARAMS) |
1759 | if (state==STATEID_EDIT_PARAMS) |
| Line 1925... | Line 1965... | ||
| 1925 | keycontrol_exit |= 1; |
1965 | keycontrol_exit |= 1; |
| 1926 | else |
1966 | else |
| 1927 | if (keyCode==KEY_STAR) |
1967 | if (keyCode==KEY_STAR) |
| 1928 | keycontrol_exit |= 2; |
1968 | keycontrol_exit |= 2; |
| 1929 | else |
1969 | else |
| - | 1970 | mod_external_control_by_keycode(keyCode,(byte)1); |
|
| - | 1971 | ||
| - | 1972 | ||
| - | 1973 | ||
| - | 1974 | if (keycontrol_exit==3) |
|
| - | 1975 | chg_state(STATEID_MAINMENU); |
|
| - | 1976 | ||
| - | 1977 | /* |
|
| 1930 | if ((keyCode >= this.KEY_NUM0) && (keyCode < this.KEY_NUM8)) |
1978 | if ((keyCode >= this.KEY_NUM0) && (keyCode < this.KEY_NUM8)) |
| 1931 | keycontrol_bitfield[0]|=1<<(keyCode-this.KEY_NUM0); |
1979 | keycontrol_bitfield[0]|=1<<(keyCode-this.KEY_NUM0); |
| 1932 | else |
1980 | else |
| 1933 | if ((keyCode >= this.KEY_NUM8) && (keyCode <= this.KEY_NUM9)) |
1981 | if ((keyCode >= this.KEY_NUM8) && (keyCode <= this.KEY_NUM9)) |
| 1934 | keycontrol_bitfield[1]|=1<<(keyCode-this.KEY_NUM8); |
1982 | keycontrol_bitfield[1]|=1<<(keyCode-this.KEY_NUM8); |
| Line 1956... | Line 2004... | ||
| 1956 | case FIRE: |
2004 | case FIRE: |
| 1957 | keycontrol_bitfield[1]|=64; |
2005 | keycontrol_bitfield[1]|=64; |
| 1958 | break; |
2006 | break; |
| Line 1959... | Line 2007... | ||
| 1959 | 2007 | ||
| 1960 | } |
- | |
| 1961 | if (keycontrol_exit==3) |
- | |
| 1962 | chg_state(STATEID_MAINMENU); |
2008 | } |
| 1963 | else |
2009 | else |
| - | 2010 | mk.send_keys(keycontrol_bitfield); |
|
| 1964 | mk.send_keys(keycontrol_bitfield); |
2011 | */ |
| Line 1965... | Line 2012... | ||
| 1965 | break; |
2012 | break; |
| 1966 | 2013 | ||
| Line 2113... | Line 2160... | ||
| 2113 | break; |
2160 | break; |
| Line 2114... | Line 2161... | ||
| 2114 | 2161 | ||
| 2115 | case ACTIONID_RESET_PARAMS: |
2162 | case ACTIONID_RESET_PARAMS: |
| 2116 | state=STATEID_FLASHING; |
2163 | state=STATEID_FLASHING; |
| - | 2164 | mk.bootloader_intension_flash=false; |
|
| 2117 | mk.bootloader_intension_flash=false; |
2165 | mk.bl_retrys=0; |
| 2118 | init_bootloader=true; |
2166 | mk.init_bootloader=true; |
| Line 2119... | Line 2167... | ||
| 2119 | break; |
2167 | break; |
| Line 2120... | Line 2168... | ||
| 2120 | 2168 | ||