Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 324 → Rev 325

/branches/ligi_j2me/PR/dubwise_mk_FM4014.JPG
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/dubwise_mk_FM4014_getjar.JPG
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_01.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_02.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_03.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_05.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_06.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_07.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_08.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_09.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-configuration_10.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-mainscreen.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-motortest.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-scanning.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-settings.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-telemetry.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37-write_discard.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/branches/ligi_j2me/PR/screenshots/0.37_by_CaScAdE/20071022-dubwise-0.37.html
0,0 → 1,30
<img src="20071022-dubwise-0.37-scanning.jpg" width="800" height="1702" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-mainscreen.jpg" width="729" height="1710" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-telemetry.jpg" width="804" height="1700" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-motortest.jpg" width="740" height="1677" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-settings.jpg" width="738" height="1669" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_01.jpg" width="805" height="1751" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_02.jpg" width="758" height="1688" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_03.jpg" width="769" height="1700" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_05.jpg" width="714" height="1658" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_06.jpg" width="777" height="1698" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_07.jpg" width="751" height="1712" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_08.jpg" width="737" height="1717" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_09.jpg" width="777" height="1721" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-configuration_10.jpg" width="754" height="1692" border="0" alt=""><br>
<br>
<img src="20071022-dubwise-0.37-write_discard.jpg" width="784" height="1686" border="0" alt=""><br>
<br>
/branches/ligi_j2me/README
9,8 → 9,10
*
* Author: Marcus -LiGi- Bueschleb
* Project-Start: 9/2007
* Version: 0.36
* Mailto: ligi@smart4mobile.de
* Version: 0.37
* Mailto: ligi
* at
* smart4mobile.de
*
* Licence: http://creativecommons.org/licenses/by-nc-sa/2.0/de/
* (Creative Commons / Non Commercial / Share Alike)
31,15 → 33,18
 
*** Features:
- draw Graphs with Nick integral / Roll integral / Nick acc / Roll acc
- test each motor
- test each motor ( like MotorTest in MK-Tool )
- Draw LCD of mk ( + interact with it Up/Down )
- get MK_version
- measure ConnectionTime / Motor=15Time / Motor>15Time ( UpTime )
- Read and Edit Settings/Parameters from MK
- initial Proxy Function ( send Data from MK via TCP/IP to socket )
- save MK MAC - so that scanning is only needed 1x ( you have to Quit via the Menu-Item - not the systems Exit button)
- reconnect after connection loss ( detection of disconnect could be faster )
 
*** Install:
- If u know how to handle JAR/JADs take the ones from the bin directory.
- If u dont visit http://www.getjar.com/products/12587/MKMiniMidlet ( SVN might be more recent)
- If u dont visit http://www.getjar.com/products/12587/DUBwise ( SVN might be more recent)
 
*** Usage:
General:
47,9 → 52,9
KEY * MainMenu
 
Device selection Screen:
KEY UP/Down | 1..X to select device
KEY UP/Down to select device
Main Screen:
Telemetry Screen:
KEY UP to go Page up in MK-LCD
KEY DOWN to go Page up in MK-LCD
130,4 → 135,5
0.34 - select ParamSet to edit
0.35 - Proxy server test script
0.36 - initial Proxy-function in DUBwise ( send data recieved from mk to socket )
0.37 - write ParamSets / BugFixing
 
/branches/ligi_j2me/build.props
1,2 → 1,2
screensize=176x220
screensize=240x320
 
/branches/ligi_j2me/build.xml
25,7 → 25,7
manifest="${build_dir}/bin/MANIFEST.MF"
name="${project_name}"
vendor="LiGi"
version="0.36">
version="0.37">
<attribute name="MIDletX-No-Command" value="true"/>
<attribute name="MIDlet-Icon" value="i.png"/>
<midlet name="${project_name}" class="${project_name}" icon="i.png" />
/branches/ligi_j2me/src/MKCommunicator.java
141,6 → 141,7
 
}
 
