Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 263 → Rev 264

/DUBwise/trunk/shared/src/DUBwiseDefinitions.java
11,6 → 11,7
public final static byte USER_INTENT_RCDATA =4;
public final static byte USER_INTENT_LCD =5;
public final static byte USER_INTENT_EXTERNAL_CONTROL =6;
public final static byte USER_INTENT_GPSOSD =7;
 
 
public final static byte GPS_FORMAT_DECIMAL =0;
/DUBwise/trunk/shared/src/MKCommunicator.java
36,7 → 36,7
public boolean init_bootloader=false;
 
public byte lib_version_major=0;
public byte lib_version_minor=5;
public byte lib_version_minor=6;
 
public String lib_version_str()
{
44,6 → 44,29
}
 
public int AngleNick()
{
if (ufo_prober.is_mk())
return angle_nick;
else if (ufo_prober.is_navi())
return debug_data.analog[0];
return -1;
 
}
 
 
public int AngleRoll()
{
if (ufo_prober.is_mk())
return angle_roll;
else if (ufo_prober.is_navi())
 
return debug_data.analog[1];
return -1;
}
 
 
/***************** Section: public Attributes **********************************************/
public boolean connected=false; // flag for the connection state
 
58,6 → 81,11
 
int data_buff_pos=0;
 
 
// public final static int DATA_IN_BUFF_SIZE=512;
public final static int DATA_IN_BUFF_SIZE=2048;
// public final static int DATA_IN_BUFF_SIZE=4096;
 
public byte user_intent=0;
public final static int[] crc16_table = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
99,7 → 127,8
//#ifdef android
if (do_log) Log.d("MK-Comm",str);
//#endif
System.out.println(str);
// canvas.debug.log(str);
// System.out.println(str);
}
 
public int CRC16(int ch, int crc)
413,7 → 442,7
 
public void switch_todo()
{
sleep(50);
sleep(150);
version=new MKVersion();
LCD= new MKLCD(this);
debug_data=new MKDebugData();
534,8 → 563,15
 
public void set_debug_interval(int interval)
{
send_command(FC_SLAVE_ADDR,'d',interval);
send_command(2,'d',interval);
}
 
 
public void set_gpsosd_interval(int interval)
{
send_command(NAVI_SLAVE_ADDR,'o',interval);
}
 
public void send_command(int modul,char cmd)
{
send_command(modul,cmd,new int[0]);
654,7 → 690,9
 
debug_buff_off=0;
debug_buff_len=len;
 
debug_buff_interval=interval;
if (debug_buff_interval<2)debug_buff_interval=2;
debug_buff_targets=targets;
debug_buff_max=1;
debug_buff_lastset=0;
677,7 → 715,7
public void process_data(byte[] data,int len)
{
 
 
slave_addr=data[1];
log("command " +(char)data[2] );
switch((char)data[2])
{
1117,7 → 1155,11
 
byte[] data_set=new byte[1024];
int data_set_pos=0;
byte[] data_in_buff=new byte[2048];
 
 
 
 
byte[] data_in_buff=new byte[DATA_IN_BUFF_SIZE];
int input;
int pos=0;
1129,6 → 1171,10
log("Thread started");
while(true)
{
 
data_buff[data_buff_pos]="ct-l" +data_buff_pos + "" + connected ;
data_buff_pos++;
data_buff_pos%=DATA_BUFF_LEN;
if (!connected)
{
1146,13 → 1192,28
*/
recieving=true;
int read_count =reader.read(data_in_buff,0,reader.available());
int read_count ;
 
 
 
if (reader.available()<DATA_IN_BUFF_SIZE)
read_count =reader.read(data_in_buff,0,reader.available());
else
read_count =reader.read(data_in_buff,0,DATA_IN_BUFF_SIZE);
 
 
if ( read_count!=0)
{
data_buff[data_buff_pos]="avail:" + reader.available();
data_buff_pos++;
data_buff_pos%=DATA_BUFF_LEN;
}
// log("Connected - reading data " + read_count);
// pos=0;
input=0;
//data_buff[data_buff_pos]="";
// recieve data-set
if (read_count==0) sleep(50);
if (read_count==0) sleep(20);
 
// int read_count =reader.read(data_in_buff,0,reader.available());
stats.bytes_in+=read_count;
1213,7 → 1274,7
}
else
sleep(50);
sleep(5);
/*
while ((input != 13)) //&&(input!=-1))
{
/DUBwise/trunk/shared/src/MKWatchDog.java
164,9 → 164,13
 
break;
 
case USER_INTENT_GPSOSD:
mk.set_gpsosd_interval(1);
break;
case USER_INTENT_GRAPH:
mk.set_debug_interval(mk.debug_buff_interval);
mk.set_debug_interval(1);
break;
default:
// mk.log("uncactched intent " +mk.root.canvas.user_intent );
break;