# HG changeset patch
# User positron96 <positron96@gmail.com>
# Date 1374910026 -25200
#      Sat Jul 27 14:27:06 2013 +0700
# Branch cut-lejos-0.9.1-3
# Node ID 922d85a79ea6c6d6516aeb0b738cfc3c2b9f478f
# Parent  e814c535bcf4e54ba855f22b21d11cc8cffa8001
* Remove extra dependencies in addon package

diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/LDCMotor.java
--- a/src/lejos/nxt/addon/LDCMotor.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/LDCMotor.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,6 +1,6 @@
 package lejos.nxt.addon;
 
-import lejos.nxt.SensorPort;
+import lejos.nxt.I2CPort;
 
 /*
  * WARNING: THIS CLASS IS SHARED BETWEEN THE classes AND pccomms PROJECTS.
@@ -31,11 +31,11 @@
 	 * @param SPI_PORT
 	 *  
 	 */
-	public LDCMotor(SensorPort port, int location, String DCMotorName, byte SPI_PORT){
+	public LDCMotor(I2CPort port, int location, String DCMotorName, byte SPI_PORT){
 		super(port,location,DCMotorName,SPI_PORT);
 	}
 
-	public LDCMotor(SensorPort port, int location, String DCMotorName, byte SPI_PORT,int forwardMinSpeed,int forwardMaxSpeed,int backwardMinSpeed, int backwardMaxSpeed){
+	public LDCMotor(I2CPort port, int location, String DCMotorName, byte SPI_PORT,int forwardMinSpeed,int forwardMaxSpeed,int backwardMinSpeed, int backwardMaxSpeed){
 		super(port,location,DCMotorName,SPI_PORT);
 		
 		this.forward_min_speed = forwardMinSpeed;
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/LMotor.java
--- a/src/lejos/nxt/addon/LMotor.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/LMotor.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,6 +1,6 @@
 package lejos.nxt.addon;
 
-import lejos.nxt.SensorPort;
+import lejos.nxt.I2CPort;
 import lejos.nxt.I2CSensor;
 
 /*
@@ -20,7 +20,7 @@
 	protected int LSC_position; //Position where Servo has been plugged
 	
 	//Servo ID
-	private SensorPort portConnected;//What
+	private I2CPort portConnected;//What
 	protected byte SPI_PORT;//What SPI Port is connected LSC
 
 	public static final int arrMotorUnload[] = {0x01,0x02,0x04,0x08,0x20,0x40,0x80,0x100,0x200};
@@ -35,7 +35,7 @@
 	 * @param SPI_PORT the SPI port
 	 *  
 	 */
-	public LMotor(SensorPort port, int location, String name, byte SPI_PORT){
+	public LMotor(I2CPort port, int location, String name, byte SPI_PORT){
 		super(port);
 		this.name = name;
 		this.LSC_position = location;
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/LSC.java
--- a/src/lejos/nxt/addon/LSC.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/LSC.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,6 +1,6 @@
 package lejos.nxt.addon;
 
-import lejos.nxt.SensorPort;
+import lejos.nxt.I2CPort;
 import lejos.nxt.I2CSensor;
 import java.util.ArrayList;
 
@@ -31,7 +31,7 @@
 	
 	//I2C
 	private byte SPI_PORT;	
-	private SensorPort portConnected;
+	private I2CPort portConnected;
 	
 	/**
 	 * 
@@ -41,7 +41,7 @@
 	 * @param SPI_PORT
 	 * 
 	 */
-	public LSC(SensorPort port,byte SPI_PORT){
+	public LSC(I2CPort port,byte SPI_PORT){
 		super(port);
 		this.portConnected = port;
 		this.SPI_PORT = SPI_PORT;
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/LServo.java
--- a/src/lejos/nxt/addon/LServo.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/LServo.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,6 +1,6 @@
 package lejos.nxt.addon;
 
-import lejos.nxt.SensorPort;
+import lejos.nxt.I2CPort;
 
 /*
  * WARNING: THIS CLASS IS SHARED BETWEEN THE classes AND pccomms PROJECTS.
@@ -28,7 +28,7 @@
 	 * @param SPI_PORT
 	 *  
 	 */
-	public LServo(SensorPort port, int location, String servoName, byte SPI_PORT){
+	public LServo(I2CPort port, int location, String servoName, byte SPI_PORT){
 		super(port,location,servoName,SPI_PORT);
 	}
 
@@ -44,7 +44,7 @@
 	 * @param max_angle
 	 *
 	 */
-	public LServo(SensorPort port, int location, String servoName, byte SPI_PORT,int min_angle, int max_angle){
+	public LServo(I2CPort port, int location, String servoName, byte SPI_PORT,int min_angle, int max_angle){
 		super(port,location,servoName,SPI_PORT);
 		
 		this.min_angle = min_angle;
@@ -64,7 +64,7 @@
 	 * @param init_angle
 	 *
 	 */
-	public LServo(SensorPort port, int location, String servoName, byte SPI_PORT,int min_angle, int max_angle,int init_angle){
+	public LServo(I2CPort port, int location, String servoName, byte SPI_PORT,int min_angle, int max_angle,int init_angle){
 		super(port,location,servoName,SPI_PORT);
 		
 		this.min_angle = min_angle;
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/MSC.java
--- a/src/lejos/nxt/addon/MSC.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/MSC.java	Sat Jul 27 14:27:06 2013 +0700
@@ -69,7 +69,7 @@
 	private MServo[] arrServo; //ServoController manages up to 8 RC Servos
 
 	//I2C	
-	private SensorPort portConnected;
+	private I2CPort portConnected;
 
 	/**
 	 * 
@@ -78,7 +78,7 @@
 	 * @param port the NXTServo is connected to
 	 * 
 	 */
-	public MSC(SensorPort port){
+	public MSC(I2CPort port){
 		super(port);
 		port.setType(TYPE_LOWSPEED_9V);
 		this.setAddress(NXTSERVO_ADDRESS);
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/MServo.java
--- a/src/lejos/nxt/addon/MServo.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/MServo.java	Sat Jul 27 14:27:06 2013 +0700
@@ -37,7 +37,7 @@
 	 * @param location
 	 *
 	 */
-	public MServo(SensorPort port, int location){
+	public MServo(I2CPort port, int location){
 		super(port);
 		this.servoPosition = location;
 	}
@@ -53,7 +53,7 @@
 	 * @param servoName
 	 *
 	 */
-	public MServo(SensorPort port, int location, String servoName){
+	public MServo(I2CPort port, int location, String servoName){
 		super(port);
 		this.servoPosition = location;
 	}
@@ -69,7 +69,7 @@
 	 * @param max_angle
 	 *
 	 */
-	public MServo(SensorPort port, int location, String servoName, int min_angle, int max_angle){
+	public MServo(I2CPort port, int location, String servoName, int min_angle, int max_angle){
 		this(port,location,servoName);
 		
 		this.minAngle = min_angle;
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/NXTMMX.java
--- a/src/lejos/nxt/addon/NXTMMX.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/NXTMMX.java	Sat Jul 27 14:27:06 2013 +0700
@@ -2,7 +2,6 @@
 
 import lejos.nxt.I2CPort;
 import lejos.nxt.I2CSensor;
-import lejos.nxt.SensorPort;
 
 /*
  * WARNING: THIS CLASS IS SHARED BETWEEN THE classes AND pccomms PROJECTS.
@@ -66,7 +65,7 @@
      * @see SensorPort#S3
      * @see SensorPort#S4
 	 */
-	public  NXTMMX(SensorPort port, int address){
+	public  NXTMMX(I2CPort port, int address){
 		super(port, address, I2CPort.LEGO_MODE, TYPE_LOWSPEED);
 		reset();
 //		A = new NXTMMXMotor(this, 0);
@@ -77,7 +76,7 @@
 	 * Constructor for the NXTMMX
 	 * @param port - the port its plugged in to
 	 */
-	public  NXTMMX(SensorPort port){
+	public  NXTMMX(I2CPort port){
         this(port, DEFAULT_MMX_ADDRESS);
 	}
 
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/NXTe.java
--- a/src/lejos/nxt/addon/NXTe.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/NXTe.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,6 +1,5 @@
 package lejos.nxt.addon;
 
-import lejos.nxt.SensorPort;
 import lejos.nxt.I2CPort;
 import lejos.nxt.I2CSensor;
 import java.util.ArrayList;
@@ -28,7 +27,7 @@
 	private final String ERROR_SPI_CONFIGURATION = "Error in SPI Configuration";
 	
 	//I2C
-	private SensorPort portConnected;
+	private I2CPort portConnected;
 	private final byte SPI_PORT[] = {0x01,0x02,0x04,0x08};//SPI Ports where you connect LSC
 	public static final byte NXTE_ADDRESS = 0x50;
 	private final byte REGISTER_IIC = (byte)0xF0;//NXTe IIC address
@@ -38,7 +37,7 @@
 	 * 
 	 * @param port
 	 */
-	public NXTe(SensorPort port){
+	public NXTe(I2CPort port){
 		super(port, NXTE_ADDRESS, I2CPort.LEGO_MODE, TYPE_LOWSPEED_9V);
 		
 		port.setType(TYPE_LOWSPEED_9V);
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/PSPNXController.java
--- a/src/lejos/nxt/addon/PSPNXController.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/PSPNXController.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,6 +1,5 @@
 package lejos.nxt.addon;
 
-import lejos.nxt.SensorPort;
 import lejos.nxt.I2CSensor;
 import lejos.nxt.I2CPort;
 
@@ -47,11 +46,11 @@
 
 	private byte[] buf = new byte[2];
 
-	public PSPNXController(SensorPort port)	{
+	public PSPNXController(I2CPort port)	{
         this(port, DEFAULT_I2C_ADDRESS);
     }
 
-	public PSPNXController(SensorPort port, int address)	{
+	public PSPNXController(I2CPort port, int address)	{
 		super(port, address, I2CPort.LEGO_MODE, TYPE_LOWSPEED);
 		// Set correct sensor type, default is TYPE_LOWSPEED
 		// port.setType(TYPE_LOWSPEED_9V);
diff -r e814c535bcf4 -r 922d85a79ea6 src/lejos/nxt/addon/tetrix/TetrixControllerFactory.java
--- a/src/lejos/nxt/addon/tetrix/TetrixControllerFactory.java	Sat Jul 27 14:23:38 2013 +0700
+++ b/src/lejos/nxt/addon/tetrix/TetrixControllerFactory.java	Sat Jul 27 14:27:06 2013 +0700
@@ -1,9 +1,7 @@
 package lejos.nxt.addon.tetrix;
 
-import lejos.nxt.Button;
 import lejos.nxt.I2CPort;
 import lejos.nxt.I2CSensor;
-import lejos.nxt.SensorPort;
 
 /**
  * HiTechnic Tetrix Motor and Servo Controller factory class used to provide Motor and Servo controller abstractions.