// FC - Function Mappers
 
// send a version Request to the FC - the reply to this request will be processed in process_data when it arrives
public void get_version()
160,15 → 161,46
int[] params=new int[1];
params[0]=id;
 
while(sending)
{try { Thread.sleep(50); }
catch (Exception e) { }
}
 
send_command(0,'q',params);
}
 
public void trigger_LCD(int key)
{
if (sending) return;
 
int[] params=new int[3];
params[0]=key;
params[1]=0;
params[2]=0;
send_command(0,'h',params);
}
 
 
public void write_params()
{
while(sending)
{try { Thread.sleep(50); }
catch (Exception e) { }
}
 
send_command(0,(char)('l'+params.act_paramset),params.field[params.act_paramset]);
}
 
 
boolean sending=false;
 
// send command to FC ( add crc and pack into pseudo Base64
public void send_command(int modul,char cmd,int[] params)
{
sending=true;
char[] send_buff=new char[5 + (params.length/3 + (params.length%3==0?0:1) )*4]; // 5=1*start_char+1*addr+1*cmd+2*crc
send_buff[0]='#';
send_buff[1]=(char)modul;
213,7 → 245,8
catch (Exception e)
{ // problem sending data to FC
}
 
sending=false;
}
 
 
/branches/ligi_j2me/src/MKLCD.java
56,16 → 56,12
{
try {
 
int[] params=new int[3];
params[0]=act_key;
params[1]=0;
params[2]=0;
mk.send_command(0,'h',params);
mk.trigger_LCD(act_key);
act_key=0;
}
catch (Exception e) { }
}
 
int act_key=0;
 
/branches/ligi_j2me/src/MKMiniCanvas.java
414,6 → 414,7
 
// falltru wanted
case STATEID_SELECT_PARAMSET:
case STATEID_HANDLE_PARAMS:
case STATEID_DEVICESELECT:
paint_menu(g);
521,12 → 522,20
lcd_lines=new String[3];
lcd_lines[0]="Scanning for Devices";
lcd_lines[1]=" ";
lcd_lines[2]="DUBwise v0.36 ";
lcd_lines[2]="DUBwise v0.37 ";
mk.close_connections(true);
bt_scanner.search();
break;
 
case STATEID_HANDLE_PARAMS:
menu_items=new String[2];
menu_items[0]="write to MK";
menu_items[1]="Discard";
lcd_lines=new String[2];
 
break;
 
case STATEID_SELECT_PARAMSET:
menu_items=new String[5];
for (int i=0;i<5;i++)
571,7 → 580,11
if (keyCode==KEY_STAR)
{
chg_state(STATEID_MAINMENU);
if (state==STATEID_EDIT_PARAMS)
chg_state(STATEID_HANDLE_PARAMS);
else
chg_state(STATEID_MAINMENU);
return;
}
if (keyCode==KEY_POUND)
609,6 → 622,18
}
 
break;
case STATEID_HANDLE_PARAMS:
if ( getGameAction (keyCode)==FIRE )
switch(act_menu_select)
{
case 0:
mk.write_params();
default:
chg_state(STATEID_MAINMENU);
}
else
menu_keypress(keyCode);
break;
case STATEID_MAINMENU:
if ( getGameAction (keyCode)==FIRE )
switch(act_menu_select)
/branches/ligi_j2me/src/MKParamsEditor.java
24,7 → 24,7
 
 
public String[] tab_names={"Configuration","Channels","Stick","Altitude","Gyro","Looping","Camera","Other","User"};
public int[] tab_entrys_count={6,8,3,6,4,6,6,5,4};
public int[] tab_entrys_count={6,8,3,6,4,6,6,6,4};
public String[][] tab_entrys={{"Altitude Contol","Switch for setpoint","Heading Hold","Compass","Orientation fixed","GPS"}
,