[rcpilot-cvs] src/rcpilot/tests TestServer.java,1.2,1.3

[<mjp...@us...>]

Update of /cvsroot/rcpilot/src/rcpilot/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28103

Modified Files:
	TestServer.java 
Log Message:
Added lattitude and longitude.


Index: TestServer.java
===================================================================
RCS file: /cvsroot/rcpilot/src/rcpilot/tests/TestServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestServer.java	9 Mar 2004 00:45:11 -0000	1.2
--- TestServer.java	9 Mar 2004 20:35:08 -0000	1.3
***************
*** 12,16 ****
  	
  	private static byte[] data = new byte[1024];
! 	private final static int dataSize = 54;
  	
  	private static short altitude = 1000; 
--- 12,16 ----
  	
  	private static byte[] data = new byte[1024];
! 	private final static int dataSize = 64;
  	
  	private static short altitude = 1000; 
***************
*** 20,29 ****
  	private static short course = 0;	
  	private static short rpm = 12000;		
! 	private static int   latitude = 1999675000;
! 	private static int   longitutde = 0;
  	
  	private static int   altdir  = 1;
  	private static int   rolldir = 1;
! 	private static int   coursedir = 1;	
  						
  	
--- 20,31 ----
  	private static short course = 0;	
  	private static short rpm = 12000;		
! 	private static int   lat =  16363980;
! 	private static int   lon = -26609700;
  	
  	private static int   altdir  = 1;
  	private static int   rolldir = 1;
! 	private static int   coursedir = 1;
! 	private static int   latdir = 1;
! 	private static int   londir = 1;		
  						
  	
***************
*** 88,98 ****
  		
  	
! 	public static void doLatitude(){	
! 		int dir =  Math.random() > 0.5 ?1:-1;
! 		latitude = (int)(latitude + (dir * (int)(10 * Math.random())));
! 		latitude = (int)Math.max(-1944000000, latitude);
! 		latitude = (int)Math.min(1944000000, latitude);		
  	}
  	
  	
  	public static void buildData(){
--- 90,111 ----
  		
  	
! 	public static void doLat(){	
! 	    if(Math.random() > 0.8){
! 			latdir = latdir * -1;
! 		}
! 		lat = (int)(lat + (latdir * (int)(50 * Math.random())));
! 		lat = (int)Math.max(-1944000000, lat);
! 		lat = (int)Math.min(1944000000, lat);		
  	}
  	
+ 	public static void doLon(){	
+ 	    if(Math.random() > 0.8){
+ 			londir = londir * -1;
+ 		}
+ 		lon = (int)(lon + (londir * (int)(50 * Math.random())));
+ 		lon = (int)Math.max(-1944000000, lon);
+ 		lon = (int)Math.min(1944000000, lon);		
+ 	}	
+ 	
  	
  	public static void buildData(){
***************
*** 130,134 ****
  	  data[27] = 0x00;  // Call To - Null Terminated
  	  
! 	  data[28] = 0x12;  // Data Length	little endian
  	  data[29] = 0x00;  // Data Length
  	  data[30] = 0x00;  // Data Length
--- 143,147 ----
  	  data[27] = 0x00;  // Call To - Null Terminated
  	  
! 	  data[28] = 0x1C;  // Data Length	little endian
  	  data[29] = 0x00;  // Data Length
  	  data[30] = 0x00;  // Data Length
***************
*** 171,175 ****
  	  data[51] = (byte)0xA0; 
  	  data[52] = (byte)(rpm & 0xFF);	// little endian	   
! 	  data[53] = (byte)((rpm >> 8) & 0xFF);	 	  
  	  	  
  	}
--- 184,203 ----
  	  data[51] = (byte)0xA0; 
  	  data[52] = (byte)(rpm & 0xFF);	// little endian	   
! 	  data[53] = (byte)((rpm >> 8) & 0xFF);
! 	  
! 	  doLat();
! 	  data[54] = (byte)0x20;
! 	  data[55] = (byte)(lat & 0xFF);	// little endian	  	   
! 	  data[56] = (byte)((lat >> 8) & 0xFF);	  
! 	  data[57] = (byte)((lat >> 16) & 0xFF);  
! 	  data[58] = (byte)((lat >> 24) & 0xFF);
! 	  
! 	  doLon();
! 	  data[59] = (byte)0x21;
! 	  data[60] = (byte)(lon & 0xFF);	// little endian	  	   
! 	  data[61] = (byte)((lon >> 8) & 0xFF);	  
! 	  data[62] = (byte)((lon >> 16) & 0xFF);  
! 	  data[63] = (byte)((lon >> 24) & 0xFF);	  
! 	  	  
  	  	  
  	}