Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 324 → Rev 325

/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"}
,