/DUBwise/trunk/shared/src/DUBwiseLangDefs.java |
---|
182,5 → 182,6 |
public final static int STRINGID_PARAMRESETOK=178; |
public final static int STRINGID_WRITINGPARAMS=179; |
public final static int STRINGID_GRAPHINTERVAL=180; |
public final static int STRING_COUNT=181; |
public final static int STRINGID_ALTIMETER=181; |
public final static int STRING_COUNT=182; |
} |
/DUBwise/trunk/shared/src/MKCommunicator.java |
---|
55,12 → 55,31 |
} |
public int Alt() // in dm |
{ |
int alt=0; |
if (ufo_prober.is_mk()) |
alt=debug_data.analog[5]/3; |
else |
if (ufo_prober.is_navi()) |
alt=gps_position.Altimeter/3; |
if ( alt<0) alt=0; // mk |
if ( alt>20000) alt=0; // navi |
return alt; |
} |
public String Alt_formated() // in dm |
{ |
return "" + Alt()/10 + "m"; |
} |
public int AngleRoll() |
{ |
if (ufo_prober.is_mk()) |
if (ufo_prober.is_mk()) |
return angle_roll; |
else if (ufo_prober.is_navi()) |
return debug_data.analog[1]; |
return -1; |
740,6 → 759,8 |
stats.debug_data_count++; |
debug_data.set_by_mk_data(Decode64(data,3,len-3),version); |
if (ufo_prober.is_mk()) |
stats.process_mkflags(debug_data.motor_val(0)); // TODO remove dirty hack |
if (debug_buff_targets!=null) |
{ |
for (int sp=0;sp<debug_buff_targets.length;sp++) |
821,6 → 842,8 |
gps_position.set_by_mk_data(Decode64(data,3,len-3),version); |
stats.process_mkflags(gps_position.MKFlags); |
stats.process_compas(gps_position.CompasHeading); |
log("long:" + gps_position.Longitude); |
log("lat:" + gps_position.Latitude); |
838,6 → 861,8 |
} |
public boolean force_disconnect=true; |
public void close_connections(boolean force) |
/DUBwise/trunk/shared/src/MKStatistics.java |
---|
12,11 → 12,11 |
public class MKStatistics |
{ |
public int bytes_in=0; |
public int bytes_out=0; |
public int resend_count=0; |
public int debug_data_count=0; |
42,6 → 42,42 |
public int external_control_request_count=0; |
public long flying_start=-1; |
public int heading_start=0; |
public int last_heading=0; |
public void process_mkflags(int flags) |
{ |
if (flags==0) |
flying_start=-1; |
else |
if (flying_start==-1) |
{ |
flying_start=System.currentTimeMillis(); |
heading_start=last_heading; |
} |
} |
public void process_compas(int heading) |
{ |
last_heading=heading; |
} |
public int flying_time() |
{ |
if (flying_start!=-1) |
return (int)((System.currentTimeMillis()-flying_start)/1000); |
else |
return 0; |
} |
public void reset() |
{ |