From 61dc76d00ed44a6876c68d8d6f687d237bc6ff47 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 3 Sep 2016 17:43:56 +0800 Subject: [PATCH 01/75] Partial: Major Fixes --- src/main/java/org/ev3dev/hardware/Device.java | 64 +++++++++++-------- src/main/java/org/ev3dev/hardware/LED.java | 18 ++++-- .../java/org/ev3dev/hardware/PowerSupply.java | 14 ++-- .../org/ev3dev/hardware/motors/DCMotor.java | 8 +-- .../org/ev3dev/hardware/motors/Linear.java | 8 +-- .../org/ev3dev/hardware/motors/Motor.java | 8 +-- .../ev3dev/hardware/motors/ServoMotor.java | 4 +- .../org/ev3dev/hardware/ports/LegoPort.java | 18 +++--- .../org/ev3dev/hardware/sensors/Sensor.java | 6 +- .../ev3dev/io/{Sysclass.java => Sysfs.java} | 16 ++--- 10 files changed, 93 insertions(+), 71 deletions(-) rename src/main/java/org/ev3dev/io/{Sysclass.java => Sysfs.java} (87%) diff --git a/src/main/java/org/ev3dev/hardware/Device.java b/src/main/java/org/ev3dev/hardware/Device.java index 388f54f..3da4a28 100644 --- a/src/main/java/org/ev3dev/hardware/Device.java +++ b/src/main/java/org/ev3dev/hardware/Device.java @@ -3,7 +3,7 @@ import java.io.IOException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /** * This is the base class that handles control tasks for a single port or index. The class must chose one device out of the available ports to control. Given an IO port (in the constructor), an implementation should:
@@ -21,11 +21,11 @@ public abstract class Device { private String className; - private String subClassName = null; + private String classNamePrefix = null; private String address; - private String hardwareName = null; + private String classFullName = null; private LegoPort port; @@ -41,16 +41,16 @@ public Device(String className){ } /** - * Create a new device with a LegoPort, ClassName, SubClassName + * Create a new device with a LegoPort, ClassName, classNamePrefix * @param port A LegoPort delared before. * @param className Sysfs class name - * @param subClassName The filename inside the "Sysfs class" (I called it sub-class) + * @param classNamePrefix The filename inside the "Sysfs class" (I called it sub-class) * @throws IOException If I/O goes wrong */ - public Device(LegoPort port, String className, String subClassName) throws IOException{ + public Device(LegoPort port, String className, String classNamePrefix) throws IOException{ this.port = port; this.className = className; - this.subClassName = subClassName; + this.classNamePrefix = classNamePrefix; try { address = port.getAddress(); } catch (IOException e){ @@ -68,20 +68,24 @@ public Device(LegoPort port, String className, String subClassName) throws IOExc System.out.println(className + "-" + this.hashCode() + ": Connected to " + address); } + public abstract String getAddress() throws IOException; + + public abstract String getDriverName() throws IOException; + /** - * Set the Sysfs class name(location) of this Device - * @param className A Sysfs class name located in /sys/class + * Set the Sysfs class name (location) of this Device + * @param className The Sysfs class name located in /sys/class */ public void setClassName(String className){ this.className = className; } /** - * Set the filename inside the Sysfs class (sub-class) of this Device - * @param subClassName A filename inside the Sysfs class (e.g. "/sys/class/motor/motor0" motor0 is sub-class name) + * Set the filename prefix inside the Sysfs class (prefix (e.g. motor)) of this Device + * @param classNamePrefix The filename inside the Sysfs class (e.g. "/sys/class/motor/motor0" motor is a prefix) */ - public void setSubClassName(String subClassName){ - this.subClassName = subClassName; + public void setClassNamePrefix(String classNamePrefix){ + this.classNamePrefix = classNamePrefix; } /** @@ -101,21 +105,29 @@ public LegoPort getPort(){ } /** - * Get the sub-class name of this Device - * @return A filename inside the Sysfs class (e.g. "/sys/class/motor/motor0" motor0 is sub-class name) + * Get the filename prefix inside the Sysfs class (prefix (e.g. motor)) of this Device + * @return The filename inside the Sysfs class (e.g. "/sys/class/motor/motor0" motor is a prefix) + */ + public String getClassNamePrefix(){ + return classNamePrefix; + } + + /** + * Get the full filename (not prefix) inside the Sysfs class of this Device. This must be already searched by the checkIsConnected() method + * @return The filename inside the Sysfs class (e.g. "/sys/class/motor/motor0" motor0 is the full name) */ - public String getSubClassName(){ - return hardwareName; + public String getClassFullName(){ + return classNamePrefix; } /*** - * Reads the property of the class specified. - * @param property The property name of the class. + * Reads the property specified. + * @param property The property name * @return The value of the property */ public final String getAttribute(String property){ try { - String str = Sysclass.getAttribute(className, hardwareName, property); + String str = Sysfs.getAttribute(className, classFullName, property); connected = true; return str; } catch (IOException e){ @@ -126,14 +138,14 @@ public final String getAttribute(String property){ } /*** - * Writes the property of the class specified. - * @param property The property name of the class + * Writes the property specified. + * @param property The property name * @param new_value The new value of the property * @return Boolean whether the attribute was successfully written */ public final boolean setAttribute(String property, String new_value){ try { - Sysclass.setAttribute(className, hardwareName, property, new_value); + Sysfs.setAttribute(className, classFullName, property, new_value); connected = true; } catch (IOException e){ e.printStackTrace(); @@ -144,11 +156,11 @@ public final boolean setAttribute(String property, String new_value){ private boolean checkIsConnected(){ try { - hardwareName = Sysclass.getHardwareName(className, subClassName, address); + classFullName = Sysfs.searchClassFullName(className, classNamePrefix, address); } catch (Exception ignore){ - hardwareName = null; + classFullName = null; return false; } - return hardwareName != null; + return classFullName != null; } } \ No newline at end of file diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index 69a7614..eaefc59 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -5,7 +5,7 @@ import org.ev3dev.exception.InvalidLEDException; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /*** * Any device controlled by the generic LED driver.
@@ -54,7 +54,7 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ String direction = leftRightField == 0 ? "left" : "right"; String color = colorField == 0 ? "green" : "red"; - this.setSubClassName("ev3:" + direction + ":" + color + ":ev3dev"); + this.setClassName("ev3:" + direction + ":" + color + ":ev3dev"); } /** @@ -73,7 +73,7 @@ public LED(String ledName) throws InvalidLEDException{ if (!file.exists()){ throw new InvalidLEDException("The specified LED does not exist"); } - this.setSubClassName(ledName); + this.setClassName(ledName); } /** @@ -126,7 +126,7 @@ public String getTriggersViaString() throws IOException{ */ public String[] getTriggers() throws IOException{ String str = getTriggersViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -204,4 +204,14 @@ public void setDelay_On(int delay_on) throws IOException{ public void setDelay_Off(int delay_off) throws IOException{ this.setAttribute(Def.PROPERTY_DELAY_OFF, Integer.toString(delay_off)); } + + @Override + public String getAddress() throws IOException { + return null; + } + + @Override + public String getDriverName() throws IOException { + return null; + } } \ No newline at end of file diff --git a/src/main/java/org/ev3dev/hardware/PowerSupply.java b/src/main/java/org/ev3dev/hardware/PowerSupply.java index 5d7f452..299c5f2 100644 --- a/src/main/java/org/ev3dev/hardware/PowerSupply.java +++ b/src/main/java/org/ev3dev/hardware/PowerSupply.java @@ -3,7 +3,7 @@ import java.io.IOException; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /*** * A generic interface to read data from the systemˇ¦s power_supply class. Uses the built-in legoev3-battery if none is specified. @@ -18,7 +18,7 @@ public class PowerSupply{ * @throws IOException If I/O goes wrong */ public static int getMeasuredCurrent() throws IOException{ - String str = Sysclass.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_CURRENT); + String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_CURRENT); return Integer.parseInt(str); } @@ -28,7 +28,7 @@ public static int getMeasuredCurrent() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMeasuredVoltage() throws IOException{ - String str = Sysclass.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_VOLTAGE); + String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_VOLTAGE); return Integer.parseInt(str); } @@ -38,7 +38,7 @@ public static int getMeasuredVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMaxVoltage() throws IOException{ - String str = Sysclass.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MAX_VOLTAGE); + String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MAX_VOLTAGE); return Integer.parseInt(str); } @@ -48,7 +48,7 @@ public static int getMaxVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMinVoltage() throws IOException{ - String str = Sysclass.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MIN_VOLTAGE); + String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MIN_VOLTAGE); return Integer.parseInt(str); } @@ -58,7 +58,7 @@ public static int getMinVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static String getTechnology() throws IOException{ - return Sysclass.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TECHNOLOGY); + return Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TECHNOLOGY); } /*** @@ -67,6 +67,6 @@ public static String getTechnology() throws IOException{ * @throws IOException If I/O goes wrong */ public static String getType() throws IOException{ - return Sysclass.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TYPE); + return Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TYPE); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java index 0da9e33..6e90733 100644 --- a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java @@ -7,7 +7,7 @@ import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /** * The DC motor class provides a uniform interface for using regular DC motors @@ -91,7 +91,7 @@ public void stop() throws IOException{ */ public String[] getCommands() throws IOException{ String str = this.getAttribute(Def.PROPERTY_COMMANDS); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -229,7 +229,7 @@ public String getStateViaString() throws IOException{ */ public String[] getState() throws IOException{ String str = getStateViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -287,7 +287,7 @@ public String getStopCommandsViaString() throws IOException{ */ public String[] getStopCommands() throws IOException{ String str = getStopCommandsViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** diff --git a/src/main/java/org/ev3dev/hardware/motors/Linear.java b/src/main/java/org/ev3dev/hardware/motors/Linear.java index b40ec36..37325f6 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Linear.java +++ b/src/main/java/org/ev3dev/hardware/motors/Linear.java @@ -14,7 +14,7 @@ import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; //----------------------------------------------------------------------------- @@ -178,7 +178,7 @@ public String[] getCommands() throws IOException{ return null; } String str = this.getAttribute(Def.PROPERTY_COMMANDS); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -611,7 +611,7 @@ public String[] getState() throws IOException{ return null; } String str = getStateViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -681,7 +681,7 @@ public String[] getStopCommands() throws IOException{ return null; } String str = getStopCommandsViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index e3397fe..1e2e509 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -14,7 +14,7 @@ import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; //----------------------------------------------------------------------------- @@ -180,7 +180,7 @@ public String[] getCommands() throws IOException{ return null; } String str = this.getAttribute(Def.PROPERTY_COMMANDS); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -617,7 +617,7 @@ public String[] getState() throws IOException{ return null; } String str = getStateViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -687,7 +687,7 @@ public String[] getStopCommands() throws IOException{ return null; } String str = getStopCommandsViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** diff --git a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java index d61a4fa..106ede5 100644 --- a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java @@ -7,7 +7,7 @@ import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /** * The servo motor class provides a uniform interface for using hobby type servo motors. @@ -227,6 +227,6 @@ public String getStateViaString() throws IOException{ */ public String[] getState() throws IOException{ String str = getStateViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } } diff --git a/src/main/java/org/ev3dev/hardware/ports/LegoPort.java b/src/main/java/org/ev3dev/hardware/ports/LegoPort.java index 98e68a4..2b190fa 100644 --- a/src/main/java/org/ev3dev/hardware/ports/LegoPort.java +++ b/src/main/java/org/ev3dev/hardware/ports/LegoPort.java @@ -4,7 +4,7 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /*** * The lego-port class provides an interface for working with input and output ports that are compatible with LEGO MINDSTORMS RCX/NXT/EV3, @@ -95,7 +95,7 @@ public LegoPort(int port) throws InvalidPortException{ * @throws IOException If I/O goes wrong */ public String getAddress() throws IOException{ - String address = Sysclass.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "address"); + String address = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "address"); return address; } @@ -105,7 +105,7 @@ public String getAddress() throws IOException{ * @throws IOException if I/O goes wrong */ public String getDriverName() throws IOException{ - String drivername = Sysclass.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "driver_name"); + String drivername = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "driver_name"); return drivername; } @@ -115,8 +115,8 @@ public String getDriverName() throws IOException{ * @throws IOException If I/O goes wrong */ public String[] getModes() throws IOException{ - String modesstr = Sysclass.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "modes"); - return Sysclass.separateSpace(modesstr); + String modesstr = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "modes"); + return Sysfs.separateSpace(modesstr); } /** @@ -128,7 +128,7 @@ public String[] getModes() throws IOException{ * @throws IOException If I/O goes wrong */ public String getMode() throws IOException{ - String mode = Sysclass.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "mode"); + String mode = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "mode"); return mode; } @@ -141,7 +141,7 @@ public String getMode() throws IOException{ * @throws IOException If I/O goes wrong */ public void setMode(String mode) throws IOException{ - Sysclass.setAttribute(SYSTEM_CLASS_NAME, "port" + port, "mode", mode); + Sysfs.setAttribute(SYSTEM_CLASS_NAME, "port" + port, "mode", mode); } /** @@ -152,7 +152,7 @@ public void setMode(String mode) throws IOException{ * @throws IOException If I/O goes wrong */ public void setDevice(String driver) throws IOException{ - Sysclass.setAttribute(SYSTEM_CLASS_NAME, "port" + port, "set_device", driver); + Sysfs.setAttribute(SYSTEM_CLASS_NAME, "port" + port, "set_device", driver); } /** @@ -163,7 +163,7 @@ public void setDevice(String driver) throws IOException{ * @throws IOException If I/O goes wrong */ public String getStatus() throws IOException{ - String status = Sysclass.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "status"); + String status = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "status"); return status; } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java index d4bd18e..3fe912c 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java @@ -6,7 +6,7 @@ import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Def; -import org.ev3dev.io.Sysclass; +import org.ev3dev.io.Sysfs; /** * The sensor class provides a uniform interface for using most of the sensors available for the EV3. @@ -74,7 +74,7 @@ public String getCommandsViaString() throws IOException{ */ public String[] getCommands() throws IOException{ String str = getCommandsViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** @@ -135,7 +135,7 @@ public String getModesViaString() throws IOException{ */ public String[] getModes() throws IOException{ String str = getModesViaString(); - return Sysclass.separateSpace(str); + return Sysfs.separateSpace(str); } /** diff --git a/src/main/java/org/ev3dev/io/Sysclass.java b/src/main/java/org/ev3dev/io/Sysfs.java similarity index 87% rename from src/main/java/org/ev3dev/io/Sysclass.java rename to src/main/java/org/ev3dev/io/Sysfs.java index 24671ca..a68f5c8 100644 --- a/src/main/java/org/ev3dev/io/Sysclass.java +++ b/src/main/java/org/ev3dev/io/Sysfs.java @@ -16,7 +16,7 @@ * @author Anthony * */ -public class Sysclass { +public class Sysfs { /** * Get all sub-class files @@ -166,14 +166,14 @@ private static String readFile(File file) throws IOException{ } /** - * Get the hardware name, using a class name, sub-class name and a address - * @param classname A Main Class Name (e.g. lego-port, tacho-motor) - * @param subclassname A Sub-Class Name, without the value [N] (e.g. motor, sensor) - * @param address Address (e.g. outA, in1) - * @return A hardware name that with equal address, if none, returns null + * Search the full class name, using a class name, FS folder prefix and an address + * @param classname The class Name (e.g. lego-port, tacho-motor) + * @param fsFolderPrefix The FS folder prefix, without the value [N] (e.g. motor, sensor) + * @param address Port address (e.g. outA, in1) + * @return The full FS class folder name, with the same port address, if none, returns null */ - public static String getHardwareName(String classname, String subclassname, String address){ - File[] sub = Sysclass.getAllSubClass(classname); + public static String searchClassFullName(String classname, String fsFolderPrefix, String address){ + File[] sub = Sysfs.getAllSubClass(classname); File file; String data; for (File asub : sub){ From 3c767e23ea762d6fa6ae4f41991df32d7fafb6e7 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 3 Sep 2016 19:05:01 +0800 Subject: [PATCH 02/75] Move all fields from Def class to the classes respectively --- src/main/java/org/ev3dev/hardware/LED.java | 11 +++++++--- .../java/org/ev3dev/hardware/PowerSupply.java | 17 ++++++++++------ .../org/ev3dev/hardware/motors/DCMotor.java | 14 +++++++++++-- .../org/ev3dev/hardware/motors/Linear.java | 12 ++++++++++- .../org/ev3dev/hardware/motors/Motor.java | 14 +++++++++++-- .../ev3dev/hardware/motors/ServoMotor.java | 14 +++++++++++-- .../org/ev3dev/hardware/sensors/Sensor.java | 12 ++++++++++- src/main/java/org/ev3dev/io/Def.java | 20 +------------------ 8 files changed, 78 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index eaefc59..901d80e 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -38,6 +38,11 @@ public class LED extends Device{ */ public static final int RED = 1; + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String LED_CLASS_NAME = "leds"; + /** * Creates a new LED instance. * @param leftRightField The integer field from LED class (e.g. Button.LEFT, Button.RIGHT) @@ -45,7 +50,7 @@ public class LED extends Device{ * @throws InvalidLEDException If the specified LEFT RIGHT field or color field isn't valid. */ public LED(int leftRightField, int colorField) throws InvalidLEDException{ - super(Def.LED_CLASS_NAME); + super(LED_CLASS_NAME); if (leftRightField != 0 && leftRightField != 1){ throw new InvalidLEDException("You are not specifying a EV3_LEFT_LED or EV3_RIGHT_LED field!"); } else if (colorField != 0 && colorField != 1){ @@ -68,8 +73,8 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ * @throws InvalidLEDException If the specified ledName does not exist */ public LED(String ledName) throws InvalidLEDException{ - super(Def.LED_CLASS_NAME); - File file = new File(Def.SYSTEM_CLASS_PATH + Def.LED_CLASS_NAME + "/" + ledName); + super(LED_CLASS_NAME); + File file = new File(Def.SYSTEM_CLASS_PATH + LED_CLASS_NAME + "/" + ledName); if (!file.exists()){ throw new InvalidLEDException("The specified LED does not exist"); } diff --git a/src/main/java/org/ev3dev/hardware/PowerSupply.java b/src/main/java/org/ev3dev/hardware/PowerSupply.java index 299c5f2..6c78e8f 100644 --- a/src/main/java/org/ev3dev/hardware/PowerSupply.java +++ b/src/main/java/org/ev3dev/hardware/PowerSupply.java @@ -12,13 +12,18 @@ */ public class PowerSupply{ + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String POWER_SUPPLY_CLASS_NAME = "power_supply"; + /*** * The measured current that the battery is supplying (in microamps) * @return Measured Current * @throws IOException If I/O goes wrong */ public static int getMeasuredCurrent() throws IOException{ - String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_CURRENT); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_CURRENT); return Integer.parseInt(str); } @@ -28,7 +33,7 @@ public static int getMeasuredCurrent() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMeasuredVoltage() throws IOException{ - String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_VOLTAGE); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_VOLTAGE); return Integer.parseInt(str); } @@ -38,7 +43,7 @@ public static int getMeasuredVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMaxVoltage() throws IOException{ - String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MAX_VOLTAGE); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MAX_VOLTAGE); return Integer.parseInt(str); } @@ -48,7 +53,7 @@ public static int getMaxVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMinVoltage() throws IOException{ - String str = Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MIN_VOLTAGE); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MIN_VOLTAGE); return Integer.parseInt(str); } @@ -58,7 +63,7 @@ public static int getMinVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static String getTechnology() throws IOException{ - return Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TECHNOLOGY); + return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TECHNOLOGY); } /*** @@ -67,6 +72,6 @@ public static String getTechnology() throws IOException{ * @throws IOException If I/O goes wrong */ public static String getType() throws IOException{ - return Sysfs.getAttribute(Def.POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TYPE); + return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TYPE); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java index 6e90733..86788a1 100644 --- a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java @@ -16,6 +16,16 @@ * */ public class DCMotor extends Device{ + + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String DC_MOTOR_CLASS_NAME = "dc-motor"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String MOTOR_CLASS_NAME_PREFIX = "motor"; private String address; @@ -27,13 +37,13 @@ public class DCMotor extends Device{ * @throws InvalidMotorException If the specified port wasn't exist a ServoMotor */ public DCMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException{ - super(port, Def.DC_MOTOR_CLASS_NAME, Def.SUB_MOTOR_CLASS_NAME); + super(port, DC_MOTOR_CLASS_NAME, MOTOR_CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output if (!address.contains("out")){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } else if (!port.getStatus().equals(Def.DC_MOTOR_CLASS_NAME)){ + } else if (!port.getStatus().equals(DC_MOTOR_CLASS_NAME)){ throw new InvalidMotorException("The specified port (" + port.getAddress() + ") isn't a motor (" + port.getStatus() + ")"); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/Linear.java b/src/main/java/org/ev3dev/hardware/motors/Linear.java index 37325f6..bed925d 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Linear.java +++ b/src/main/java/org/ev3dev/hardware/motors/Linear.java @@ -32,6 +32,16 @@ */ public class Linear extends Device{ + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String MOTOR_CLASS_NAME = "tacho-motor"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String LINEAR_MOTOR_CLASS_NAME_PREFIX = "linear"; + //----------------------------------------------------------------------------- private String address; @@ -45,7 +55,7 @@ public class Linear extends Device{ * @throws IOException If the LegoPort specified goes wrong */ public Linear(LegoPort port) throws InvalidPortException, IOException{ - super(port, Def.MOTOR_CLASS_NAME, Def.SUB_LINEAR_CLASS_NAME); + super(port, MOTOR_CLASS_NAME, LINEAR_MOTOR_CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index 1e2e509..6921eeb 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -32,6 +32,16 @@ */ public class Motor extends Device{ + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String MOTOR_CLASS_NAME = "tacho-motor"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String MOTOR_CLASS_NAME_PREFIX = "motor"; + //----------------------------------------------------------------------------- private String address; @@ -45,13 +55,13 @@ public class Motor extends Device{ * @throws IOException If the LegoPort specified goes wrong */ public Motor(LegoPort port) throws InvalidPortException, IOException{ - super(port, Def.MOTOR_CLASS_NAME, Def.SUB_MOTOR_CLASS_NAME); + super(port, MOTOR_CLASS_NAME, MOTOR_CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output if (!address.contains("out")){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } else if (!port.getStatus().equals(Def.MOTOR_CLASS_NAME)){ + } else if (!port.getStatus().equals(MOTOR_CLASS_NAME)){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a motor (" + port.getStatus() + ")"); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java index 106ede5..9ee5bb7 100644 --- a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java @@ -15,6 +15,16 @@ * */ public class ServoMotor extends Device{ + + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String SERVO_MOTOR_CLASS_NAME = "servo-motor"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String SERVO_MOTOR_CLASS_NAME_PREFIX = "motor"; private String address; @@ -26,13 +36,13 @@ public class ServoMotor extends Device{ * @throws InvalidMotorException The specified motor wasn't a motor */ public ServoMotor(LegoPort port) throws InvalidPortException, InvalidMotorException, IOException{ - super(port, Def.SERVO_MOTOR_CLASS_NAME, Def.SUB_MOTOR_CLASS_NAME); + super(port, SERVO_MOTOR_CLASS_NAME, SERVO_MOTOR_CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output if (!address.contains("out")){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } else if (!port.getStatus().equals(Def.SERVO_MOTOR_CLASS_NAME)){ + } else if (!port.getStatus().equals(SERVO_MOTOR_CLASS_NAME)){ throw new InvalidMotorException("The specified port (" + port.getAddress() + ") isn't a motor (" + port.getStatus() + ")"); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java index 3fe912c..d8976d5 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java @@ -23,6 +23,16 @@ * */ public class Sensor extends Device{ + + /** + * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) + */ + public static final String SENSOR_CLASS_NAME = "lego-sensor"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String SENSOR_CLASS_NAME_PREFIX = "sensor"; /** * Creates a new Sensor instance using a LegoPort @@ -31,7 +41,7 @@ public class Sensor extends Device{ * @throws InvalidPortException If the specified LegoPort was invalid */ public Sensor(LegoPort port) throws IOException, InvalidPortException{ - super(port, Def.SENSOR_CLASS_NAME, Def.SUB_SENSOR_CLASS_NAME); + super(port, SENSOR_CLASS_NAME, SENSOR_CLASS_NAME_PREFIX); } /** diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index bb76c4f..01af012 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -11,25 +11,7 @@ public class Def { public static final String SYSTEM_CLASS_PATH = "/sys/class/"; - //Class names - - public static final String MOTOR_CLASS_NAME = "tacho-motor"; - - public static final String DC_MOTOR_CLASS_NAME = "dc-motor"; - - public static final String SERVO_MOTOR_CLASS_NAME = "servo-motor"; - - public static final String LED_CLASS_NAME = "leds"; - - public static final String SENSOR_CLASS_NAME = "lego-sensor"; - - public static final String SUB_SENSOR_CLASS_NAME = "sensor"; - - public static final String SUB_MOTOR_CLASS_NAME = "motor"; - - public static final String SUB_LINEAR_CLASS_NAME = "linear"; - - public static final String POWER_SUPPLY_CLASS_NAME = "power_supply"; + //Class names REMOVAL DONE! //Driver names From 7197ca161287972946f19e66083840a7e7b17e49 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 3 Sep 2016 19:25:09 +0800 Subject: [PATCH 03/75] Move Def.SYSTEM_CLASS_PATH field to Sysfs.SYSTEM_CLASS_PATH --- src/main/java/org/ev3dev/hardware/LED.java | 2 +- .../org/ev3dev/hardware/sensors/ColorSensor.java | 1 - src/main/java/org/ev3dev/io/Def.java | 4 +--- src/main/java/org/ev3dev/io/Sysfs.java | 12 ++++++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index 901d80e..79280e9 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -74,7 +74,7 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ */ public LED(String ledName) throws InvalidLEDException{ super(LED_CLASS_NAME); - File file = new File(Def.SYSTEM_CLASS_PATH + LED_CLASS_NAME + "/" + ledName); + File file = new File(Sysfs.SYSTEM_CLASS_PATH + LED_CLASS_NAME + "/" + ledName); if (!file.exists()){ throw new InvalidLEDException("The specified LED does not exist"); } diff --git a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java index 04b92fb..306912b 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java @@ -5,7 +5,6 @@ import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; -import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Def; diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 01af012..aa44b2a 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -7,9 +7,7 @@ */ public class Def { - //System class path - - public static final String SYSTEM_CLASS_PATH = "/sys/class/"; + //System class path REMOVAL DONE! //Class names REMOVAL DONE! diff --git a/src/main/java/org/ev3dev/io/Sysfs.java b/src/main/java/org/ev3dev/io/Sysfs.java index a68f5c8..060905a 100644 --- a/src/main/java/org/ev3dev/io/Sysfs.java +++ b/src/main/java/org/ev3dev/io/Sysfs.java @@ -7,7 +7,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; -import java.security.AccessControlException; import java.util.ArrayList; import java.util.List; @@ -18,13 +17,18 @@ */ public class Sysfs { + /** + * The Sysfs class path (/sys/class) + */ + public static final String SYSTEM_CLASS_PATH = "/sys/class"; + /** * Get all sub-class files * @param class_name Main Class Name * @return File Array */ public static File[] getAllSubClass(String class_name){ - File file = new File(Def.SYSTEM_CLASS_PATH + class_name); + File file = new File(SYSTEM_CLASS_PATH + class_name); File[] files = file.listFiles(); return files; } @@ -38,7 +42,7 @@ public static File[] getAllSubClass(String class_name){ * @throws IOException If the API couldn't read the class's property */ public static String getAttribute(String class_name, String property) throws FileNotFoundException, IOException{ - File file = new File(Def.SYSTEM_CLASS_PATH + class_name + "/" + property); + File file = new File(SYSTEM_CLASS_PATH + class_name + "/" + property); class_name = class_name.toLowerCase(); property = property.toLowerCase(); FileInputStream in = new FileInputStream(file); @@ -100,7 +104,7 @@ public static void setAttribute(String class_name, String subclass, String prope * @throws IOException If the API couldn't read the class's property */ public static void setAttribute(String class_name, String property, String new_value) throws FileNotFoundException, IOException{ - PrintWriter out = new PrintWriter(Def.SYSTEM_CLASS_PATH + class_name + "/" + property); + PrintWriter out = new PrintWriter(SYSTEM_CLASS_PATH + class_name + "/" + property); class_name = class_name.toLowerCase(); property = property.toLowerCase(); new_value = new_value.toLowerCase(); From d4e33d6de4e5f74bc1b703d1f070a121a9e6e738 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 3 Sep 2016 19:39:44 +0800 Subject: [PATCH 04/75] Move all *_DRIVER_NAME fields to classes respectively --- .classpath | 2 +- .settings/org.eclipse.jdt.core.prefs | 6 ++--- src/main/java/org/ev3dev/hardware/LED.java | 8 +++---- .../org/ev3dev/hardware/motors/DCMotor.java | 8 +++---- .../ev3dev/hardware/motors/LargeMotor.java | 10 +++++--- .../ev3dev/hardware/motors/MediumMotor.java | 10 +++++--- .../org/ev3dev/hardware/motors/Motor.java | 8 +++---- .../ev3dev/hardware/motors/ServoMotor.java | 8 +++---- .../org/ev3dev/hardware/ports/LegoPort.java | 17 +++++++------ .../ev3dev/hardware/sensors/ColorSensor.java | 7 +++++- .../ev3dev/hardware/sensors/GyroSensor.java | 7 +++++- .../ev3dev/hardware/sensors/I2CSensor.java | 7 +++++- .../hardware/sensors/InfraredSensor.java | 7 +++++- .../ev3dev/hardware/sensors/LightSensor.java | 7 +++++- .../org/ev3dev/hardware/sensors/Sensor.java | 6 ++--- .../ev3dev/hardware/sensors/SoundSensor.java | 7 +++++- .../ev3dev/hardware/sensors/TouchSensor.java | 14 +++++++++-- .../hardware/sensors/UltrasonicSensor.java | 14 +++++++++-- src/main/java/org/ev3dev/io/Def.java | 24 ++++++++----------- 19 files changed, 115 insertions(+), 62 deletions(-) diff --git a/.classpath b/.classpath index 01c6aa5..f284b13 100644 --- a/.classpath +++ b/.classpath @@ -22,7 +22,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 62a317c..1ab2bb5 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index 79280e9..d2cc7b1 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -41,7 +41,7 @@ public class LED extends Device{ /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ - public static final String LED_CLASS_NAME = "leds"; + public static final String CLASS_NAME = "leds"; /** * Creates a new LED instance. @@ -50,7 +50,7 @@ public class LED extends Device{ * @throws InvalidLEDException If the specified LEFT RIGHT field or color field isn't valid. */ public LED(int leftRightField, int colorField) throws InvalidLEDException{ - super(LED_CLASS_NAME); + super(CLASS_NAME); if (leftRightField != 0 && leftRightField != 1){ throw new InvalidLEDException("You are not specifying a EV3_LEFT_LED or EV3_RIGHT_LED field!"); } else if (colorField != 0 && colorField != 1){ @@ -73,8 +73,8 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ * @throws InvalidLEDException If the specified ledName does not exist */ public LED(String ledName) throws InvalidLEDException{ - super(LED_CLASS_NAME); - File file = new File(Sysfs.SYSTEM_CLASS_PATH + LED_CLASS_NAME + "/" + ledName); + super(CLASS_NAME); + File file = new File(Sysfs.SYSTEM_CLASS_PATH + CLASS_NAME + "/" + ledName); if (!file.exists()){ throw new InvalidLEDException("The specified LED does not exist"); } diff --git a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java index 86788a1..59250d5 100644 --- a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java @@ -20,12 +20,12 @@ public class DCMotor extends Device{ /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ - public static final String DC_MOTOR_CLASS_NAME = "dc-motor"; + public static final String CLASS_NAME = "dc-motor"; /** * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) */ - public static final String MOTOR_CLASS_NAME_PREFIX = "motor"; + public static final String CLASS_NAME_PREFIX = "motor"; private String address; @@ -37,13 +37,13 @@ public class DCMotor extends Device{ * @throws InvalidMotorException If the specified port wasn't exist a ServoMotor */ public DCMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException{ - super(port, DC_MOTOR_CLASS_NAME, MOTOR_CLASS_NAME_PREFIX); + super(port, CLASS_NAME, CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output if (!address.contains("out")){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } else if (!port.getStatus().equals(DC_MOTOR_CLASS_NAME)){ + } else if (!port.getStatus().equals(CLASS_NAME)){ throw new InvalidMotorException("The specified port (" + port.getAddress() + ") isn't a motor (" + port.getStatus() + ")"); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java b/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java index b4ab86a..c0215ff 100644 --- a/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java @@ -5,15 +5,19 @@ import org.ev3dev.exception.InvalidMotorException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; public class LargeMotor extends Motor { + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-ev3-l-motor"; + public LargeMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException { super(port); String drivername = this.getDriverName(); - if (!drivername.equals(Def.LARGE_MOTOR_DRIVER_NAME)){ - throw new InvalidMotorException("It is not a LargeMotor (" + Def.LARGE_MOTOR_DRIVER_NAME + "): " + drivername); + if (!drivername.equals(DRIVER_NAME)){ + throw new InvalidMotorException("It is not a LargeMotor (" + DRIVER_NAME + "): " + drivername); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java b/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java index 5286b08..034f15e 100644 --- a/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java @@ -5,15 +5,19 @@ import org.ev3dev.exception.InvalidMotorException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; public class MediumMotor extends Motor { + + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-ev3-m-motor"; public MediumMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException { super(port); String drivername = this.getDriverName(); - if (!drivername.equals(Def.MEDIUM_MOTOR_DRIVER_NAME)){ - throw new InvalidMotorException("It is not a MediumMotor (" + Def.MEDIUM_MOTOR_DRIVER_NAME + "): " + drivername); + if (!drivername.equals(DRIVER_NAME)){ + throw new InvalidMotorException("It is not a MediumMotor (" + DRIVER_NAME + "): " + drivername); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index 6921eeb..f5a0b10 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -35,12 +35,12 @@ public class Motor extends Device{ /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ - public static final String MOTOR_CLASS_NAME = "tacho-motor"; + public static final String CLASS_NAME = "tacho-motor"; /** * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) */ - public static final String MOTOR_CLASS_NAME_PREFIX = "motor"; + public static final String CLASS_NAME_PREFIX = "motor"; //----------------------------------------------------------------------------- @@ -55,13 +55,13 @@ public class Motor extends Device{ * @throws IOException If the LegoPort specified goes wrong */ public Motor(LegoPort port) throws InvalidPortException, IOException{ - super(port, MOTOR_CLASS_NAME, MOTOR_CLASS_NAME_PREFIX); + super(port, CLASS_NAME, CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output if (!address.contains("out")){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } else if (!port.getStatus().equals(MOTOR_CLASS_NAME)){ + } else if (!port.getStatus().equals(CLASS_NAME)){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a motor (" + port.getStatus() + ")"); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java index 9ee5bb7..67f06f7 100644 --- a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java @@ -19,12 +19,12 @@ public class ServoMotor extends Device{ /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ - public static final String SERVO_MOTOR_CLASS_NAME = "servo-motor"; + public static final String CLASS_NAME = "servo-motor"; /** * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) */ - public static final String SERVO_MOTOR_CLASS_NAME_PREFIX = "motor"; + public static final String CLASS_NAME_PREFIX = "motor"; private String address; @@ -36,13 +36,13 @@ public class ServoMotor extends Device{ * @throws InvalidMotorException The specified motor wasn't a motor */ public ServoMotor(LegoPort port) throws InvalidPortException, InvalidMotorException, IOException{ - super(port, SERVO_MOTOR_CLASS_NAME, SERVO_MOTOR_CLASS_NAME_PREFIX); + super(port, CLASS_NAME, CLASS_NAME_PREFIX); address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output if (!address.contains("out")){ throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } else if (!port.getStatus().equals(SERVO_MOTOR_CLASS_NAME)){ + } else if (!port.getStatus().equals(CLASS_NAME)){ throw new InvalidMotorException("The specified port (" + port.getAddress() + ") isn't a motor (" + port.getStatus() + ")"); } } diff --git a/src/main/java/org/ev3dev/hardware/ports/LegoPort.java b/src/main/java/org/ev3dev/hardware/ports/LegoPort.java index 2b190fa..652b790 100644 --- a/src/main/java/org/ev3dev/hardware/ports/LegoPort.java +++ b/src/main/java/org/ev3dev/hardware/ports/LegoPort.java @@ -3,7 +3,6 @@ import java.io.IOException; import org.ev3dev.exception.InvalidPortException; -import org.ev3dev.hardware.Device; import org.ev3dev.io.Sysfs; /*** @@ -33,7 +32,7 @@ public class LegoPort{ /** * The sysfs class name of LegoPort */ - public static final String SYSTEM_CLASS_NAME = "lego-port"; + public static final String CLASS_NAME = "lego-port"; /** * Sensor Port 1 on the EV3 @@ -95,7 +94,7 @@ public LegoPort(int port) throws InvalidPortException{ * @throws IOException If I/O goes wrong */ public String getAddress() throws IOException{ - String address = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "address"); + String address = Sysfs.getAttribute(CLASS_NAME, "port" + port, "address"); return address; } @@ -105,7 +104,7 @@ public String getAddress() throws IOException{ * @throws IOException if I/O goes wrong */ public String getDriverName() throws IOException{ - String drivername = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "driver_name"); + String drivername = Sysfs.getAttribute(CLASS_NAME, "port" + port, "driver_name"); return drivername; } @@ -115,7 +114,7 @@ public String getDriverName() throws IOException{ * @throws IOException If I/O goes wrong */ public String[] getModes() throws IOException{ - String modesstr = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "modes"); + String modesstr = Sysfs.getAttribute(CLASS_NAME, "port" + port, "modes"); return Sysfs.separateSpace(modesstr); } @@ -128,7 +127,7 @@ public String[] getModes() throws IOException{ * @throws IOException If I/O goes wrong */ public String getMode() throws IOException{ - String mode = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "mode"); + String mode = Sysfs.getAttribute(CLASS_NAME, "port" + port, "mode"); return mode; } @@ -141,7 +140,7 @@ public String getMode() throws IOException{ * @throws IOException If I/O goes wrong */ public void setMode(String mode) throws IOException{ - Sysfs.setAttribute(SYSTEM_CLASS_NAME, "port" + port, "mode", mode); + Sysfs.setAttribute(CLASS_NAME, "port" + port, "mode", mode); } /** @@ -152,7 +151,7 @@ public void setMode(String mode) throws IOException{ * @throws IOException If I/O goes wrong */ public void setDevice(String driver) throws IOException{ - Sysfs.setAttribute(SYSTEM_CLASS_NAME, "port" + port, "set_device", driver); + Sysfs.setAttribute(CLASS_NAME, "port" + port, "set_device", driver); } /** @@ -163,7 +162,7 @@ public void setDevice(String driver) throws IOException{ * @throws IOException If I/O goes wrong */ public String getStatus() throws IOException{ - String status = Sysfs.getAttribute(SYSTEM_CLASS_NAME, "port" + port, "status"); + String status = Sysfs.getAttribute(CLASS_NAME, "port" + port, "status"); return status; } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java index 306912b..7cebfa5 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java @@ -15,6 +15,11 @@ */ public class ColorSensor extends Sensor { + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-ev3-color"; + private boolean autoSwitchMode = true; /** @@ -26,7 +31,7 @@ public class ColorSensor extends Sensor { */ public ColorSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); - if (!Def.COLOR_SENSOR_DRIVER_NAME.equals(this.getDriverName())){ + if (!DRIVER_NAME.equals(this.getDriverName())){ throw new InvalidSensorException("The specified device is not a color sensor."); } port.getAddress(); diff --git a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java index 520738d..da0716e 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java @@ -15,6 +15,11 @@ */ public class GyroSensor extends Sensor { + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-ev3-gyro"; + private boolean autoSwitchMode = true; /** @@ -26,7 +31,7 @@ public class GyroSensor extends Sensor { */ public GyroSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); - if (!this.getDriverName().equals(Def.GYRO_SENSOR_DRIVER_NAME)){ + if (!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a GyroSensor instance if port isn't connected to a GyroSensor!"); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java index 54394f3..7ad45cc 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java @@ -13,6 +13,11 @@ * */ public class I2CSensor extends Sensor { + + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "nxt-i2c-color"; /** * Creates a new I2CSensor instance. @@ -23,7 +28,7 @@ public class I2CSensor extends Sensor { */ public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorException, IOException { super(port); - if (!this.getDriverName().equals(Def.I2CSENSOR_DRIVER_NAME)){ + if (!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("The specified port is not a I2C sensor."); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java b/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java index 1fd0ade..bfdb8d5 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java @@ -14,6 +14,11 @@ * */ public class InfraredSensor extends Sensor { + + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-ev3-ir"; private boolean autoSwitchMode = true; @@ -26,7 +31,7 @@ public class InfraredSensor extends Sensor { */ public InfraredSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); - if (!this.getDriverName().equals(Def.INFRARED_SENSOR_DRIVER_NAME)){ + if (!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a InfraredSensor instance if the port isn't connected a infrared sensor!"); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java b/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java index 91b5fd9..e01b453 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java @@ -15,6 +15,11 @@ */ public class LightSensor extends Sensor { + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-nxt-light"; + public boolean autoSwitchMode = true; /** @@ -26,7 +31,7 @@ public class LightSensor extends Sensor { */ public LightSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); - if(!this.getDriverName().equals(Def.LIGHT_SENSOR_DRIVER_NAME)){ + if(!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a LightSensor instance if the port isn't connected to a light sensor!"); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java index d8976d5..281e857 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java @@ -27,12 +27,12 @@ public class Sensor extends Device{ /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ - public static final String SENSOR_CLASS_NAME = "lego-sensor"; + public static final String CLASS_NAME = "lego-sensor"; /** * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) */ - public static final String SENSOR_CLASS_NAME_PREFIX = "sensor"; + public static final String CLASS_NAME_PREFIX = "sensor"; /** * Creates a new Sensor instance using a LegoPort @@ -41,7 +41,7 @@ public class Sensor extends Device{ * @throws InvalidPortException If the specified LegoPort was invalid */ public Sensor(LegoPort port) throws IOException, InvalidPortException{ - super(port, SENSOR_CLASS_NAME, SENSOR_CLASS_NAME_PREFIX); + super(port, CLASS_NAME, CLASS_NAME_PREFIX); } /** diff --git a/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java b/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java index 9c1f726..1239bf0 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java @@ -15,6 +15,11 @@ */ public class SoundSensor extends Sensor { + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-nxt-sound"; + public boolean autoSwitchMode = true; /** @@ -26,7 +31,7 @@ public class SoundSensor extends Sensor { */ public SoundSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); - if(!this.getDriverName().equals(Def.SOUND_SENSOR_DRIVER_NAME)){ + if(!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a SoundSensor instance if the port isn't connected to a sound sensor!"); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java b/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java index 4749b17..b53650a 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java @@ -10,6 +10,16 @@ public class TouchSensor extends Sensor { + /** + * This device's default driver name (EV3 Touch Sensor) + */ + public static final String DRIVER_NAME_EV3 = "lego-ev3-touch"; + + /** + * This device's default driver name (NXT Touch Sensor) + */ + public static final String DRIVER_NAME_NXT = "lego-nxt-touch"; + public boolean autoSwitchMode = true; /** @@ -21,8 +31,8 @@ public class TouchSensor extends Sensor { */ public TouchSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); - if (!this.getDriverName().equals(Def.TOUCH_SENSOR_DRIVER_NAME_EV3) && - !this.getDriverName().equals(Def.TOUCH_SENSOR_DRIVER_NAME_NXT)){ + if (!this.getDriverName().equals(DRIVER_NAME_EV3) && + !this.getDriverName().equals(DRIVER_NAME_NXT)){ throw new InvalidSensorException("Can't create a TouchSensor instance that isn't a touch sensor!"); } port.getAddress(); diff --git a/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java b/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java index 1be1d29..d3533e6 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java @@ -10,6 +10,16 @@ public class UltrasonicSensor extends Sensor { + /** + * This device's default driver name (EV3 Ultrasonic Sensor) + */ + public static final String DRIVER_NAME_EV3 = "lego-ev3-us"; + + /** + * This device's default driver name (NXT Ultrasonic Sensor) + */ + public static final String DRIVER_NAME_NXT = "lego-nxt-us"; + public boolean autoSwitchMode = true; /** @@ -22,8 +32,8 @@ public class UltrasonicSensor extends Sensor { public UltrasonicSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { super(port); String driverName = this.getDriverName(); - if (!driverName.equals(Def.ULTRASONIC_SENSOR_DRIVER_NAME_EV3) && - !driverName.equals(Def.ULTRASONIC_SENSOR_DRIVER_NAME_NXT)){ + if (!driverName.equals(DRIVER_NAME_EV3) && + !driverName.equals(DRIVER_NAME_NXT)){ throw new InvalidSensorException("Can't create a UltrasonicSensor instance if it is not a ultrasonic sensor! Yours: " + driverName); } } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index aa44b2a..fe79e42 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -13,29 +13,25 @@ public class Def { //Driver names - public static final String MEDIUM_MOTOR_DRIVER_NAME = "lego-ev3-m-motor"; + public static final String oI2CSENSOR_DRIVER_NAME = "nxt-i2c-sensor"; - public static final String LARGE_MOTOR_DRIVER_NAME = "lego-ev3-l-motor"; + public static final String oTOUCH_SENSOR_DRIVER_NAME_EV3 = "lego-ev3-touch"; - public static final String I2CSENSOR_DRIVER_NAME = "nxt-i2c-sensor"; + public static final String oTOUCH_SENSOR_DRIVER_NAME_NXT = "lego-nxt-touch"; - public static final String TOUCH_SENSOR_DRIVER_NAME_EV3 = "lego-ev3-touch"; + public static final String oCOLOR_SENSOR_DRIVER_NAME = "lego-ev3-color"; - public static final String TOUCH_SENSOR_DRIVER_NAME_NXT = "lego-nxt-touch"; + public static final String oULTRASONIC_SENSOR_DRIVER_NAME_EV3 = "lego-ev3-us"; - public static final String COLOR_SENSOR_DRIVER_NAME = "lego-ev3-color"; + public static final String oULTRASONIC_SENSOR_DRIVER_NAME_NXT = "lego-nxt-us"; - public static final String ULTRASONIC_SENSOR_DRIVER_NAME_EV3 = "lego-ev3-us"; + public static final String oGYRO_SENSOR_DRIVER_NAME = "lego-ev3-gyro"; - public static final String ULTRASONIC_SENSOR_DRIVER_NAME_NXT = "lego-nxt-us"; + public static final String oINFRARED_SENSOR_DRIVER_NAME = "lego-ev3-ir"; - public static final String GYRO_SENSOR_DRIVER_NAME = "lego-ev3-gyro"; + public static final String oSOUND_SENSOR_DRIVER_NAME = "lego-nxt-sound"; - public static final String INFRARED_SENSOR_DRIVER_NAME = "lego-ev3-ir"; - - public static final String SOUND_SENSOR_DRIVER_NAME = "lego-nxt-sound"; - - public static final String LIGHT_SENSOR_DRIVER_NAME = "lego-nxt-light"; + public static final String oLIGHT_SENSOR_DRIVER_NAME = "lego-nxt-light"; //Properties defaults From 0c949016969b5fdbe6cb4b6e93c6482b2da64b4c Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 3 Sep 2016 19:53:01 +0800 Subject: [PATCH 05/75] Update POM.XML --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59cb18f..4bf30e2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.ev3dev ev3dev-lang-java - 0.0.2-SNAPSHOT + 1.0.0-SNAPSHOT ev3dev-lang-java A ev3dev programming language binding for Java. From 80ba2ab544a24b6fd471c72cae566e12c7143d0a Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 3 Sep 2016 19:58:00 +0800 Subject: [PATCH 06/75] Update .travis.yml, pom.xml --- .travis.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac97283..d55a2a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,4 +53,4 @@ branches: - develop env: -- projectversion=0.0.2-SNAPSHOT \ No newline at end of file +- projectversion=1.0.0-SNAPSHOT \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4bf30e2..2b95a39 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ev3dev-lang-java 1.0.0-SNAPSHOT ev3dev-lang-java - A ev3dev programming language binding for Java. + An ev3dev programming language binding for Java. 1.7 1.7 From 0777b142ba885661125189bb31f3e208acacc245 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 17:23:30 +0800 Subject: [PATCH 07/75] Partial: Move properties constants to classes --- .../org/ev3dev/hardware/motors/DCMotor.java | 152 +++++++-- .../org/ev3dev/hardware/motors/Linear.java | 311 +++++++++++------- .../org/ev3dev/hardware/motors/Motor.java | 311 +++++++++++------- .../ev3dev/hardware/motors/ServoMotor.java | 95 +++++- .../org/ev3dev/hardware/sensors/Sensor.java | 66 +++- src/main/java/org/ev3dev/io/Def.java | 108 +----- 6 files changed, 633 insertions(+), 410 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java index 59250d5..9a4b3d3 100644 --- a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; /** @@ -17,6 +16,91 @@ */ public class DCMotor extends Device{ + /** + * The Sysfs class's address property name + */ + public static final String SYSFS_PROPERTY_ADDRESS = "address"; + + /** + * The Sysfs class's command property name + */ + public static final String SYSFS_PROPERTY_COMMAND = "command"; + + /** + * The Sysfs class's commands property name + */ + public static final String SYSFS_PROPERTY_COMMANDS = "commands"; + + /** + * The Sysfs class's driver_name property name + */ + public static final String SYSFS_PROPERTY_DRIVER_NAME = "driver_name"; + + /** + * The Sysfs class's duty_cycle property name + */ + public static final String SYSFS_PROPERTY_DUTY_CYCLE = "duty_cycle"; + + /** + * The Sysfs class's duty_cycle_sp property name + */ + public static final String SYSFS_PROPERTY_DUTY_CYCLE_SP = "duty_cycle_sp"; + + /** + * The Sysfs class's polarity property name + */ + public static final String SYSFS_PROPERTY_POLARITY = "polarity"; + + /** + * The Sysfs class's ramp_up_sp property name + */ + public static final String SYSFS_PROPERTY_RAMP_UP_SP = "ramp_up_sp"; + + /** + * The Sysfs class's ramp_down_sp property name + */ + public static final String SYSFS_PROPERTY_RAMP_DOWN_SP = "ramp_down_sp"; + + /** + * The Sysfs class's state property name + */ + public static final String SYSFS_PROPERTY_STATE = "state"; + + /** + * The Sysfs class's stop_action property name + */ + public static final String SYSFS_PROPERTY_STOP_ACTION = "stop_action"; + + /** + * The Sysfs class's stop_actions property name + */ + public static final String SYSFS_PROPERTY_STOP_ACTIONS = "stop_actions"; + + /** + * The Sysfs class's time_sp property name + */ + public static final String SYSFS_PROPERTY_TIME_SP = "time_sp"; + + /** + * The Sysfs class's run-forever command + */ + public static final String SYSFS_COMMAND_RUN_FOREVER = "run-forever"; + + /** + * The Sysfs class's run-timed command + */ + public static final String SYSFS_COMMAND_RUN_TIMED = "run-timed"; + + /** + * The Sysfs class's run-direct command + */ + public static final String SYSFS_COMMAND_RUN_DIRECT = "run-direct"; + + /** + * The Sysfs class's stop command + */ + public static final String SYSFS_COMMAND_STOP = "stop"; + /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ @@ -54,7 +138,7 @@ public DCMotor(LegoPort port) throws InvalidPortException, IOException, InvalidM * @throws IOException If the motor doesn't exist or IO ERROR */ public String getAddress() throws IOException{ - return this.getAttribute(Def.PROPERTY_ADDRESS); + return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** @@ -63,7 +147,7 @@ public String getAddress() throws IOException{ * @throws IOException If I/O goes wrong */ public void sendCommand(String command) throws IOException{ - this.setAttribute(Def.PROPERTY_COMMAND, command); + this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /*** @@ -71,7 +155,7 @@ public void sendCommand(String command) throws IOException{ * @throws IOException If I/O goes wrong */ public void runForever() throws IOException{ - sendCommand(Def.COMMAND_RUN_FOREVER); + sendCommand(SYSFS_COMMAND_RUN_FOREVER); } /*** @@ -81,7 +165,17 @@ public void runForever() throws IOException{ * @throws IOException If I/O goes wrong */ public void runTimed() throws IOException{ - sendCommand(Def.COMMAND_RUN_TIMED); + sendCommand(SYSFS_COMMAND_RUN_TIMED); + } + + /** + * Runs the motor at the duty cycle specified by duty_cycle_sp. + * Unlike other run commands, changing duty_cycle_sp while running + * will take effect immediately. + * @throws IOException If I/O goes wrong + */ + public void runDirect() throws IOException{ + sendCommand(SYSFS_COMMAND_RUN_DIRECT); } /** @@ -89,7 +183,7 @@ public void runTimed() throws IOException{ * @throws IOException If I/O goes wrong */ public void stop() throws IOException{ - sendCommand(Def.COMMAND_STOP); + sendCommand(SYSFS_COMMAND_STOP); } /** @@ -100,7 +194,7 @@ public void stop() throws IOException{ * @throws IOException If I/O goes wrong */ public String[] getCommands() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_COMMANDS); + String str = this.getAttribute(SYSFS_PROPERTY_COMMANDS); return Sysfs.separateSpace(str); } @@ -110,7 +204,7 @@ public String[] getCommands() throws IOException{ * @throws IOException If I/O goes wrong */ public String getDriverName() throws IOException{ - return this.getAttribute(Def.PROPERTY_DRIVER_NAME); + return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } /** @@ -119,7 +213,7 @@ public String getDriverName() throws IOException{ * @throws IOException If I/O goes wrong */ public int getDutyCycle() throws IOException{ - String dutycycle = this.getAttribute(Def.PROPERTY_DUTY_CYCLE); + String dutycycle = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE); return Integer.parseInt(dutycycle); } @@ -131,7 +225,7 @@ public int getDutyCycle() throws IOException{ * @throws IOException If I/O goes wrong */ public int getDutyCycleSP() throws IOException{ - String dutycyclesp = this.getAttribute(Def.PROPERTY_DUTY_CYCLE_SP); + String dutycyclesp = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP); return Integer.parseInt(dutycyclesp); } @@ -143,7 +237,7 @@ public int getDutyCycleSP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setDutyCycleSP(int sp) throws IOException{ - this.setAttribute(Def.PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); + this.setAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); } /** @@ -153,7 +247,7 @@ public void setDutyCycleSP(int sp) throws IOException{ * @throws IOException If I/O goes wrong */ public String getPolarity() throws IOException{ - return this.getAttribute(Def.PROPERTY_POLARITY); + return this.getAttribute(SYSFS_PROPERTY_POLARITY); } /** @@ -163,7 +257,7 @@ public String getPolarity() throws IOException{ * @throws IOException If I/O goes wrong */ public void setPolarity(String polarity) throws IOException{ - this.setAttribute(Def.PROPERTY_POLARITY, polarity); + this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); } /** @@ -176,7 +270,7 @@ public void setPolarity(String polarity) throws IOException{ * @throws IOException If I/O goes wrong */ public int getRamp_Up_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_RAMP_UP_SP); + String str = this.getAttribute(SYSFS_PROPERTY_RAMP_UP_SP); return Integer.parseInt(str); } @@ -190,7 +284,7 @@ public int getRamp_Up_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); + this.setAttribute(SYSFS_PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); } /** @@ -202,7 +296,7 @@ public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public int getRamp_Down_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_RAMP_DOWN_SP); + String str = this.getAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP); return Integer.parseInt(str); } @@ -215,7 +309,7 @@ public int getRamp_Down_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); + this.setAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); } /** @@ -229,7 +323,7 @@ public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public String getStateViaString() throws IOException{ - return this.getAttribute(Def.PROPERTY_STATE); + return this.getAttribute(SYSFS_PROPERTY_STATE); } /** @@ -245,11 +339,11 @@ public String[] getState() throws IOException{ /** * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. - * @return A stop command that listed using getStopCommands() + * @return A stop command that listed using getStopActions() * @throws IOException If I/O goes wrong */ - public String getStopCommand() throws IOException{ - return this.getAttribute(Def.PROPERTY_STOP_ACTION); + public String getStopAction() throws IOException{ + return this.getAttribute(SYSFS_PROPERTY_STOP_ACTION); } /** @@ -258,8 +352,8 @@ public String getStopCommand() throws IOException{ * @param stop_command A stop command that listed using getStopCommands() * @throws IOException If I/O goes wrong */ - public void setStopCommand(String stop_command) throws IOException{ - this.setAttribute(Def.PROPERTY_STOP_ACTION, stop_command); + public void setStopAction(String stop_command) throws IOException{ + this.setAttribute(SYSFS_PROPERTY_STOP_ACTION, stop_command); } /** @@ -279,8 +373,8 @@ public void setStopCommand(String stop_command) throws IOException{ * @return A list of stop modes supported by the motor controller * @throws IOException If I/O goes wrong */ - public String getStopCommandsViaString() throws IOException{ - return this.getAttribute(Def.PROPERTY_STOP_ACTIONS); + public String getStopActionsViaString() throws IOException{ + return this.getAttribute(SYSFS_PROPERTY_STOP_ACTIONS); } /** @@ -295,8 +389,8 @@ public String getStopCommandsViaString() throws IOException{ * @return A list of stop modes supported by the motor controller * @throws IOException If I/O goes wrong */ - public String[] getStopCommands() throws IOException{ - String str = getStopCommandsViaString(); + public String[] getStopActions() throws IOException{ + String str = getStopActionsViaString(); return Sysfs.separateSpace(str); } @@ -306,7 +400,7 @@ public String[] getStopCommands() throws IOException{ * @throws IOException If I/O goes wrong */ public int getTime_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_TIME_SP); + String str = this.getAttribute(SYSFS_PROPERTY_TIME_SP); return Integer.parseInt(str); } @@ -316,6 +410,6 @@ public int getTime_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setTime_SP(int time_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_TIME_SP, Integer.toString(time_sp)); + this.setAttribute(SYSFS_PROPERTY_TIME_SP, Integer.toString(time_sp)); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/Linear.java b/src/main/java/org/ev3dev/hardware/motors/Linear.java index bed925d..adbad1a 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Linear.java +++ b/src/main/java/org/ev3dev/hardware/motors/Linear.java @@ -13,7 +13,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; //----------------------------------------------------------------------------- @@ -25,13 +24,162 @@ /** - * The motor class provides a uniform interface for using motors with positional and directional feedback such as the EV3 and NXT motors. - * This feedback allows for precise control of the motors. This is the most common type of motor, so we just call it motor. + * The motor class for Firgelli linear actuators. * @author Anthony * */ public class Linear extends Device{ + /** + * The Sysfs class's address property name + */ + public static final String SYSFS_PROPERTY_ADDRESS = "address"; + + /** + * The Sysfs class's command property name + */ + public static final String SYSFS_PROPERTY_COMMAND = "command"; + + /** + * The Sysfs class's commands property name + */ + public static final String SYSFS_PROPERTY_COMMANDS = "commands"; + + /** + * The Sysfs class's driver_name property name + */ + public static final String SYSFS_PROPERTY_DRIVER_NAME = "driver_name"; + + /** + * The Sysfs class's duty_cycle property name + */ + public static final String SYSFS_PROPERTY_DUTY_CYCLE = "duty_cycle"; + + /** + * The Sysfs class's duty_cycle_sp property name + */ + public static final String SYSFS_PROPERTY_DUTY_CYCLE_SP = "duty_cycle_sp"; + + /** + * The Sysfs class's polarity property name + */ + public static final String SYSFS_PROPERTY_POLARITY = "polarity"; + + /** + * The Sysfs class's position property name + */ + public static final String SYSFS_PROPERTY_POSITION = "position"; + + /** + * The Sysfs class's position_p property name + */ + public static final String SYSFS_PROPERTY_POSITION_P = "hold_pid/Kp"; + + /** + * The Sysfs class's position_i property name + */ + public static final String SYSFS_PROPERTY_POSITION_I = "hold_pid/Ki"; + + /** + * The Sysfs class's position_d property name + */ + public static final String SYSFS_PROPERTY_POSITION_D = "hold_pid/Kd"; + + /** + * The Sysfs class's position_sp property name + */ + public static final String SYSFS_PROPERTY_POSITION_SP = "position_sp"; + + /** + * The Sysfs class's speed property name + */ + public static final String SYSFS_PROPERTY_SPEED = "speed"; + + /** + * The Sysfs class's speed_sp property name + */ + public static final String SYSFS_PROPERTY_SPEED_SP = "speed_sp"; + + /** + * The Sysfs class's ramp_up_sp property name + */ + public static final String SYSFS_PROPERTY_RAMP_UP_SP = "ramp_up_sp"; + + /** + * The Sysfs class's ramp_down_sp property name + */ + public static final String SYSFS_PROPERTY_RAMP_DOWN_SP = "ramp_down_sp"; + + /** + * The Sysfs class's state property name + */ + public static final String SYSFS_PROPERTY_STATE = "state"; + + /** + * The Sysfs class's stop_action property name + */ + public static final String SYSFS_PROPERTY_STOP_ACTION = "stop_action"; + + /** + * The Sysfs class's stop_actions property name + */ + public static final String SYSFS_PROPERTY_STOP_ACTIONS = "stop_actions"; + + /** + * The Sysfs class's time_sp property name + */ + public static final String SYSFS_PROPERTY_TIME_SP = "time_sp"; + + /** + * The Sysfs class's max_speed property name + */ + public static final String SYSFS_PROPERTY_MAX_SPEED = "max_speed"; + + /** + * The Sysfs class's count_per_m property name + */ + public static final String SYSFS_PROPERTY_COUNT_PER_M = "count_per_m"; + + /** + * The Sysfs class's full_travel_count property name + */ + public static final String SYSFS_PROPERTY_FULL_TRAVEL_COUNT = "full_travel_count"; + + /** + * The Sysfs class's run-forever command + */ + public static final String SYSFS_COMMAND_RUN_FOREVER = "run-forever"; + + /** + * The Sysfs class's run-to-abs-pos command + */ + public static final String SYSFS_COMMAND_RUN_TO_ABS_POS = "run-to-abs-pos"; + + /** + * The Sysfs class's run-to-rel-pos command + */ + public static final String SYSFS_COMMAND_RUN_TO_REL_POS = "run-to-rel-pos"; + + /** + * The Sysfs class's run-timed command + */ + public static final String SYSFS_COMMAND_RUN_TIMED = "run-timed"; + + /** + * The Sysfs class's run-direct command + */ + public static final String SYSFS_COMMAND_RUN_DIRECT = "run-direct"; + + /** + * The Sysfs class's stop command + */ + public static final String SYSFS_COMMAND_STOP = "stop"; + + /** + * The Sysfs class's reset command + */ + public static final String SYSFS_COMMAND_RESET = "reset"; + /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ @@ -76,7 +224,7 @@ public String getAddress() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_ADDRESS); + return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** @@ -88,7 +236,7 @@ public void sendCommand(String command) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_COMMAND, command); + this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /*** @@ -99,7 +247,7 @@ public void runForever() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_FOREVER); + sendCommand(SYSFS_COMMAND_RUN_FOREVER); } /*** @@ -111,7 +259,7 @@ public void runToAbsPos() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_TO_ABS_POS); + sendCommand(SYSFS_COMMAND_RUN_TO_ABS_POS); } /*** @@ -125,7 +273,7 @@ public void runToRelPos() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_TO_REL_POS); + sendCommand(SYSFS_COMMAND_RUN_TO_REL_POS); } /*** @@ -138,7 +286,7 @@ public void runTimed() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_TIMED); + sendCommand(SYSFS_COMMAND_RUN_TIMED); } /*** @@ -151,7 +299,7 @@ public void runDirect() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_DIRECT); + sendCommand(SYSFS_COMMAND_RUN_DIRECT); } /** @@ -162,7 +310,7 @@ public void stop() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_STOP); + sendCommand(SYSFS_COMMAND_STOP); } /** @@ -173,7 +321,7 @@ public void reset() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RESET); + sendCommand(SYSFS_COMMAND_RESET); } /** @@ -187,7 +335,7 @@ public String[] getCommands() throws IOException{ if (!this.isConnected()){ return null; } - String str = this.getAttribute(Def.PROPERTY_COMMANDS); + String str = this.getAttribute(SYSFS_PROPERTY_COMMANDS); return Sysfs.separateSpace(str); } @@ -200,7 +348,7 @@ public int getCountPerMetre() throws IOException{ if (!this.isConnected()){ return -1; } - String countpermetre = this.getAttribute(Def.PROPERTY_COUNT_PER_M); + String countpermetre = this.getAttribute(SYSFS_PROPERTY_COUNT_PER_M); return Integer.parseInt(countpermetre); } @@ -213,7 +361,7 @@ public String getDriverName() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_DRIVER_NAME); + return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } @@ -226,7 +374,7 @@ public int getDutyCycle() throws IOException{ if (!this.isConnected()){ return -1; } - String dutycycle = this.getAttribute(Def.PROPERTY_DUTY_CYCLE); + String dutycycle = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE); return Integer.parseInt(dutycycle); } @@ -241,7 +389,7 @@ public int getDutyCycleSP() throws IOException{ if (!this.isConnected()){ return -1; } - String dutycyclesp = this.getAttribute(Def.PROPERTY_DUTY_CYCLE_SP); + String dutycyclesp = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP); return Integer.parseInt(dutycyclesp); } @@ -256,7 +404,7 @@ public void setDutyCycleSP(int sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); + this.setAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); } /** @@ -269,7 +417,7 @@ public String getPolarity() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_POLARITY); + return this.getAttribute(SYSFS_PROPERTY_POLARITY); } /** @@ -282,7 +430,7 @@ public void setPolarity(String polarity) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POLARITY, polarity); + this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); } /** @@ -309,7 +457,7 @@ public void setPosition(int position) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION, Integer.toString(position)); + this.setAttribute(SYSFS_PROPERTY_POSITION, Integer.toString(position)); } /** @@ -321,7 +469,7 @@ public int getPosition_P() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_P); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_P); return Integer.parseInt(str); } @@ -334,7 +482,7 @@ public int getPosition_I() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_I); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_I); return Integer.parseInt(str); } @@ -347,7 +495,7 @@ public int getPosition_D() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_D); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_D); return Integer.parseInt(str); } @@ -360,7 +508,7 @@ public void setPosition_P(int position_p) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_P, Integer.toString(position_p)); + this.setAttribute(SYSFS_PROPERTY_POSITION_P, Integer.toString(position_p)); } /** @@ -372,7 +520,7 @@ public void setPosition_I(int position_i) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_I, Integer.toString(position_i)); + this.setAttribute(SYSFS_PROPERTY_POSITION_I, Integer.toString(position_i)); } /** @@ -384,7 +532,7 @@ public void setPosition_D(int position_d) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_D, Integer.toString(position_d)); + this.setAttribute(SYSFS_PROPERTY_POSITION_D, Integer.toString(position_d)); } /** @@ -397,7 +545,7 @@ public int getPosition_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_SP); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_SP); return Integer.parseInt(str); } @@ -411,7 +559,7 @@ public void setPosition_SP(int position_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_SP, Integer.toString(position_sp)); + this.setAttribute(SYSFS_PROPERTY_POSITION_SP, Integer.toString(position_sp)); } /** @@ -424,7 +572,7 @@ public int getSpeed() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_SPEED); + String str = this.getAttribute(SYSFS_PROPERTY_SPEED); return Integer.parseInt(str); } @@ -438,7 +586,7 @@ public int getSpeed_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_SPEED); + String str = this.getAttribute(SYSFS_PROPERTY_SPEED); return Integer.parseInt(str); } @@ -452,7 +600,7 @@ public void setSpeed_SP(int speed_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_SPEED_SP, Integer.toString(speed_sp)); + this.setAttribute(SYSFS_PROPERTY_SPEED_SP, Integer.toString(speed_sp)); } /** @@ -468,7 +616,7 @@ public int getRamp_Up_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_RAMP_UP_SP); + String str = this.getAttribute(SYSFS_PROPERTY_RAMP_UP_SP); return Integer.parseInt(str); } @@ -485,7 +633,7 @@ public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); + this.setAttribute(SYSFS_PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); } /** @@ -500,7 +648,7 @@ public int getRamp_Down_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_RAMP_DOWN_SP); + String str = this.getAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP); return Integer.parseInt(str); } @@ -516,82 +664,7 @@ public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); - } - - /** - * Get the proportional constant for the speed regulation PID. - * @return The proportional constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public int getSpeedRegulation_P() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_SPEED_REGULATION_P); - return Integer.parseInt(str); - } - - /** - * Set the proportional constant for the speed regulation PID. - * @param p The proportional constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public void setSpeedRegulation_P(int p) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(Def.PROPERTY_SPEED_REGULATION_P, Integer.toString(p)); - } - - /** - * Get the integral constant for the speed regulation PID. - * @return The integral constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public int getSpeedRegulation_I() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_SPEED_REGULATION_I); - return Integer.parseInt(str); - } - - /** - * Set The integral constant for the speed regulation PID. - * @param i The integral constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public void setSpeedRegulation_I(int i) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(Def.PROPERTY_SPEED_REGULATION_I, Integer.toString(i)); - } - - /** - * Get the derivative constant for the speed regulation PID. - * @return The derivative constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public int getSpeedRegulation_D() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_SPEED_REGULATION_D); - return Integer.parseInt(str); - } - - /** - * Set the derivative constant for the speed regulation PID. - * @param d The derivative constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public void setSpeedRegulation_D(int d) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(Def.PROPERTY_SPEED_REGULATION_D, Integer.toString(d)); + this.setAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); } /** @@ -608,7 +681,7 @@ public String getStateViaString() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_STATE); + return this.getAttribute(SYSFS_PROPERTY_STATE); } /** @@ -634,7 +707,7 @@ public String getStopAction() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_STOP_ACTION); + return this.getAttribute(SYSFS_PROPERTY_STOP_ACTION); } /** @@ -647,7 +720,7 @@ public void setStopAction(String stop_action) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_STOP_ACTION, stop_action); + this.setAttribute(SYSFS_PROPERTY_STOP_ACTION, stop_action); } /** @@ -671,7 +744,7 @@ public String getStopCommandsViaString() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_STOP_ACTIONS); + return this.getAttribute(SYSFS_PROPERTY_STOP_ACTIONS); } /** @@ -703,7 +776,7 @@ public int getTime_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_TIME_SP); + String str = this.getAttribute(SYSFS_PROPERTY_TIME_SP); return Integer.parseInt(str); } @@ -716,7 +789,7 @@ public void setTime_SP(int time_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_TIME_SP, Integer.toString(time_sp)); + this.setAttribute(SYSFS_PROPERTY_TIME_SP, Integer.toString(time_sp)); } /** @@ -728,7 +801,7 @@ public int getMax_Speed() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_MAX_SPEED); + String str = this.getAttribute(SYSFS_PROPERTY_MAX_SPEED); return Integer.parseInt(str); } @@ -736,7 +809,7 @@ public int getFullTravelCount() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_FULL_TRAVEL_COUNT); + String str = this.getAttribute(SYSFS_PROPERTY_FULL_TRAVEL_COUNT); return Integer.parseInt(str); } diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index f5a0b10..8ee722a 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -13,7 +13,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; //----------------------------------------------------------------------------- @@ -32,6 +31,146 @@ */ public class Motor extends Device{ + /** + * The Sysfs class's address property name + */ + public static final String SYSFS_PROPERTY_ADDRESS = "address"; + + /** + * The Sysfs class's command property name + */ + public static final String SYSFS_PROPERTY_COMMAND = "command"; + + /** + * The Sysfs class's commands property name + */ + public static final String SYSFS_PROPERTY_COMMANDS = "commands"; + + /** + * The Sysfs class's count_per_rot property name + */ + public static final String SYSFS_PROPERTY_COUNT_PER_ROT = "count_per_rot"; + + /** + * The Sysfs class's driver_name property name + */ + public static final String SYSFS_PROPERTY_DRIVER_NAME = "driver_name"; + + /** + * The Sysfs class's duty_cycle property name + */ + public static final String SYSFS_PROPERTY_DUTY_CYCLE = "duty_cycle"; + + /** + * The Sysfs class's duty_cycle_sp property name + */ + public static final String SYSFS_PROPERTY_DUTY_CYCLE_SP = "duty_cycle_sp"; + + /** + * The Sysfs class's polarity property name + */ + public static final String SYSFS_PROPERTY_POLARITY = "polarity"; + + /** + * The Sysfs class's position property name + */ + public static final String SYSFS_PROPERTY_POSITION = "position"; + + /** + * The Sysfs class's position_p property name + */ + public static final String SYSFS_PROPERTY_POSITION_P = "hold_pid/Kp"; + + /** + * The Sysfs class's position_i property name + */ + public static final String SYSFS_PROPERTY_POSITION_I = "hold_pid/Ki"; + + /** + * The Sysfs class's position_d property name + */ + public static final String SYSFS_PROPERTY_POSITION_D = "hold_pid/Kd"; + + /** + * The Sysfs class's position_sp property name + */ + public static final String SYSFS_PROPERTY_POSITION_SP = "position_sp"; + + /** + * The Sysfs class's speed property name + */ + public static final String SYSFS_PROPERTY_SPEED = "speed"; + + /** + * The Sysfs class's speed_sp property name + */ + public static final String SYSFS_PROPERTY_SPEED_SP = "speed_sp"; + + /** + * The Sysfs class's ramp_up_sp property name + */ + public static final String SYSFS_PROPERTY_RAMP_UP_SP = "ramp_up_sp"; + + /** + * The Sysfs class's ramp_down_sp property name + */ + public static final String SYSFS_PROPERTY_RAMP_DOWN_SP = "ramp_down_sp"; + + /** + * The Sysfs class's state property name + */ + public static final String SYSFS_PROPERTY_STATE = "state"; + + /** + * The Sysfs class's stop_action property name + */ + public static final String SYSFS_PROPERTY_STOP_ACTION = "stop_action"; + + /** + * The Sysfs class's stop_actions property name + */ + public static final String SYSFS_PROPERTY_STOP_ACTIONS = "stop_actions"; + + /** + * The Sysfs class's time_sp property name + */ + public static final String SYSFS_PROPERTY_TIME_SP = "time_sp"; + + /** + * The Sysfs class's run-forever command + */ + public static final String SYSFS_COMMAND_RUN_FOREVER = "run-forever"; + + /** + * The Sysfs class's run-to-abs-pos command + */ + public static final String SYSFS_COMMAND_RUN_TO_ABS_POS = "run-to-abs-pos"; + + /** + * The Sysfs class's run-to-rel-pos command + */ + public static final String SYSFS_COMMAND_RUN_TO_REL_POS = "run-to-rel-pos"; + + /** + * The Sysfs class's run-timed command + */ + public static final String SYSFS_COMMAND_RUN_TIMED = "run-timed"; + + /** + * The Sysfs class's run-direct command + */ + public static final String SYSFS_COMMAND_RUN_DIRECT = "run-direct"; + + /** + * The Sysfs class's stop command + */ + public static final String SYSFS_COMMAND_STOP = "stop"; + + /** + * The Sysfs class's reset command + */ + public static final String SYSFS_COMMAND_RESET = "reset"; + /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ @@ -78,7 +217,7 @@ public String getAddress() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_ADDRESS); + return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** @@ -90,7 +229,7 @@ public void sendCommand(String command) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_COMMAND, command); + this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /*** @@ -101,7 +240,7 @@ public void runForever() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_FOREVER); + sendCommand(SYSFS_COMMAND_RUN_FOREVER); } /*** @@ -113,7 +252,7 @@ public void runToAbsPos() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_TO_ABS_POS); + sendCommand(SYSFS_COMMAND_RUN_TO_ABS_POS); } /*** @@ -127,7 +266,7 @@ public void runToRelPos() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_TO_REL_POS); + sendCommand(SYSFS_COMMAND_RUN_TO_REL_POS); } /*** @@ -140,7 +279,7 @@ public void runTimed() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_TIMED); + sendCommand(SYSFS_COMMAND_RUN_TIMED); } /*** @@ -153,7 +292,7 @@ public void runDirect() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RUN_DIRECT); + sendCommand(SYSFS_COMMAND_RUN_DIRECT); } /** @@ -164,7 +303,7 @@ public void stop() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_STOP); + sendCommand(SYSFS_COMMAND_STOP); } /** @@ -175,7 +314,7 @@ public void reset() throws IOException{ if (!this.isConnected()){ return; } - sendCommand(Def.COMMAND_RESET); + sendCommand(SYSFS_COMMAND_RESET); } /** @@ -189,7 +328,7 @@ public String[] getCommands() throws IOException{ if (!this.isConnected()){ return null; } - String str = this.getAttribute(Def.PROPERTY_COMMANDS); + String str = this.getAttribute(SYSFS_PROPERTY_COMMANDS); return Sysfs.separateSpace(str); } @@ -206,10 +345,12 @@ public int getCountPerRot() throws IOException{ if (!this.isConnected()){ return -1; } - String countperrot = this.getAttribute(Def.PROPERTY_COUNT_PER_ROT); + String countperrot = this.getAttribute(SYSFS_PROPERTY_COUNT_PER_ROT); return Integer.parseInt(countperrot); } + //getCountPerM() Linear Motor (Just for mark down) + /** * Returns the name of the driver that provides this tacho motor device. * @return The name of the driver @@ -219,7 +360,7 @@ public String getDriverName() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_DRIVER_NAME); + return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } @@ -232,7 +373,7 @@ public int getDutyCycle() throws IOException{ if (!this.isConnected()){ return -1; } - String dutycycle = this.getAttribute(Def.PROPERTY_DUTY_CYCLE); + String dutycycle = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE); return Integer.parseInt(dutycycle); } @@ -247,7 +388,7 @@ public int getDutyCycleSP() throws IOException{ if (!this.isConnected()){ return -1; } - String dutycyclesp = this.getAttribute(Def.PROPERTY_DUTY_CYCLE_SP); + String dutycyclesp = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP); return Integer.parseInt(dutycyclesp); } @@ -262,9 +403,11 @@ public void setDutyCycleSP(int sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); + this.setAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); } + //getFullTravelCount() Linear Motor Only (Mark down) + /** * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. * With inversed polarity, a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. @@ -275,7 +418,7 @@ public String getPolarity() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_POLARITY); + return this.getAttribute(SYSFS_PROPERTY_POLARITY); } /** @@ -288,7 +431,7 @@ public void setPolarity(String polarity) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POLARITY, polarity); + this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); } /** @@ -315,7 +458,7 @@ public void setPosition(int position) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION, Integer.toString(position)); + this.setAttribute(SYSFS_PROPERTY_POSITION, Integer.toString(position)); } /** @@ -327,7 +470,7 @@ public int getPosition_P() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_P); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_P); return Integer.parseInt(str); } @@ -340,7 +483,7 @@ public int getPosition_I() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_I); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_I); return Integer.parseInt(str); } @@ -353,7 +496,7 @@ public int getPosition_D() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_D); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_D); return Integer.parseInt(str); } @@ -366,7 +509,7 @@ public void setPosition_P(int position_p) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_P, Integer.toString(position_p)); + this.setAttribute(SYSFS_PROPERTY_POSITION_P, Integer.toString(position_p)); } /** @@ -378,7 +521,7 @@ public void setPosition_I(int position_i) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_I, Integer.toString(position_i)); + this.setAttribute(SYSFS_PROPERTY_POSITION_I, Integer.toString(position_i)); } /** @@ -390,7 +533,7 @@ public void setPosition_D(int position_d) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_D, Integer.toString(position_d)); + this.setAttribute(SYSFS_PROPERTY_POSITION_D, Integer.toString(position_d)); } /** @@ -403,7 +546,7 @@ public int getPosition_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_POSITION_SP); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_SP); return Integer.parseInt(str); } @@ -417,7 +560,7 @@ public void setPosition_SP(int position_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_POSITION_SP, Integer.toString(position_sp)); + this.setAttribute(SYSFS_PROPERTY_POSITION_SP, Integer.toString(position_sp)); } /** @@ -430,7 +573,7 @@ public int getSpeed() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_SPEED); + String str = this.getAttribute(SYSFS_PROPERTY_SPEED); return Integer.parseInt(str); } @@ -444,7 +587,7 @@ public int getSpeed_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_SPEED); + String str = this.getAttribute(SYSFS_PROPERTY_SPEED); return Integer.parseInt(str); } @@ -458,7 +601,7 @@ public void setSpeed_SP(int speed_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_SPEED_SP, Integer.toString(speed_sp)); + this.setAttribute(SYSFS_PROPERTY_SPEED_SP, Integer.toString(speed_sp)); } /** @@ -474,7 +617,7 @@ public int getRamp_Up_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_RAMP_UP_SP); + String str = this.getAttribute(SYSFS_PROPERTY_RAMP_UP_SP); return Integer.parseInt(str); } @@ -491,7 +634,7 @@ public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); + this.setAttribute(SYSFS_PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); } /** @@ -506,7 +649,7 @@ public int getRamp_Down_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_RAMP_DOWN_SP); + String str = this.getAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP); return Integer.parseInt(str); } @@ -522,82 +665,7 @@ public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); - } - - /** - * Get the proportional constant for the speed regulation PID. - * @return The proportional constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public int getSpeedRegulation_P() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_SPEED_REGULATION_P); - return Integer.parseInt(str); - } - - /** - * Set the proportional constant for the speed regulation PID. - * @param p The proportional constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public void setSpeedRegulation_P(int p) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(Def.PROPERTY_SPEED_REGULATION_P, Integer.toString(p)); - } - - /** - * Get the integral constant for the speed regulation PID. - * @return The integral constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public int getSpeedRegulation_I() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_SPEED_REGULATION_I); - return Integer.parseInt(str); - } - - /** - * Set The integral constant for the speed regulation PID. - * @param i The integral constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public void setSpeedRegulation_I(int i) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(Def.PROPERTY_SPEED_REGULATION_I, Integer.toString(i)); - } - - /** - * Get the derivative constant for the speed regulation PID. - * @return The derivative constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public int getSpeedRegulation_D() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_SPEED_REGULATION_D); - return Integer.parseInt(str); - } - - /** - * Set the derivative constant for the speed regulation PID. - * @param d The derivative constant for the speed regulation PID. - * @throws IOException If I/O goes wrong - */ - public void setSpeedRegulation_D(int d) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(Def.PROPERTY_SPEED_REGULATION_D, Integer.toString(d)); + this.setAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); } /** @@ -614,7 +682,7 @@ public String getStateViaString() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_STATE); + return this.getAttribute(SYSFS_PROPERTY_STATE); } /** @@ -640,7 +708,7 @@ public String getStopAction() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_STOP_ACTION); + return this.getAttribute(SYSFS_PROPERTY_STOP_ACTION); } /** @@ -653,7 +721,7 @@ public void setStopAction(String stop_action) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_STOP_ACTION, stop_action); + this.setAttribute(SYSFS_PROPERTY_STOP_ACTION, stop_action); } /** @@ -677,7 +745,7 @@ public String getStopCommandsViaString() throws IOException{ if (!this.isConnected()){ return null; } - return this.getAttribute(Def.PROPERTY_STOP_ACTIONS); + return this.getAttribute(SYSFS_PROPERTY_STOP_ACTIONS); } /** @@ -709,7 +777,7 @@ public int getTime_SP() throws IOException{ if (!this.isConnected()){ return -1; } - String str = this.getAttribute(Def.PROPERTY_TIME_SP); + String str = this.getAttribute(SYSFS_PROPERTY_TIME_SP); return Integer.parseInt(str); } @@ -722,20 +790,7 @@ public void setTime_SP(int time_sp) throws IOException{ if (!this.isConnected()){ return; } - this.setAttribute(Def.PROPERTY_TIME_SP, Integer.toString(time_sp)); - } - - /** - * This returns the maximum speed of the motor with no load at 9V. - * @return The maximum speed - * @throws IOException If I/O goes wrong - */ - public int getMax_Speed() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(Def.PROPERTY_MAX_SPEED); - return Integer.parseInt(str); + this.setAttribute(SYSFS_PROPERTY_TIME_SP, Integer.toString(time_sp)); } //~autogen diff --git a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java index 67f06f7..98eca3b 100644 --- a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; /** @@ -16,6 +15,66 @@ */ public class ServoMotor extends Device{ + /** + * The Sysfs class's address property name + */ + private static final String SYSFS_PROPERTY_ADDRESS = "address"; + + /** + * The Sysfs class's command property name + */ + private static final String SYSFS_PROPERTY_COMMAND = "command"; + + /** + * The Sysfs class's driver_name property name + */ + private static final String SYSFS_PROPERTY_DRIVER_NAME = "driver_name"; + + /** + * The Sysfs class's polarity property name + */ + private static final String SYSFS_PROPERTY_POLARITY = "polarity"; + + /** + * The Sysfs class's position_sp property name + */ + private static final String SYSFS_PROPERTY_POSITION_SP = "position_sp"; + + /** + * The Sysfs class's state property name + */ + private static final String SYSFS_PROPERTY_STATE = "state"; + + /** + * The Sysfs class's max_pulse_sp property name + */ + private static final String SYSFS_PROPERTY_MAX_PULSE_SP = "max_pulse_sp"; + + /** + * The Sysfs class's mid_pulse_sp property name + */ + private static final String SYSFS_PROPERTY_MID_PULSE_SP = "mid_pulse_sp"; + + /** + * The Sysfs class's min_pulse_sp property name + */ + private static final String SYSFS_PROPERTY_MIN_PULSE_SP = "min_pulse_sp"; + + /** + * The Sysfs class's rate_sp property name + */ + private static final String SYSFS_PROPERTY_RATE_SP = "rate_sp"; + + /** + * The Sysfs class's run command + */ + public static final String SYSFS_COMMAND_RUN = "run"; + + /** + * The Sysfs class's float command + */ + public static final String SYSFS_COMMAND_FLOAT = "float"; + /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ @@ -53,7 +112,7 @@ public ServoMotor(LegoPort port) throws InvalidPortException, InvalidMotorExcept * @throws IOException If the motor doesn't exist or IO ERROR */ public String getAddress() throws IOException{ - return this.getAttribute(Def.PROPERTY_ADDRESS); + return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** @@ -62,7 +121,7 @@ public String getAddress() throws IOException{ * @throws IOException If I/O goes wrong */ public void sendCommand(String command) throws IOException{ - this.setAttribute(Def.PROPERTY_COMMAND, command); + this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /*** @@ -70,7 +129,7 @@ public void sendCommand(String command) throws IOException{ * @throws IOException If I/O goes wrong */ public void run() throws IOException{ - sendCommand(Def.COMMAND_RUN); + sendCommand(SYSFS_COMMAND_RUN); } /*** @@ -79,7 +138,7 @@ public void run() throws IOException{ * @throws IOException If I/O goes wrong */ public void Float() throws IOException{ - sendCommand(Def.COMMAND_FLOAT); + sendCommand(SYSFS_COMMAND_FLOAT); } /** @@ -88,7 +147,7 @@ public void Float() throws IOException{ * @throws IOException If I/O goes wrong */ public String getDriverName() throws IOException{ - return this.getAttribute(Def.PROPERTY_DRIVER_NAME); + return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } /** @@ -98,7 +157,7 @@ public String getDriverName() throws IOException{ * @throws IOException If I/O goes wrong */ public int getMaxPulse_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_MAX_PULSE_SP); + String str = this.getAttribute(SYSFS_PROPERTY_MAX_PULSE_SP); return Integer.parseInt(str); } @@ -109,7 +168,7 @@ public int getMaxPulse_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setMaxPulse_SP(int max_pulse_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_MAX_PULSE_SP, Integer.toString(max_pulse_sp)); + this.setAttribute(SYSFS_PROPERTY_MAX_PULSE_SP, Integer.toString(max_pulse_sp)); } /** @@ -121,7 +180,7 @@ public void setMaxPulse_SP(int max_pulse_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public int getMidPulse_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_MID_PULSE_SP); + String str = this.getAttribute(SYSFS_PROPERTY_MID_PULSE_SP); return Integer.parseInt(str); } @@ -134,7 +193,7 @@ public int getMidPulse_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setMidPulse_SP(int mid_pulse_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_MID_PULSE_SP, Integer.toString(mid_pulse_sp)); + this.setAttribute(SYSFS_PROPERTY_MID_PULSE_SP, Integer.toString(mid_pulse_sp)); } /** @@ -145,7 +204,7 @@ public void setMidPulse_SP(int mid_pulse_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public int getMinPulse_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_MIN_PULSE_SP); + String str = this.getAttribute(SYSFS_PROPERTY_MIN_PULSE_SP); return Integer.parseInt(str); } @@ -157,7 +216,7 @@ public int getMinPulse_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setMinPulse_SP(int min_pulse_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_MIN_PULSE_SP, Integer.toString(min_pulse_sp)); + this.setAttribute(SYSFS_PROPERTY_MIN_PULSE_SP, Integer.toString(min_pulse_sp)); } /** @@ -167,7 +226,7 @@ public void setMinPulse_SP(int min_pulse_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public String getPolarity() throws IOException{ - return this.getAttribute(Def.PROPERTY_POLARITY); + return this.getAttribute(SYSFS_PROPERTY_POLARITY); } /** @@ -177,7 +236,7 @@ public String getPolarity() throws IOException{ * @throws IOException If I/O goes wrong */ public void setPolarity(String polarity) throws IOException{ - this.setAttribute(Def.PROPERTY_POLARITY, polarity); + this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); } /** @@ -188,7 +247,7 @@ public void setPolarity(String polarity) throws IOException{ * @throws IOException If I/O goes wrong */ public int getPosition_SP() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_POSITION_SP); + String str = this.getAttribute(SYSFS_PROPERTY_POSITION_SP); return Integer.parseInt(str); } @@ -200,7 +259,7 @@ public int getPosition_SP() throws IOException{ * @throws IOException If I/O goes wrong */ public void setPosition_SP(int position_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_POSITION_SP, Integer.toString(position_sp)); + this.setAttribute(SYSFS_PROPERTY_POSITION_SP, Integer.toString(position_sp)); } /** @@ -213,7 +272,7 @@ public void setPosition_SP(int position_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public void setRate_SP(int rate_sp) throws IOException{ - this.setAttribute(Def.PROPERTY_RATE_SP, Integer.toString(rate_sp)); + this.setAttribute(SYSFS_PROPERTY_RATE_SP, Integer.toString(rate_sp)); } /** @@ -227,7 +286,7 @@ public void setRate_SP(int rate_sp) throws IOException{ * @throws IOException If I/O goes wrong */ public String getStateViaString() throws IOException{ - return this.getAttribute(Def.PROPERTY_STATE); + return this.getAttribute(SYSFS_PROPERTY_STATE); } /** diff --git a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java index 281e857..0bf72b7 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java @@ -5,7 +5,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; /** @@ -24,6 +23,51 @@ */ public class Sensor extends Device{ + /** + * The Sysfs class's address property name + */ + public static final String SYSFS_PROPERTY_ADDRESS = "address"; + + /** + * The Sysfs class's command property name + */ + public static final String SYSFS_PROPERTY_COMMAND = "command"; + + /** + * The Sysfs class's commands property name + */ + public static final String SYSFS_PROPERTY_COMMANDS = "commands"; + + /** + * The Sysfs class's driver_name property name + */ + public static final String SYSFS_PROPERTY_DRIVER_NAME = "driver_name"; + + /** + * The Sysfs class's decimals property name + */ + public static final String SYSFS_PROPERTY_DECIMALS = "decimals"; + + /** + * The Sysfs class's mode property name + */ + public static final String SYSFS_PROPERTY_MODE = "mode"; + + /** + * The Sysfs class's modes property name + */ + public static final String SYSFS_PROPERTY_MODES = "modes"; + + /** + * The Sysfs class's num_values property name + */ + public static final String SYSFS_PROPERTY_NUM_VALUES = "num_values"; + + /** + * The Sysfs class's units property name + */ + public static final String SYSFS_PROPERTY_UNITS = "units"; + /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ @@ -51,7 +95,7 @@ public Sensor(LegoPort port) throws IOException, InvalidPortException{ * @throws IOException If I/O goes wrong */ public String getAddress() throws IOException{ - return this.getAttribute(Def.PROPERTY_ADDRESS); + return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** @@ -60,7 +104,7 @@ public String getAddress() throws IOException{ * @throws IOException If I/O goes wrong */ public void sendCommand(String command) throws IOException{ - this.setAttribute(Def.PROPERTY_COMMAND, command); + this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /** @@ -74,7 +118,7 @@ public void sendCommand(String command) throws IOException{ * @throws IOException If I/O goes wrong */ public String getCommandsViaString() throws IOException{ - return this.getAttribute(Def.PROPERTY_COMMANDS); + return this.getAttribute(SYSFS_PROPERTY_COMMANDS); } /** @@ -93,7 +137,7 @@ public String[] getCommands() throws IOException{ * @throws IOException If I/O goes wrong */ public int getDecimals() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_DECIMALS); + String str = this.getAttribute(SYSFS_PROPERTY_DECIMALS); return Integer.parseInt(str); } @@ -103,7 +147,7 @@ public int getDecimals() throws IOException{ * @throws IOException If I/O goes wrong */ public String getDriverName() throws IOException{ - return this.getAttribute(Def.PROPERTY_DRIVER_NAME); + return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } /** @@ -112,7 +156,7 @@ public String getDriverName() throws IOException{ * @throws IOException If I/O goes wrong */ public String getMode() throws IOException{ - return this.getAttribute(Def.PROPERTY_MODE); + return this.getAttribute(SYSFS_PROPERTY_MODE); } /** @@ -121,7 +165,7 @@ public String getMode() throws IOException{ * @throws IOException If I/O goes wrong */ public void setMode(String mode) throws IOException{ - this.setAttribute(Def.PROPERTY_MODE, mode); + this.setAttribute(SYSFS_PROPERTY_MODE, mode); } /** @@ -135,7 +179,7 @@ public void setMode(String mode) throws IOException{ * @throws IOException If I/O goes wrong */ public String getModesViaString() throws IOException{ - return this.getAttribute(Def.PROPERTY_MODES); + return this.getAttribute(SYSFS_PROPERTY_MODES); } /** @@ -154,7 +198,7 @@ public String[] getModes() throws IOException{ * @throws IOException If I/O goes wrong */ public int getNumValues() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_NUM_VALUES); + String str = this.getAttribute(SYSFS_PROPERTY_NUM_VALUES); return Integer.parseInt(str); } @@ -164,7 +208,7 @@ public int getNumValues() throws IOException{ * @throws IOException If I/O goes wrong */ public String getUnits() throws IOException{ - return this.getAttribute(Def.PROPERTY_UNITS); + return this.getAttribute(SYSFS_PROPERTY_UNITS); } } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index fe79e42..b2d0fbe 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -11,93 +11,9 @@ public class Def { //Class names REMOVAL DONE! - //Driver names + //Driver names REMOVAL DONE! - public static final String oI2CSENSOR_DRIVER_NAME = "nxt-i2c-sensor"; - - public static final String oTOUCH_SENSOR_DRIVER_NAME_EV3 = "lego-ev3-touch"; - - public static final String oTOUCH_SENSOR_DRIVER_NAME_NXT = "lego-nxt-touch"; - - public static final String oCOLOR_SENSOR_DRIVER_NAME = "lego-ev3-color"; - - public static final String oULTRASONIC_SENSOR_DRIVER_NAME_EV3 = "lego-ev3-us"; - - public static final String oULTRASONIC_SENSOR_DRIVER_NAME_NXT = "lego-nxt-us"; - - public static final String oGYRO_SENSOR_DRIVER_NAME = "lego-ev3-gyro"; - - public static final String oINFRARED_SENSOR_DRIVER_NAME = "lego-ev3-ir"; - - public static final String oSOUND_SENSOR_DRIVER_NAME = "lego-nxt-sound"; - - public static final String oLIGHT_SENSOR_DRIVER_NAME = "lego-nxt-light"; - - //Properties defaults - - public static final String PROPERTY_ADDRESS = "address"; - - public static final String PROPERTY_COMMAND = "command"; - - public static final String PROPERTY_COMMANDS = "commands"; - - public static final String PROPERTY_COUNT_PER_ROT = "count_per_rot"; - - public static final String PROPERTY_DRIVER_NAME = "driver_name"; - - public static final String PROPERTY_DUTY_CYCLE = "duty_cycle"; - - public static final String PROPERTY_DUTY_CYCLE_SP = "duty_cycle_sp"; - - public static final String PROPERTY_POLARITY = "polarity"; - - public static final String PROPERTY_POSITION = "position"; - - public static final String PROPERTY_POSITION_P = "hold_pid/Kp"; - - public static final String PROPERTY_POSITION_I = "hold_pid/Ki"; - - public static final String PROPERTY_POSITION_D = "hold_pid/Kd"; - - public static final String PROPERTY_POSITION_SP = "position_sp"; - - public static final String PROPERTY_SPEED = "speed"; - - public static final String PROPERTY_SPEED_SP = "speed_sp"; - - public static final String PROPERTY_RAMP_UP_SP = "ramp_up_sp"; - - public static final String PROPERTY_RAMP_DOWN_SP = "ramp_down_sp"; - - public static final String PROPERTY_SPEED_REGULATION_ENABLED = "speed_regulation_enabled"; - - public static final String PROPERTY_SPEED_REGULATION_P = "speed_pid/Kp"; - - public static final String PROPERTY_SPEED_REGULATION_I = "speed_pid/Ki"; - - public static final String PROPERTY_SPEED_REGULATION_D = "speed_pid/Kd"; - - public static final String PROPERTY_STATE = "state"; - - public static final String PROPERTY_STOP_ACTION = "stop_action"; - - public static final String PROPERTY_STOP_ACTIONS = "stop_actions"; - - public static final String PROPERTY_TIME_SP = "time_sp"; - - public static final String PROPERTY_MAX_PULSE_SP = "max_pulse_sp"; - - public static final String PROPERTY_MID_PULSE_SP = "mid_pulse_sp"; - - public static final String PROPERTY_MIN_PULSE_SP = "min_pulse_sp"; - - public static final String PROPERTY_RATE_SP = "rate_sp"; - - public static final String PROPERTY_MAX_SPEED = "max_speed"; - - public static final String PROPERTY_COUNT_PER_M = "count_per_m"; - - public static final String PROPERTY_FULL_TRAVEL_COUNT = "full_travel_count"; + //Motor Properties defaults REMOVAL DONE! //LED Properties defaults @@ -259,24 +175,6 @@ public class Def { public static final int PROPERTY_EV3_BUTTON_BACKSPACE = 14; - //Commands defaults - - public static final String COMMAND_RUN_FOREVER = "run-forever"; - - public static final String COMMAND_RUN_TO_ABS_POS = "run-to-abs-pos"; - - public static final String COMMAND_RUN_TO_REL_POS = "run-to-rel-pos"; - - public static final String COMMAND_RUN_TIMED = "run-timed"; - - public static final String COMMAND_RUN_DIRECT = "run-direct"; - - public static final String COMMAND_STOP = "stop"; - - public static final String COMMAND_RESET = "reset"; - - public static final String COMMAND_RUN = "run"; - - public static final String COMMAND_FLOAT = "float"; + //Commands defaults REMOVAL DONE } From f22a8a3377e13c561cca6fdd821b1a27811d7005 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 17:33:50 +0800 Subject: [PATCH 08/75] Partial: Move properties constants to classes (2) --- src/main/java/org/ev3dev/hardware/LED.java | 46 ++++++++++++++++------ src/main/java/org/ev3dev/io/Def.java | 10 ----- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index d2cc7b1..fc20dc1 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -4,7 +4,6 @@ import java.io.IOException; import org.ev3dev.exception.InvalidLEDException; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; /*** @@ -18,6 +17,31 @@ */ public class LED extends Device{ + /** + * The Sysfs class's max_brightness property name + */ + public static final String SYSFS_PROPERTY_MAX_BRIGHTNESS = "max_brightness"; + + /** + * The Sysfs class's brightness property name + */ + public static final String SYSFS_PROPERTY_BRIGHTNESS = "brightness"; + + /** + * The Sysfs class's trigger property name + */ + public static final String SYSFS_PROPERTY_TRIGGER = "trigger"; + + /** + * The Sysfs class's delay_on property name + */ + public static final String SYSFS_PROPERTY_DELAY_ON = "delay_on"; + + /** + * The Sysfs class's delay_off property name + */ + public static final String SYSFS_PROPERTY_DELAY_OFF = "delay_off"; + /** * Left EV3 Button */ @@ -87,7 +111,7 @@ public LED(String ledName) throws InvalidLEDException{ * @throws IOException If I/O goes wrong */ public int getMaxBrightness() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_MAX_BRIGHTNESS); + String str = this.getAttribute(SYSFS_PROPERTY_MAX_BRIGHTNESS); return Integer.parseInt(str); } @@ -97,7 +121,7 @@ public int getMaxBrightness() throws IOException{ * @throws IOException If I/O goes wrong */ public int getBrightness() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_BRIGHTNESS); + String str = this.getAttribute(SYSFS_PROPERTY_BRIGHTNESS); return Integer.parseInt(str); } @@ -107,7 +131,7 @@ public int getBrightness() throws IOException{ * @throws IOException If I/O goes wrong */ public void setBrightness(int brightness) throws IOException{ - this.setAttribute(Def.PROPERTY_BRIGHTNESS, Integer.toString(brightness)); + this.setAttribute(SYSFS_PROPERTY_BRIGHTNESS, Integer.toString(brightness)); } /** @@ -121,7 +145,7 @@ public void setBrightness(int brightness) throws IOException{ * @throws IOException If I/O goes wrong */ public String getTriggersViaString() throws IOException{ - return this.getAttribute(Def.PROPERTY_TRIGGER); + return this.getAttribute(SYSFS_PROPERTY_TRIGGER); } /** @@ -148,7 +172,7 @@ public String[] getTriggers() throws IOException{ * @throws IOException If I/O goes wrong */ public String getTrigger() throws IOException{ - return this.getAttribute(Def.PROPERTY_TRIGGER); + return this.getAttribute(SYSFS_PROPERTY_TRIGGER); } /** @@ -165,7 +189,7 @@ public String getTrigger() throws IOException{ * @throws IOException If I/O goes wrong */ public void setTrigger(String selector) throws IOException{ - this.setAttribute(Def.PROPERTY_TRIGGER, selector); + this.setAttribute(SYSFS_PROPERTY_TRIGGER, selector); } /** @@ -175,7 +199,7 @@ public void setTrigger(String selector) throws IOException{ * @throws IOException If I/O goes wrong */ public int getDelay_On() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_DELAY_ON); + String str = this.getAttribute(SYSFS_PROPERTY_DELAY_ON); return Integer.parseInt(str); } @@ -186,7 +210,7 @@ public int getDelay_On() throws IOException{ * @throws IOException If I/O goes wrong */ public int getDelay_Off() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_DELAY_OFF); + String str = this.getAttribute(SYSFS_PROPERTY_DELAY_OFF); return Integer.parseInt(str); } @@ -197,7 +221,7 @@ public int getDelay_Off() throws IOException{ * @throws IOException If I/O goes wrong */ public void setDelay_On(int delay_on) throws IOException{ - this.setAttribute(Def.PROPERTY_DELAY_ON, Integer.toString(delay_on)); + this.setAttribute(SYSFS_PROPERTY_DELAY_ON, Integer.toString(delay_on)); } /** @@ -207,7 +231,7 @@ public void setDelay_On(int delay_on) throws IOException{ * @throws IOException If I/O goes wrong */ public void setDelay_Off(int delay_off) throws IOException{ - this.setAttribute(Def.PROPERTY_DELAY_OFF, Integer.toString(delay_off)); + this.setAttribute(SYSFS_PROPERTY_DELAY_OFF, Integer.toString(delay_off)); } @Override diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index b2d0fbe..613231a 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -17,16 +17,6 @@ public class Def { //LED Properties defaults - public static final String PROPERTY_MAX_BRIGHTNESS = "max_brightness"; - - public static final String PROPERTY_BRIGHTNESS = "brightness"; - - public static final String PROPERTY_TRIGGER = "trigger"; - - public static final String PROPERTY_DELAY_ON = "delay_on"; - - public static final String PROPERTY_DELAY_OFF = "delay_off"; - //Sensor Properties defaults public static final String PROPERTY_DECIMALS = "decimals"; From ac7713878866db0875323b69678bed6e0503090a Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 17:38:10 +0800 Subject: [PATCH 09/75] Partial: Move properties constants to classes (3) --- .../ev3dev/hardware/sensors/I2CSensor.java | 19 +++++++++++----- src/main/java/org/ev3dev/io/Def.java | 22 ++++--------------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java index 7ad45cc..8b9fbf6 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java @@ -5,7 +5,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; /** * A generic interface to control I2C-type EV3 sensors. @@ -14,10 +13,20 @@ */ public class I2CSensor extends Sensor { + /** + * The Sysfs class's fw_version property name + */ + public static final String SYSFS_PROPERTY_FIRMWARE_VERSION = "fw_version"; + + /** + * The Sysfs class's poll_ms property name + */ + public static final String SYSFS_PROPERTY_POLL_MS = "poll_ms"; + /** * This device's default driver name */ - public static final String DRIVER_NAME = "nxt-i2c-color"; + public static final String DRIVER_NAME = "nxt-i2c-sensor"; /** * Creates a new I2CSensor instance. @@ -39,7 +48,7 @@ public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorExcept * @throws IOException If I/O goes wrong */ public String getFirmwareVersion() throws IOException{ - return this.getAttribute(Def.PROPERTY_FIRMWARE_VERSION); + return this.getAttribute(SYSFS_PROPERTY_FIRMWARE_VERSION); } /** @@ -50,7 +59,7 @@ public String getFirmwareVersion() throws IOException{ * @throws IOException If I/O goes wrong */ public int getPollMs() throws IOException{ - String str = this.getAttribute(Def.PROPERTY_POLL_MS); + String str = this.getAttribute(SYSFS_PROPERTY_POLL_MS); return Integer.parseInt(str); } @@ -62,6 +71,6 @@ public int getPollMs() throws IOException{ * @throws IOException If I/O goes wrong */ public void setPollMs(int ms) throws IOException{ - this.setAttribute(Def.PROPERTY_POLL_MS, Integer.toString(ms)); + this.setAttribute(SYSFS_PROPERTY_POLL_MS, Integer.toString(ms)); } } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 613231a..742c8c5 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -5,7 +5,7 @@ * @author Anthony * */ -public class Def { +public class Def { //Partial: Move properties constants to classes //System class path REMOVAL DONE! @@ -15,25 +15,11 @@ public class Def { //Motor Properties defaults REMOVAL DONE! - //LED Properties defaults + //LED Properties defaults REMOVAL DONE! - //Sensor Properties defaults + //Sensor Properties defaults REMOVAL DONE! - public static final String PROPERTY_DECIMALS = "decimals"; - - public static final String PROPERTY_MODE = "mode"; - - public static final String PROPERTY_MODES = "modes"; - - public static final String PROPERTY_NUM_VALUES = "num_values"; - - public static final String PROPERTY_UNITS = "units"; - - //I2C Sensor properties - - public static final String PROPERTY_FIRMWARE_VERSION = "fw_version"; - - public static final String PROPERTY_POLL_MS = "poll_ms"; + //I2C Sensor properties REMOVAL DONE! //Touch Sensor properties From c81209e8cfbc99f1224456b022a0b41225b27d22 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 17:42:34 +0800 Subject: [PATCH 10/75] Partial: Move properties constants to classes (4) and disable releases --- .travis.yml | 13 +---------- .../ev3dev/hardware/sensors/TouchSensor.java | 23 +++++++++++++------ src/main/java/org/ev3dev/io/Def.java | 6 +---- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index d55a2a8..190731e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,22 +34,11 @@ deploy: - target/ev3dev-lang-java-$projectversion-jar-with-dependencies.jar on: tags: false - branch: unstable - - provider: releases - skip_cleanup: true - api_key: $GITPERM - file: - - target/ev3dev-lang-java-$projectversion.jar - - target/ev3dev-lang-java-$projectversion-jar-with-dependencies.jar - on: - tags: false - branch: develop + branch: master branches: only: - master - - unstable - - stable - develop env: diff --git a/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java b/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java index b53650a..7c142d0 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java @@ -6,10 +6,19 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; public class TouchSensor extends Sensor { + /** + * Sysfs class TouchSensor required mode + */ + public static final String SYSFS_REQUIRED_MODE = "TOUCH"; + + /** + * Sysfs class TouchSensor Value Index + */ + public static final int SYSFS_VALUE_INDEX = 0; + /** * This device's default driver name (EV3 Touch Sensor) */ @@ -36,8 +45,8 @@ public TouchSensor(LegoPort port) throws IOException, InvalidPortException, Inva throw new InvalidSensorException("Can't create a TouchSensor instance that isn't a touch sensor!"); } port.getAddress(); - if (!this.getMode().equals(Def.PROPERTY_TOUCH_REQUIRED_MODE)){ - throw new InvalidSensorException("Can't create a TouchSensor instance that does not support: " + Def.PROPERTY_TOUCH_REQUIRED_MODE); + if (!this.getMode().equals(SYSFS_REQUIRED_MODE)){ + throw new InvalidSensorException("Can't create a TouchSensor instance that does not support: " + SYSFS_REQUIRED_MODE); } } @@ -48,14 +57,14 @@ public TouchSensor(LegoPort port) throws IOException, InvalidPortException, Inva * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public boolean isPressed() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_TOUCH_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_REQUIRED_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_TOUCH_REQUIRED_MODE); + this.setMode(SYSFS_REQUIRED_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_TOUCH_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_REQUIRED_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_TOUCH_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_VALUE_INDEX); return str.equals("1"); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 742c8c5..a4ca777 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -21,11 +21,7 @@ public class Def { //Partial: Move properties constants to classes //I2C Sensor properties REMOVAL DONE! - //Touch Sensor properties - - public static final String PROPERTY_TOUCH_REQUIRED_MODE = "TOUCH"; - - public static final int PROPERTY_TOUCH_VALUE_INDEX = 0; + //Touch Sensor properties REMOVAL DONE! //Color Sensor properties From 485380ed004dca0f21d8d5813e40eddf07011008 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 19:39:10 +0800 Subject: [PATCH 11/75] Partial: Move properties constants to classes (5) --- .../ev3dev/exception/EV3LibraryException.java | 30 ++++++ .../exception/InvalidButtonException.java | 2 +- .../ev3dev/exception/InvalidException.java | 30 ------ .../ev3dev/exception/InvalidLEDException.java | 2 +- .../exception/InvalidModeException.java | 2 +- .../exception/InvalidMotorException.java | 2 +- .../exception/InvalidPortException.java | 2 +- .../exception/InvalidSensorException.java | 2 +- .../ev3dev/hardware/sensors/ColorSensor.java | 99 ++++++++++++++----- src/main/java/org/ev3dev/io/Def.java | 38 +------ 10 files changed, 111 insertions(+), 98 deletions(-) create mode 100644 src/main/java/org/ev3dev/exception/EV3LibraryException.java delete mode 100644 src/main/java/org/ev3dev/exception/InvalidException.java diff --git a/src/main/java/org/ev3dev/exception/EV3LibraryException.java b/src/main/java/org/ev3dev/exception/EV3LibraryException.java new file mode 100644 index 0000000..3416978 --- /dev/null +++ b/src/main/java/org/ev3dev/exception/EV3LibraryException.java @@ -0,0 +1,30 @@ +package org.ev3dev.exception; + +/*** + * This exception is thrown if something was invalid. + * @author Anthony + * + */ +public class EV3LibraryException extends RuntimeException { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public EV3LibraryException(){ + super(); + } + + public EV3LibraryException(String message){ + super(message); + } + + public EV3LibraryException(String message, Throwable cause){ + super(message, cause); + } + + public EV3LibraryException(Throwable cause){ + super(cause); + } +} diff --git a/src/main/java/org/ev3dev/exception/InvalidButtonException.java b/src/main/java/org/ev3dev/exception/InvalidButtonException.java index a5c9479..08d3cc5 100644 --- a/src/main/java/org/ev3dev/exception/InvalidButtonException.java +++ b/src/main/java/org/ev3dev/exception/InvalidButtonException.java @@ -7,7 +7,7 @@ * @author Anthony * */ -public class InvalidButtonException extends InvalidException { +public class InvalidButtonException extends EV3LibraryException { /** * diff --git a/src/main/java/org/ev3dev/exception/InvalidException.java b/src/main/java/org/ev3dev/exception/InvalidException.java deleted file mode 100644 index d2b1357..0000000 --- a/src/main/java/org/ev3dev/exception/InvalidException.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ev3dev.exception; - -/*** - * This exception is thrown if something was invalid. - * @author Anthony - * - */ -public class InvalidException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public InvalidException(){ - super(); - } - - public InvalidException(String message){ - super(message); - } - - public InvalidException(String message, Throwable cause){ - super(message, cause); - } - - public InvalidException(Throwable cause){ - super(cause); - } -} diff --git a/src/main/java/org/ev3dev/exception/InvalidLEDException.java b/src/main/java/org/ev3dev/exception/InvalidLEDException.java index 0a067bf..11a4047 100644 --- a/src/main/java/org/ev3dev/exception/InvalidLEDException.java +++ b/src/main/java/org/ev3dev/exception/InvalidLEDException.java @@ -6,7 +6,7 @@ * @author Anthony * */ -public class InvalidLEDException extends InvalidException { +public class InvalidLEDException extends EV3LibraryException { /** * diff --git a/src/main/java/org/ev3dev/exception/InvalidModeException.java b/src/main/java/org/ev3dev/exception/InvalidModeException.java index 710f446..f7b94fd 100644 --- a/src/main/java/org/ev3dev/exception/InvalidModeException.java +++ b/src/main/java/org/ev3dev/exception/InvalidModeException.java @@ -5,7 +5,7 @@ * @author Anthony * */ -public class InvalidModeException extends InvalidException { +public class InvalidModeException extends EV3LibraryException { /** * diff --git a/src/main/java/org/ev3dev/exception/InvalidMotorException.java b/src/main/java/org/ev3dev/exception/InvalidMotorException.java index d97837a..22f0679 100644 --- a/src/main/java/org/ev3dev/exception/InvalidMotorException.java +++ b/src/main/java/org/ev3dev/exception/InvalidMotorException.java @@ -7,7 +7,7 @@ * @author Anthony * */ -public class InvalidMotorException extends InvalidException { +public class InvalidMotorException extends EV3LibraryException { /** * diff --git a/src/main/java/org/ev3dev/exception/InvalidPortException.java b/src/main/java/org/ev3dev/exception/InvalidPortException.java index ee63721..8fc0215 100644 --- a/src/main/java/org/ev3dev/exception/InvalidPortException.java +++ b/src/main/java/org/ev3dev/exception/InvalidPortException.java @@ -7,7 +7,7 @@ * @author Anthony * */ -public class InvalidPortException extends InvalidException { +public class InvalidPortException extends EV3LibraryException { /** * diff --git a/src/main/java/org/ev3dev/exception/InvalidSensorException.java b/src/main/java/org/ev3dev/exception/InvalidSensorException.java index ccb3477..cc1d6ad 100644 --- a/src/main/java/org/ev3dev/exception/InvalidSensorException.java +++ b/src/main/java/org/ev3dev/exception/InvalidSensorException.java @@ -9,7 +9,7 @@ * @author Anthony * */ -public class InvalidSensorException extends InvalidException { +public class InvalidSensorException extends EV3LibraryException { /** * diff --git a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java index 7cebfa5..c613ba8 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; /** * LEGO EV3 color sensor. @@ -15,6 +14,56 @@ */ public class ColorSensor extends Sensor { + /** + * Reflected Light Intensity required Sysfs mode + */ + private static final String SYSFS_REFLECTED_LIGHT_INTENSITY_MODE = "COL-REFLECT"; + + /** + * Reflected Light Intensity Sysfs value index + */ + private static final int SYSFS_REFLECTED_LIGHT_INTENSITY_VALUE_INDEX = 0; + + /** + * Ambient Light Intensity required Sysfs mode + */ + private static final String SYSFS_AMBIENT_LIGHT_INTENSITY_MODE = "COL-AMBIENT"; + + /** + * Ambient Light Intensity Sysfs value index + */ + private static final int SYSFS_AMBIENT_LIGHT_INTENSITY_VALUE_INDEX = 0; + + /** + * Color required Sysfs mode + */ + private static final String SYSFS_COLOR_MODE = "COL-COLOR"; + + /** + * Color Sysfs value index + */ + private static final int SYSFS_COLOR_VALUE_INDEX = 0; + + /** + * RGB required Sysfs mode + */ + private static final String SYSFS_RGB_MODE = "RGB-RAW"; + + /** + * RGB Red Sysfs value index + */ + private static final int SYSFS_RGB_R_VALUE_INDEX = 0; + + /** + * RGB Green Sysfs value index + */ + private static final int SYSFS_RGB_G_VALUE_INDEX = 1; + + /** + * RGB Blue Sysfs value index + */ + private static final int SYSFS_RGB_B_VALUE_INDEX = 2; + /** * This device's default driver name */ @@ -44,14 +93,14 @@ public ColorSensor(LegoPort port) throws IOException, InvalidPortException, Inva * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getReflectedLightIntensity() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_REFLECTED_LIGHT_INTENSITY_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY_REQUIRED_MODE); + this.setMode(SYSFS_REFLECTED_LIGHT_INTENSITY_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_REFLECTED_LIGHT_INTENSITY_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_REFLECTED_LIGHT_INTENSITY_VALUE_INDEX); return Integer.parseInt(str); } @@ -62,14 +111,14 @@ public int getReflectedLightIntensity() throws IOException, InvalidModeException * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getAmbientLightIntensity() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_AMBIENT_LIGHT_INTENSITY_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY_REQUIRED_MODE); + this.setMode(SYSFS_AMBIENT_LIGHT_INTENSITY_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_AMBIENT_LIGHT_INTENSITY_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_AMBIENT_LIGHT_INTENSITY_VALUE_INDEX); return Integer.parseInt(str); } @@ -88,14 +137,14 @@ public int getAmbientLightIntensity() throws IOException, InvalidModeException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getColor() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_COLOR_SENSOR_COLOR_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_COLOR_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_COLOR_SENSOR_COLOR_REQUIRED_MODE); + this.setMode(SYSFS_COLOR_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_COLOR_SENSOR_COLOR_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_COLOR_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_COLOR_SENSOR_COLOR_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_COLOR_VALUE_INDEX); return Integer.parseInt(str); } @@ -106,14 +155,14 @@ public int getColor() throws IOException, InvalidModeException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getRGB_Red() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_COLOR_SENSOR_RGB_R_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_RGB_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_COLOR_SENSOR_RGB_R_REQUIRED_MODE); + this.setMode(SYSFS_RGB_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_COLOR_SENSOR_RGB_R_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_RGB_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_COLOR_SENSOR_RGB_R_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_RGB_R_VALUE_INDEX); return Integer.parseInt(str); } @@ -124,14 +173,14 @@ public int getRGB_Red() throws IOException, InvalidModeException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getRGB_Green() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_COLOR_SENSOR_RGB_G_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_RGB_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_COLOR_SENSOR_RGB_G_REQUIRED_MODE); + this.setMode(SYSFS_RGB_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_COLOR_SENSOR_RGB_G_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_RGB_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_COLOR_SENSOR_RGB_G_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_RGB_G_VALUE_INDEX); return Integer.parseInt(str); } @@ -142,14 +191,14 @@ public int getRGB_Green() throws IOException, InvalidModeException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getRGB_Blue() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_COLOR_SENSOR_RGB_B_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_RGB_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_COLOR_SENSOR_RGB_B_REQUIRED_MODE); + this.setMode(SYSFS_RGB_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_COLOR_SENSOR_RGB_B_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_RGB_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_COLOR_SENSOR_RGB_B_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_RGB_B_VALUE_INDEX); return Integer.parseInt(str); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index a4ca777..42a2a1f 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -23,43 +23,7 @@ public class Def { //Partial: Move properties constants to classes //Touch Sensor properties REMOVAL DONE! - //Color Sensor properties - - public static final String PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY = "reflected_light_intensity"; - - public static final String PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY_REQUIRED_MODE = "COL-REFLECT"; - - public static final int PROPERTY_COLOR_SENSOR_REFLECTED_LIGHT_INTENSITY_VALUE_INDEX = 0; - - public static final String PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY = "ambient_light_intensity"; - - public static final String PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY_REQUIRED_MODE = "COL-AMBIENT"; - - public static final int PROPERTY_COLOR_SENSOR_AMBIENT_LIGHT_INTENSITY_VALUE_INDEX = 0; - - public static final String PROPERTY_COLOR_SENSOR_COLOR = "color"; - - public static final String PROPERTY_COLOR_SENSOR_COLOR_REQUIRED_MODE = "COL-COLOR"; - - public static final int PROPERTY_COLOR_SENSOR_COLOR_VALUE_INDEX = 0; - - public static final String PROPERTY_COLOR_SENSOR_RGB_R = "red"; - - public static final String PROPERTY_COLOR_SENSOR_RGB_R_REQUIRED_MODE = "RGB-RAW"; - - public static final int PROPERTY_COLOR_SENSOR_RGB_R_VALUE_INDEX = 0; - - public static final String PROPERTY_COLOR_SENSOR_RGB_G = "green"; - - public static final String PROPERTY_COLOR_SENSOR_RGB_G_REQUIRED_MODE = "RGB-RAW"; - - public static final int PROPERTY_COLOR_SENSOR_RGB_G_VALUE_INDEX = 1; - - public static final String PROPERTY_COLOR_SENSOR_RGB_B = "blue"; - - public static final String PROPERTY_COLOR_SENSOR_RGB_B_REQUIRED_MODE = "RGB-RAW"; - - public static final int PROPERTY_COLOR_SENSOR_RGB_B_VALUE_INDEX = 2; + //Color Sensor properties REMOVAL DONE! //Ultrasonic sensor properties From 003dd1e924100d4d546cbaa654235926872dade9 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 20:15:19 +0800 Subject: [PATCH 12/75] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9617259..1f73ddb 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # ev3dev-lang-java [![Build Status](https://travis-ci.org/mob41/ev3dev-lang-java.svg?branch=master)](https://travis-ci.org/mob41/ev3dev-lang-java) -A ev3dev unified language binding for Java, that followed with the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html). +An ev3dev unified language binding for Java, that followed with the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html). -# Outdated library +# Library -This library is currently outdated, and only support few drivers. Please consider using another [Java-compatible library](https://github.com/ev3dev-lang-java/ev3dev-lang-java/) or wait few weeks to let this library to be ready up. +This library currently legacy supports ev3dev kernel version 15, but does not support new drivers listed since kernel version 11, and optional drivers in [http://www.ev3dev.org/docs/sensors/](http://www.ev3dev.org/docs/sensors/). -Check out #15 for more details. \ No newline at end of file +Still in heavy development, see issue [#15](https://github.com/mob41/ev3dev-lang-java/issues/15) for more details or tracking development stage. \ No newline at end of file From 05cc5f50351bed2cb09a66ce3e1be8369d509f3d Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 20:24:53 +0800 Subject: [PATCH 13/75] Update README.md --- README.md | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1f73ddb..e800d3d 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,32 @@ An ev3dev unified language binding for Java, that followed with the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html). -# Library +## Library This library currently legacy supports ev3dev kernel version 15, but does not support new drivers listed since kernel version 11, and optional drivers in [http://www.ev3dev.org/docs/sensors/](http://www.ev3dev.org/docs/sensors/). -Still in heavy development, see issue [#15](https://github.com/mob41/ev3dev-lang-java/issues/15) for more details or tracking development stage. \ No newline at end of file +Still in heavy development, see issue [#15](https://github.com/mob41/ev3dev-lang-java/issues/15) for more details or tracking development stage. + +## Build your own + +You can build your own library with some steps. + +1. Ensure you have Maven installed in your system + +2. Clone this repository + +```git clone https://github.com/mob41/ev3dev-lang-java.git``` + +3. Switch to the repository directory + +```cd ev3dev-lang-java``` + +4. Build! + +```maven package``` + +5. Switch to the ```target``` directory + +```cd target``` + +6. There should have ```ev3dev-lang-java-x.x.x-x.jar``` and ```ev3dev-lang-java-x.x.x-x-jar-with-dependencies.jar``` in the directory. \ No newline at end of file From 1ed5568e6ff908c451ed70d4db714b846d723fb7 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 20:25:24 +0800 Subject: [PATCH 14/75] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e800d3d..1ca89d8 100644 --- a/README.md +++ b/README.md @@ -16,18 +16,18 @@ You can build your own library with some steps. 2. Clone this repository -```git clone https://github.com/mob41/ev3dev-lang-java.git``` + ```git clone https://github.com/mob41/ev3dev-lang-java.git``` 3. Switch to the repository directory -```cd ev3dev-lang-java``` + ```cd ev3dev-lang-java``` 4. Build! -```maven package``` + ```maven package``` 5. Switch to the ```target``` directory -```cd target``` + ```cd target``` 6. There should have ```ev3dev-lang-java-x.x.x-x.jar``` and ```ev3dev-lang-java-x.x.x-x-jar-with-dependencies.jar``` in the directory. \ No newline at end of file From 730a4e386ee705cbfc428a14364b495f0e9bee72 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 20:29:29 +0800 Subject: [PATCH 15/75] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1ca89d8..7e63512 100644 --- a/README.md +++ b/README.md @@ -16,18 +16,18 @@ You can build your own library with some steps. 2. Clone this repository - ```git clone https://github.com/mob41/ev3dev-lang-java.git``` + >git clone https://github.com/mob41/ev3dev-lang-java.git 3. Switch to the repository directory - ```cd ev3dev-lang-java``` + >cd ev3dev-lang-java 4. Build! - ```maven package``` + >maven package 5. Switch to the ```target``` directory - ```cd target``` + >cd target 6. There should have ```ev3dev-lang-java-x.x.x-x.jar``` and ```ev3dev-lang-java-x.x.x-x-jar-with-dependencies.jar``` in the directory. \ No newline at end of file From 3191f4b03710ba8ddf19ae2ca15698879bb146fc Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 20:50:30 +0800 Subject: [PATCH 16/75] Partial: Move properties constants to classes (6) --- .../hardware/sensors/UltrasonicSensor.java | 55 ++++++++++++++----- src/main/java/org/ev3dev/io/Def.java | 20 +------ 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java b/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java index d3533e6..2b9f45b 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java @@ -6,10 +6,39 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; public class UltrasonicSensor extends Sensor { + /** + * Distance in cm required Sysfs mode + */ + public static final String SYSFS_CM_MODE = "US-DIST-CM"; + + /** + * Distance in cm Sysfs value index + */ + public static final int SYSFS_CM_VALUE_INDEX = 0; + + /** + * Distance in inch required Sysfs mode + */ + public static final String SYSFS_IN_MODE = "US-DIST-IN"; + + /** + * Distance in inch Sysfs value index + */ + public static final int SYSFS_IN_VALUE_INDEX = 0; + + /** + * Other present sensor detection required Sysfs mode + */ + public static final String SYSFS_OTHER_PRESENT_MODE = "US-LISTEN"; + + /** + * Other present sensor detection Sysfs value index + */ + public static final int SYSFS_OTHER_PRESENT_VALUE_INDEX = 0; + /** * This device's default driver name (EV3 Ultrasonic Sensor) */ @@ -45,14 +74,14 @@ public UltrasonicSensor(LegoPort port) throws IOException, InvalidPortException, * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public float getDistanceCentimeters() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_ULTRASONIC_SENSOR_CM_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_CM_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_ULTRASONIC_SENSOR_CM_REQUIRED_MODE); + this.setMode(SYSFS_CM_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_ULTRASONIC_SENSOR_CM_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_CM_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_ULTRASONIC_SENSOR_CM_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_CM_VALUE_INDEX); return Float.parseFloat(str); } @@ -63,14 +92,14 @@ public float getDistanceCentimeters() throws IOException, InvalidModeException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public float getDistanceInches() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_ULTRASONIC_SENSOR_IN_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_IN_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_ULTRASONIC_SENSOR_IN_REQUIRED_MODE); + this.setMode(SYSFS_IN_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_ULTRASONIC_SENSOR_IN_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_IN_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_ULTRASONIC_SENSOR_IN_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_IN_VALUE_INDEX); return Float.parseFloat(str); } @@ -81,14 +110,14 @@ public float getDistanceInches() throws IOException, InvalidModeException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public boolean isOtherSensorPresent() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_OTHER_PRESENT_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT_REQUIRED_MODE); + this.setMode(SYSFS_OTHER_PRESENT_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_OTHER_PRESENT_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_OTHER_PRESENT_VALUE_INDEX); return str.equals("1"); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 42a2a1f..1ea7085 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -25,25 +25,7 @@ public class Def { //Partial: Move properties constants to classes //Color Sensor properties REMOVAL DONE! - //Ultrasonic sensor properties - - public static final String PROPERTY_ULTRASONIC_SENSOR_CM = "distance_centimeters"; - - public static final String PROPERTY_ULTRASONIC_SENSOR_CM_REQUIRED_MODE = "US-DIST-CM"; - - public static final int PROPERTY_ULTRASONIC_SENSOR_CM_VALUE_INDEX = 0; - - public static final String PROPERTY_ULTRASONIC_SENSOR_IN = "distance_inches"; - - public static final String PROPERTY_ULTRASONIC_SENSOR_IN_REQUIRED_MODE = "US-DIST-IN"; - - public static final int PROPERTY_ULTRASONIC_SENSOR_IN_VALUE_INDEX = 0; - - public static final String PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT = "other_sensor_present"; - - public static final String PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT_REQUIRED_MODE = "US-LISTEN"; - - public static final int PROPERTY_ULTRASONIC_SENSOR_OTHER_PRESENT_VALUE_INDEX = 0; + //Ultrasonic sensor properties REMOVAL DONE! //Gyro sensor properties From bc4debb741d4f2086b0459e187c8ea05a04c9639 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 20:59:19 +0800 Subject: [PATCH 17/75] Partial: Move properties constants to classes (7) --- .../ev3dev/hardware/sensors/GyroSensor.java | 37 ++++++++++++++----- src/main/java/org/ev3dev/io/Def.java | 30 --------------- 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java index da0716e..a4408ad 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; /** * LEGO EV3 gyro sensor. @@ -15,6 +14,26 @@ */ public class GyroSensor extends Sensor { + /** + * Gyro angle required Sysfs mode + */ + private static final String SYSFS_ANGLE_MODE = "GYRO-ANG"; + + /** + * Gyro angle Sysfs value index + */ + private static final int SYSFS_ANGLE_VALUE_INDEX = 0; + + /** + * Gyro rate required Sysfs mode + */ + private static final String SYSFS_RATE_MODE = "GYRO-RATE"; + + /** + * Gyro angle Sysfs value index + */ + private static final int SYSFS_RATE_VALUE_INDEX = 0; + /** * This device's default driver name */ @@ -43,14 +62,14 @@ public GyroSensor(LegoPort port) throws IOException, InvalidPortException, Inval * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getAngle() throws InvalidModeException, IOException{ - if (!this.getMode().equals(Def.PROPERTY_GYRO_SENSOR_ANGLE_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_ANGLE_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_GYRO_SENSOR_ANGLE_REQUIRED_MODE); + this.setMode(SYSFS_ANGLE_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_GYRO_SENSOR_ANGLE_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_ANGLE_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_GYRO_SENSOR_ANGLE_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_ANGLE_VALUE_INDEX); return Integer.parseInt(str); } @@ -61,14 +80,14 @@ public int getAngle() throws InvalidModeException, IOException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getRate() throws InvalidModeException, IOException{ - if (!this.getMode().equals(Def.PROPERTY_GYRO_SENSOR_RATE_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_RATE_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_GYRO_SENSOR_RATE_REQUIRED_MODE); + this.setMode(SYSFS_RATE_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_GYRO_SENSOR_RATE_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_RATE_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_GYRO_SENSOR_RATE_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_RATE_VALUE_INDEX); return Integer.parseInt(str); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 1ea7085..b6f58da 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -7,36 +7,6 @@ */ public class Def { //Partial: Move properties constants to classes - //System class path REMOVAL DONE! - - //Class names REMOVAL DONE! - - //Driver names REMOVAL DONE! - - //Motor Properties defaults REMOVAL DONE! - - //LED Properties defaults REMOVAL DONE! - - //Sensor Properties defaults REMOVAL DONE! - - //I2C Sensor properties REMOVAL DONE! - - //Touch Sensor properties REMOVAL DONE! - - //Color Sensor properties REMOVAL DONE! - - //Ultrasonic sensor properties REMOVAL DONE! - - //Gyro sensor properties - - public static final String PROPERTY_GYRO_SENSOR_ANGLE_REQUIRED_MODE = "GYRO-ANG"; - - public static final int PROPERTY_GYRO_SENSOR_ANGLE_VALUE_INDEX = 0; - - public static final String PROPERTY_GYRO_SENSOR_RATE_REQUIRED_MODE = "GYRO-RATE"; - - public static final int PROPERTY_GYRO_SENSOR_RATE_VALUE_INDEX = 0; - //Infrared Sensor properties public static final String PROPERTY_INFRARED_SENSOR_PROXIMITY_REQUIRED_MODE = "IR-PROX"; From 2484a0018e8868829211ecf13040ae5913e85714 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 21:07:22 +0800 Subject: [PATCH 18/75] Partial: Move properties constants to classes (8) --- .../ev3dev/hardware/sensors/GyroSensor.java | 8 ++++---- .../hardware/sensors/InfraredSensor.java | 19 ++++++++++++++----- src/main/java/org/ev3dev/io/Def.java | 6 ------ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java index a4408ad..02693ce 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java @@ -17,22 +17,22 @@ public class GyroSensor extends Sensor { /** * Gyro angle required Sysfs mode */ - private static final String SYSFS_ANGLE_MODE = "GYRO-ANG"; + public static final String SYSFS_ANGLE_MODE = "GYRO-ANG"; /** * Gyro angle Sysfs value index */ - private static final int SYSFS_ANGLE_VALUE_INDEX = 0; + public static final int SYSFS_ANGLE_VALUE_INDEX = 0; /** * Gyro rate required Sysfs mode */ - private static final String SYSFS_RATE_MODE = "GYRO-RATE"; + public static final String SYSFS_RATE_MODE = "GYRO-RATE"; /** * Gyro angle Sysfs value index */ - private static final int SYSFS_RATE_VALUE_INDEX = 0; + public static final int SYSFS_RATE_VALUE_INDEX = 0; /** * This device's default driver name diff --git a/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java b/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java index bfdb8d5..27414ff 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; /** * LEGO EV3 infrared sensor. @@ -15,6 +14,16 @@ */ public class InfraredSensor extends Sensor { + /** + * Proximity required Sysfs mode + */ + public static final String SYSFS_PROXIMITY_REQUIRED_MODE = "IR-PROX"; + + /** + * Proximity Sysfs value index + */ + public static final int SYSFS_PROXIMITY_VALUE_INDEX = 0; + /** * This device's default driver name */ @@ -43,14 +52,14 @@ public InfraredSensor(LegoPort port) throws IOException, InvalidPortException, I * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public int getProximity() throws InvalidModeException, IOException{ - if (!this.getMode().equals(Def.PROPERTY_INFRARED_SENSOR_PROXIMITY_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_PROXIMITY_REQUIRED_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_INFRARED_SENSOR_PROXIMITY_REQUIRED_MODE); + this.setMode(SYSFS_PROXIMITY_REQUIRED_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_INFRARED_SENSOR_PROXIMITY_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_PROXIMITY_REQUIRED_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_INFRARED_SENSOR_PROXIMITY_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_PROXIMITY_VALUE_INDEX); return Integer.parseInt(str); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index b6f58da..af8fb0f 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -7,12 +7,6 @@ */ public class Def { //Partial: Move properties constants to classes - //Infrared Sensor properties - - public static final String PROPERTY_INFRARED_SENSOR_PROXIMITY_REQUIRED_MODE = "IR-PROX"; - - public static final int PROPERTY_INFRARED_SENSOR_PROXIMITY_VALUE_INDEX = 0; - //Sound Sensor properties public static final String PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_REQUIRED_MODE = "DB"; From 301fef871be0b4c87092507d2f6c052494f198a2 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 21:09:23 +0800 Subject: [PATCH 19/75] Partial: Move properties constants to classes (9) --- .../ev3dev/hardware/sensors/SoundSensor.java | 37 ++++++++++++++----- src/main/java/org/ev3dev/io/Def.java | 10 ----- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java b/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java index 1239bf0..79751fa 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; /** * LEGO NXT Sound Sensor @@ -15,6 +14,26 @@ */ public class SoundSensor extends Sensor { + /** + * Sound pressure Sysfs required mode + */ + public static final String SYSFS_SOUND_PRESSURE_REQUIRED_MODE = "DB"; + + /** + * Sound pressure Sysfs value index + */ + public static final int SYSFS_SOUND_PRESSURE_VALUE_INDEX = 0; + + /** + * Sound pressure Low Sysfs required mode + */ + public static final String SYSFS_SOUND_PRESSURE_LOW_REQUIRED_MODE = "DBA"; + + /** + * Sound pressure Low Sysfs value index + */ + public static final int SYSFS_SOUND_PRESSURE_LOW_VALUE_INDEX = 0; + /** * This device's default driver name */ @@ -43,14 +62,14 @@ public SoundSensor(LegoPort port) throws IOException, InvalidPortException, Inva * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public float getSoundPressure() throws InvalidModeException, IOException{ - if (!this.getMode().equals(Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_SOUND_PRESSURE_REQUIRED_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_REQUIRED_MODE); + this.setMode(SYSFS_SOUND_PRESSURE_REQUIRED_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_SOUND_PRESSURE_REQUIRED_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_SOUND_PRESSURE_VALUE_INDEX); return Float.parseFloat(str); } @@ -61,14 +80,14 @@ public float getSoundPressure() throws InvalidModeException, IOException{ * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public float getSoundPressureLow() throws InvalidModeException, IOException{ - if (!this.getMode().equals(Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_LOW_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_SOUND_PRESSURE_LOW_REQUIRED_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_LOW_REQUIRED_MODE); + this.setMode(SYSFS_SOUND_PRESSURE_LOW_REQUIRED_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_LOW_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_SOUND_PRESSURE_LOW_REQUIRED_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_LOW_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_SOUND_PRESSURE_LOW_VALUE_INDEX); return Float.parseFloat(str); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index af8fb0f..4ae04e5 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -7,16 +7,6 @@ */ public class Def { //Partial: Move properties constants to classes - //Sound Sensor properties - - public static final String PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_REQUIRED_MODE = "DB"; - - public static final int PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_VALUE_INDEX = 0; - - public static final String PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_LOW_REQUIRED_MODE = "DBA"; - - public static final int PROPERTY_SOUND_SENSOR_SOUND_PRESSURE_LOW_VALUE_INDEX = 0; - //Light Sensor properties public static final String PROPERTY_LIGHT_SENSOR_REFLECTED_REQUIRED_MODE = "REFLECT"; From ba4c572e83ce726d8252d947688cb76c3872e5a7 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 21:11:01 +0800 Subject: [PATCH 20/75] Partial: Move properties constants to classes (10) --- .../ev3dev/hardware/sensors/LightSensor.java | 37 ++++++++++++++----- src/main/java/org/ev3dev/io/Def.java | 10 ----- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java b/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java index e01b453..7044422 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java @@ -6,7 +6,6 @@ import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Def; /** * LEGO NXT Light Sensor @@ -14,6 +13,26 @@ * */ public class LightSensor extends Sensor { + + /** + * Reflected light Sysfs required mode + */ + public static final String SYSFS_REFLECTED_REQUIRED_MODE = "REFLECT"; + + /** + * Reflected light Sysfs value index + */ + public static final int SYSFS_REFLECTED_VALUE_INDEX = 0; + + /** + * Ambient light Sysfs required mode + */ + public static final String SYSFS_AMBIENT_REQUIRED_MODE = "AMBIENT"; + + /** + * Ambient light Sysfs value index + */ + public static final int SYSFS_AMBIENT_VALUE_INDEX = 0; /** * This device's default driver name @@ -43,14 +62,14 @@ public LightSensor(LegoPort port) throws IOException, InvalidPortException, Inva * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public float getReflectedLightIntensity() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_LIGHT_SENSOR_REFLECTED_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_REFLECTED_REQUIRED_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_LIGHT_SENSOR_REFLECTED_REQUIRED_MODE); + this.setMode(SYSFS_REFLECTED_REQUIRED_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_LIGHT_SENSOR_REFLECTED_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_REFLECTED_REQUIRED_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_LIGHT_SENSOR_REFLECTED_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_REFLECTED_VALUE_INDEX); return Float.parseFloat(str); } @@ -61,14 +80,14 @@ public float getReflectedLightIntensity() throws IOException, InvalidModeExcepti * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ public float getAmbientLightIntensity() throws IOException, InvalidModeException{ - if (!this.getMode().equals(Def.PROPERTY_LIGHT_SENSOR_AMBIENT_REQUIRED_MODE)){ + if (!this.getMode().equals(SYSFS_AMBIENT_REQUIRED_MODE)){ if (autoSwitchMode){ - this.setMode(Def.PROPERTY_LIGHT_SENSOR_AMBIENT_REQUIRED_MODE); + this.setMode(SYSFS_AMBIENT_REQUIRED_MODE); } else { - throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + Def.PROPERTY_LIGHT_SENSOR_AMBIENT_REQUIRED_MODE + ")! Yours: " + this.getMode()); + throw new InvalidModeException("[Auto-switch is off] You are not using a correct mode(" + SYSFS_AMBIENT_REQUIRED_MODE + ")! Yours: " + this.getMode()); } } - String str = this.getAttribute("value" + Def.PROPERTY_LIGHT_SENSOR_AMBIENT_VALUE_INDEX); + String str = this.getAttribute("value" + SYSFS_AMBIENT_VALUE_INDEX); return Float.parseFloat(str); } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 4ae04e5..1b8db7e 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -7,16 +7,6 @@ */ public class Def { //Partial: Move properties constants to classes - //Light Sensor properties - - public static final String PROPERTY_LIGHT_SENSOR_REFLECTED_REQUIRED_MODE = "REFLECT"; - - public static final int PROPERTY_LIGHT_SENSOR_REFLECTED_VALUE_INDEX = 0; - - public static final String PROPERTY_LIGHT_SENSOR_AMBIENT_REQUIRED_MODE = "AMBIENT"; - - public static final int PROPERTY_LIGHT_SENSOR_AMBIENT_VALUE_INDEX = 0; - //Power supply properties public static final String PROPERTY_MEASURED_CURRENT = "measured_current"; From 7607ef5c1f28184d92cb837202deaaaba2adf12a Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 21:13:27 +0800 Subject: [PATCH 21/75] Partial: Move properties constants to classes (11) --- .../java/org/ev3dev/hardware/PowerSupply.java | 43 ++++++++++++++++--- src/main/java/org/ev3dev/io/Def.java | 14 ------ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/PowerSupply.java b/src/main/java/org/ev3dev/hardware/PowerSupply.java index 6c78e8f..9bd2e39 100644 --- a/src/main/java/org/ev3dev/hardware/PowerSupply.java +++ b/src/main/java/org/ev3dev/hardware/PowerSupply.java @@ -2,7 +2,6 @@ import java.io.IOException; -import org.ev3dev.io.Def; import org.ev3dev.io.Sysfs; /*** @@ -12,6 +11,36 @@ */ public class PowerSupply{ + /** + * The Sysfs class's measured_current property name + */ + public static final String SYSFS_MEASURED_CURRENT = "measured_current"; + + /** + * The Sysfs class's measured_voltage property name + */ + public static final String SYSFS_MEASURED_VOLTAGE = "measured_voltage"; + + /** + * The Sysfs class's max_voltage property name + */ + public static final String SYSFS_MAX_VOLTAGE = "max_voltage"; + + /** + * The Sysfs class's min_voltage property name + */ + public static final String SYSFS_MIN_VOLTAGE = "min_voltage"; + + /** + * The Sysfs class's technology property name + */ + public static final String SYSFS_TECHNOLOGY = "technology"; + + /** + * The Sysfs class's type property name + */ + public static final String SYSFS_TYPE = "type"; + /** * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) */ @@ -23,7 +52,7 @@ public class PowerSupply{ * @throws IOException If I/O goes wrong */ public static int getMeasuredCurrent() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_CURRENT); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MEASURED_CURRENT); return Integer.parseInt(str); } @@ -33,7 +62,7 @@ public static int getMeasuredCurrent() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMeasuredVoltage() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MEASURED_VOLTAGE); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MEASURED_VOLTAGE); return Integer.parseInt(str); } @@ -43,7 +72,7 @@ public static int getMeasuredVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMaxVoltage() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MAX_VOLTAGE); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MAX_VOLTAGE); return Integer.parseInt(str); } @@ -53,7 +82,7 @@ public static int getMaxVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static int getMinVoltage() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_MIN_VOLTAGE); + String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MIN_VOLTAGE); return Integer.parseInt(str); } @@ -63,7 +92,7 @@ public static int getMinVoltage() throws IOException{ * @throws IOException If I/O goes wrong */ public static String getTechnology() throws IOException{ - return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TECHNOLOGY); + return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_TECHNOLOGY); } /*** @@ -72,6 +101,6 @@ public static String getTechnology() throws IOException{ * @throws IOException If I/O goes wrong */ public static String getType() throws IOException{ - return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, Def.PROPERTY_TYPE); + return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_TYPE); } } diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java index 1b8db7e..344da98 100644 --- a/src/main/java/org/ev3dev/io/Def.java +++ b/src/main/java/org/ev3dev/io/Def.java @@ -7,20 +7,6 @@ */ public class Def { //Partial: Move properties constants to classes - //Power supply properties - - public static final String PROPERTY_MEASURED_CURRENT = "measured_current"; - - public static final String PROPERTY_MEASURED_VOLTAGE = "measured_voltage"; - - public static final String PROPERTY_MAX_VOLTAGE = "max_voltage"; - - public static final String PROPERTY_MIN_VOLTAGE = "min_voltage"; - - public static final String PROPERTY_TECHNOLOGY = "technology"; - - public static final String PROPERTY_TYPE = "type"; - //Buttons properties public static final String PROPERTY_EV3_BUTTON_SYSTEM_EVENT_PATH = "/dev/input/by-path/platform-gpio-keys.0-event"; From 557c3be84be56f36186bffd6d716ff09233843cc Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 21:15:56 +0800 Subject: [PATCH 22/75] Final: Move properties constants to classes --- src/main/java/org/ev3dev/hardware/Button.java | 25 +++++++++-------- src/main/java/org/ev3dev/io/Def.java | 28 ------------------- 2 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/org/ev3dev/io/Def.java diff --git a/src/main/java/org/ev3dev/hardware/Button.java b/src/main/java/org/ev3dev/hardware/Button.java index b831f95..38226e3 100644 --- a/src/main/java/org/ev3dev/hardware/Button.java +++ b/src/main/java/org/ev3dev/hardware/Button.java @@ -6,7 +6,6 @@ import java.io.IOException; import org.ev3dev.exception.InvalidButtonException; -import org.ev3dev.io.Def; /*** * Provides a generic button reading mechanism that can be adapted to platform specific implementations. @@ -16,17 +15,19 @@ */ public class Button { - public static final int UP = Def.PROPERTY_EV3_BUTTON_UP; + public static final String SYSTEM_EVENT_PATH = "/dev/input/by-path/platform-gpio-keys.0-event"; - public static final int DOWN = Def.PROPERTY_EV3_BUTTON_DOWN; + public static final int BUTTON_UP = 103; - public static final int LEFT = Def.PROPERTY_EV3_BUTTON_LEFT; + public static final int BUTTON_DOWN = 108; - public static final int RIGHT = Def.PROPERTY_EV3_BUTTON_RIGHT; + public static final int BUTTON_LEFT = 105; - public static final int ENTER = Def.PROPERTY_EV3_BUTTON_ENTER; + public static final int BUTTON_RIGHT = 106; - public static final int BACKSPACE = Def.PROPERTY_EV3_BUTTON_BACKSPACE; + public static final int BUTTON_ENTER = 28; + + public static final int BUTTON_BACKSPACE = 14; private int button; @@ -36,10 +37,10 @@ public class Button { * @throws InvalidButtonException If the specified button isn't a valid button. */ public Button(int button) throws InvalidButtonException{ - if (button != UP && button != DOWN && button != LEFT && - button != RIGHT && button != ENTER && button != ENTER && - button != BACKSPACE){ - throw new InvalidButtonException("The button that you specified does not exist. Better use the integer fields like Button.UP"); + if (button != BUTTON_UP && button != BUTTON_DOWN && button != BUTTON_LEFT && + button != BUTTON_RIGHT && button != BUTTON_ENTER && button != BUTTON_ENTER && + button != BUTTON_BACKSPACE){ + throw new InvalidButtonException("The button that you specified does not exist. Better use the integer fields like Button.BUTTON_UP"); } this.button = button; } @@ -50,7 +51,7 @@ public Button(int button) throws InvalidButtonException{ */ public boolean isPressed(){ try { - DataInputStream in = new DataInputStream(new FileInputStream(Def.PROPERTY_EV3_BUTTON_SYSTEM_EVENT_PATH)); + DataInputStream in = new DataInputStream(new FileInputStream(SYSTEM_EVENT_PATH)); byte[] val = new byte[16]; in.readFully(val); in.close(); diff --git a/src/main/java/org/ev3dev/io/Def.java b/src/main/java/org/ev3dev/io/Def.java deleted file mode 100644 index 344da98..0000000 --- a/src/main/java/org/ev3dev/io/Def.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.ev3dev.io; - -/** - * Application-specified System Defaults - * @author Anthony - * - */ -public class Def { //Partial: Move properties constants to classes - - //Buttons properties - - public static final String PROPERTY_EV3_BUTTON_SYSTEM_EVENT_PATH = "/dev/input/by-path/platform-gpio-keys.0-event"; - - public static final int PROPERTY_EV3_BUTTON_UP = 103; - - public static final int PROPERTY_EV3_BUTTON_DOWN = 108; - - public static final int PROPERTY_EV3_BUTTON_LEFT = 105; - - public static final int PROPERTY_EV3_BUTTON_RIGHT = 106; - - public static final int PROPERTY_EV3_BUTTON_ENTER = 28; - - public static final int PROPERTY_EV3_BUTTON_BACKSPACE = 14; - - //Commands defaults REMOVAL DONE - -} From cf0cf11b0ecb526eb0beb03c2a2a9f670648c140 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 21:31:25 +0800 Subject: [PATCH 23/75] Add driver checking in Linear motors (Actuonix motors) --- .../java/org/ev3dev/hardware/motors/Linear.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/org/ev3dev/hardware/motors/Linear.java b/src/main/java/org/ev3dev/hardware/motors/Linear.java index adbad1a..3c2e27c 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Linear.java +++ b/src/main/java/org/ev3dev/hardware/motors/Linear.java @@ -190,6 +190,16 @@ public class Linear extends Device{ */ public static final String LINEAR_MOTOR_CLASS_NAME_PREFIX = "linear"; + /** + * The driver name for the L12 EV3 100mm by Actuonix + */ + public static final String DRIVER_NAME_100MM = "act-l12-ev3-100"; + + /** + * The driver name for the L12 EV3 100mm by Actuonix + */ + public static final String DRIVER_NAME_50MM = "act-l12-ev3-50"; + //----------------------------------------------------------------------------- private String address; @@ -204,6 +214,10 @@ public class Linear extends Device{ */ public Linear(LegoPort port) throws InvalidPortException, IOException{ super(port, MOTOR_CLASS_NAME, LINEAR_MOTOR_CLASS_NAME_PREFIX); + if (!port.getDriverName().equals(DRIVER_NAME_100MM) && !port.getDriverName().equals(DRIVER_NAME_50MM)){ + throw new InvalidPortException("The port does not connect to a Actuonix L12 EV3 100mm or 50mm linear motor!"); + } + address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output From cc8cd635e414527c3d4e7d58edf2a179bea0fd87 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 22:09:02 +0800 Subject: [PATCH 24/75] Update Javadoc --- src/main/java/org/ev3dev/hardware/motors/Linear.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/ev3dev/hardware/motors/Linear.java b/src/main/java/org/ev3dev/hardware/motors/Linear.java index 3c2e27c..031ccf1 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Linear.java +++ b/src/main/java/org/ev3dev/hardware/motors/Linear.java @@ -207,7 +207,7 @@ public class Linear extends Device{ //----------------------------------------------------------------------------- /*** - * Creates a new motor object. + * Creates a new Linear motor object. * @param port LegoPort * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. * @throws IOException If the LegoPort specified goes wrong From d99bc8998a2dde7bbcceea18ecadf018042cc619 Mon Sep 17 00:00:00 2001 From: mob41 Date: Mon, 5 Sep 2016 23:15:46 +0800 Subject: [PATCH 25/75] Add drivers: Firgelli L12 50/100 Motor --- src/main/java/org/ev3dev/hardware/Device.java | 2 +- .../hardware/motors/FirgelliL12100Motor.java | 81 ++ .../hardware/motors/FirgelliL1250Motor.java | 81 ++ .../org/ev3dev/hardware/motors/Linear.java | 832 ------------------ .../org/ev3dev/hardware/motors/Motor.java | 21 + 5 files changed, 184 insertions(+), 833 deletions(-) create mode 100644 src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java create mode 100644 src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java delete mode 100644 src/main/java/org/ev3dev/hardware/motors/Linear.java diff --git a/src/main/java/org/ev3dev/hardware/Device.java b/src/main/java/org/ev3dev/hardware/Device.java index 3da4a28..ff822a5 100644 --- a/src/main/java/org/ev3dev/hardware/Device.java +++ b/src/main/java/org/ev3dev/hardware/Device.java @@ -44,7 +44,7 @@ public Device(String className){ * Create a new device with a LegoPort, ClassName, classNamePrefix * @param port A LegoPort delared before. * @param className Sysfs class name - * @param classNamePrefix The filename inside the "Sysfs class" (I called it sub-class) + * @param classNamePrefix The filename prefix inside the "Sysfs class" (e.g. motor[n], which "motor" is the prefix) * @throws IOException If I/O goes wrong */ public Device(LegoPort port, String className, String classNamePrefix) throws IOException{ diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java new file mode 100644 index 0000000..e1bd02a --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java @@ -0,0 +1,81 @@ +package org.ev3dev.hardware.motors; + +import java.io.IOException; + +import org.ev3dev.exception.InvalidPortException; +import org.ev3dev.hardware.ports.LegoPort; + +public class FirgelliL12100Motor extends Motor { + + /** + * The Sysfs class's count_per_m property name + */ + public static final String SYSFS_PROPERTY_COUNT_PER_M = "count_per_m"; + + /** + * The Sysfs class's full_travel_count property name + */ + public static final String SYSFS_PROPERTY_FULL_TRAVEL_COUNT = "full_travel_count"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String LINEAR_MOTOR_CLASS_NAME_PREFIX = "linear"; + + /** + * The driver name for the L12 EV3 100mm by Actuonix + */ + public static final String DRIVER_NAME_100MM = "act-l12-ev3-100"; + + public FirgelliL12100Motor(int portField) throws InvalidPortException, IOException { + this(new LegoPort(portField)); + } + + public FirgelliL12100Motor(LegoPort port) throws InvalidPortException, IOException { + super(port, LINEAR_MOTOR_CLASS_NAME_PREFIX); + if (!port.getDriverName().equals(DRIVER_NAME_100MM)){ + throw new InvalidPortException("The port does not connect to a Firgelli L12 100 Motor"); + } + } + + /** + * Do not use this on Firgelli L12 50/100 Motors (Linear motors).
+ * -1 will be returned instead, use getCountPerMetre() + */ + @Override + public int getCountPerRot() throws IOException{ + return -1; + } + + /** + * Returns the number of tacho counts in one meter of travel of the motor. + * Tacho counts are used by the position and speed attributes, so you can + * use this value to convert from distance to tacho counts. (linear motors only) + * @return Counts per metre + * @throws IOException If I/O goes wrong + */ + public int getCountPerMetre() throws IOException{ + if (!this.isConnected()){ + return -1; + } + String countpermetre = this.getAttribute(SYSFS_PROPERTY_COUNT_PER_M); + return Integer.parseInt(countpermetre); + } + + /** + * Returns the number of tacho counts in the full travel of the motor. + * When combined with the count_per_m attribute, you can use this value + * to calculate the maximum travel distance of the motor. + * (linear motors only) + * @return Full Travel Count + * @throws IOException + */ + public int getFullTravelCount() throws IOException{ + if (!this.isConnected()){ + return -1; + } + String str = this.getAttribute(SYSFS_PROPERTY_FULL_TRAVEL_COUNT); + return Integer.parseInt(str); + } + +} diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java new file mode 100644 index 0000000..7a3c359 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java @@ -0,0 +1,81 @@ +package org.ev3dev.hardware.motors; + +import java.io.IOException; + +import org.ev3dev.exception.InvalidPortException; +import org.ev3dev.hardware.ports.LegoPort; + +public class FirgelliL1250Motor extends Motor { + + /** + * The Sysfs class's count_per_m property name + */ + public static final String SYSFS_PROPERTY_COUNT_PER_M = "count_per_m"; + + /** + * The Sysfs class's full_travel_count property name + */ + public static final String SYSFS_PROPERTY_FULL_TRAVEL_COUNT = "full_travel_count"; + + /** + * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) + */ + public static final String LINEAR_MOTOR_CLASS_NAME_PREFIX = "linear"; + + /** + * The driver name for the L12 EV3 50mm by Actuonix + */ + public static final String DRIVER_NAME_50MM = "act-l12-ev3-50"; + + public FirgelliL1250Motor(int portField) throws InvalidPortException, IOException { + this(new LegoPort(portField)); + } + + public FirgelliL1250Motor(LegoPort port) throws InvalidPortException, IOException { + super(port, LINEAR_MOTOR_CLASS_NAME_PREFIX); + if (!port.getDriverName().equals(DRIVER_NAME_50MM)){ + throw new InvalidPortException("The port does not connect to a Firgelli L12 50 Motor"); + } + } + + /** + * Do not use this on Firgelli L12 50/100 Motors (Linear motors).
+ * -1 will be returned instead, use getCountPerMetre() + */ + @Override + public int getCountPerRot() throws IOException{ + return -1; + } + + /** + * Returns the number of tacho counts in one meter of travel of the motor. + * Tacho counts are used by the position and speed attributes, so you can + * use this value to convert from distance to tacho counts. (linear motors only) + * @return Counts per metre + * @throws IOException If I/O goes wrong + */ + public int getCountPerMetre() throws IOException{ + if (!this.isConnected()){ + return -1; + } + String countpermetre = this.getAttribute(SYSFS_PROPERTY_COUNT_PER_M); + return Integer.parseInt(countpermetre); + } + + /** + * Returns the number of tacho counts in the full travel of the motor. + * When combined with the count_per_m attribute, you can use this value + * to calculate the maximum travel distance of the motor. + * (linear motors only) + * @return Full Travel Count + * @throws IOException + */ + public int getFullTravelCount() throws IOException{ + if (!this.isConnected()){ + return -1; + } + String str = this.getAttribute(SYSFS_PROPERTY_FULL_TRAVEL_COUNT); + return Integer.parseInt(str); + } + +} diff --git a/src/main/java/org/ev3dev/hardware/motors/Linear.java b/src/main/java/org/ev3dev/hardware/motors/Linear.java deleted file mode 100644 index 031ccf1..0000000 --- a/src/main/java/org/ev3dev/hardware/motors/Linear.java +++ /dev/null @@ -1,832 +0,0 @@ -//----------------------------------------------------------------------------- -//~autogen autogen-header - -//~autogen -//----------------------------------------------------------------------------- - -package org.ev3dev.hardware.motors; - -//----------------------------------------------------------------------------- - -import java.io.IOException; - -import org.ev3dev.exception.InvalidPortException; -import org.ev3dev.hardware.Device; -import org.ev3dev.hardware.ports.LegoPort; -import org.ev3dev.io.Sysfs; - -//----------------------------------------------------------------------------- - -//~autogen generic-classes classes.motor>currentClass - - -//~autogen - - -/** - * The motor class for Firgelli linear actuators. - * @author Anthony - * - */ -public class Linear extends Device{ - - /** - * The Sysfs class's address property name - */ - public static final String SYSFS_PROPERTY_ADDRESS = "address"; - - /** - * The Sysfs class's command property name - */ - public static final String SYSFS_PROPERTY_COMMAND = "command"; - - /** - * The Sysfs class's commands property name - */ - public static final String SYSFS_PROPERTY_COMMANDS = "commands"; - - /** - * The Sysfs class's driver_name property name - */ - public static final String SYSFS_PROPERTY_DRIVER_NAME = "driver_name"; - - /** - * The Sysfs class's duty_cycle property name - */ - public static final String SYSFS_PROPERTY_DUTY_CYCLE = "duty_cycle"; - - /** - * The Sysfs class's duty_cycle_sp property name - */ - public static final String SYSFS_PROPERTY_DUTY_CYCLE_SP = "duty_cycle_sp"; - - /** - * The Sysfs class's polarity property name - */ - public static final String SYSFS_PROPERTY_POLARITY = "polarity"; - - /** - * The Sysfs class's position property name - */ - public static final String SYSFS_PROPERTY_POSITION = "position"; - - /** - * The Sysfs class's position_p property name - */ - public static final String SYSFS_PROPERTY_POSITION_P = "hold_pid/Kp"; - - /** - * The Sysfs class's position_i property name - */ - public static final String SYSFS_PROPERTY_POSITION_I = "hold_pid/Ki"; - - /** - * The Sysfs class's position_d property name - */ - public static final String SYSFS_PROPERTY_POSITION_D = "hold_pid/Kd"; - - /** - * The Sysfs class's position_sp property name - */ - public static final String SYSFS_PROPERTY_POSITION_SP = "position_sp"; - - /** - * The Sysfs class's speed property name - */ - public static final String SYSFS_PROPERTY_SPEED = "speed"; - - /** - * The Sysfs class's speed_sp property name - */ - public static final String SYSFS_PROPERTY_SPEED_SP = "speed_sp"; - - /** - * The Sysfs class's ramp_up_sp property name - */ - public static final String SYSFS_PROPERTY_RAMP_UP_SP = "ramp_up_sp"; - - /** - * The Sysfs class's ramp_down_sp property name - */ - public static final String SYSFS_PROPERTY_RAMP_DOWN_SP = "ramp_down_sp"; - - /** - * The Sysfs class's state property name - */ - public static final String SYSFS_PROPERTY_STATE = "state"; - - /** - * The Sysfs class's stop_action property name - */ - public static final String SYSFS_PROPERTY_STOP_ACTION = "stop_action"; - - /** - * The Sysfs class's stop_actions property name - */ - public static final String SYSFS_PROPERTY_STOP_ACTIONS = "stop_actions"; - - /** - * The Sysfs class's time_sp property name - */ - public static final String SYSFS_PROPERTY_TIME_SP = "time_sp"; - - /** - * The Sysfs class's max_speed property name - */ - public static final String SYSFS_PROPERTY_MAX_SPEED = "max_speed"; - - /** - * The Sysfs class's count_per_m property name - */ - public static final String SYSFS_PROPERTY_COUNT_PER_M = "count_per_m"; - - /** - * The Sysfs class's full_travel_count property name - */ - public static final String SYSFS_PROPERTY_FULL_TRAVEL_COUNT = "full_travel_count"; - - /** - * The Sysfs class's run-forever command - */ - public static final String SYSFS_COMMAND_RUN_FOREVER = "run-forever"; - - /** - * The Sysfs class's run-to-abs-pos command - */ - public static final String SYSFS_COMMAND_RUN_TO_ABS_POS = "run-to-abs-pos"; - - /** - * The Sysfs class's run-to-rel-pos command - */ - public static final String SYSFS_COMMAND_RUN_TO_REL_POS = "run-to-rel-pos"; - - /** - * The Sysfs class's run-timed command - */ - public static final String SYSFS_COMMAND_RUN_TIMED = "run-timed"; - - /** - * The Sysfs class's run-direct command - */ - public static final String SYSFS_COMMAND_RUN_DIRECT = "run-direct"; - - /** - * The Sysfs class's stop command - */ - public static final String SYSFS_COMMAND_STOP = "stop"; - - /** - * The Sysfs class's reset command - */ - public static final String SYSFS_COMMAND_RESET = "reset"; - - /** - * This Sysfs's class name (e.g. /sys/class/lego-sensor, and lego-sensor is the class name) - */ - public static final String MOTOR_CLASS_NAME = "tacho-motor"; - - /** - * This Sysfs's class name prefix (e.g. /sys/class/lego-sensor/sensor0, and sensor is the class name prefix without the [N] value.) - */ - public static final String LINEAR_MOTOR_CLASS_NAME_PREFIX = "linear"; - - /** - * The driver name for the L12 EV3 100mm by Actuonix - */ - public static final String DRIVER_NAME_100MM = "act-l12-ev3-100"; - - /** - * The driver name for the L12 EV3 100mm by Actuonix - */ - public static final String DRIVER_NAME_50MM = "act-l12-ev3-50"; - -//----------------------------------------------------------------------------- - - private String address; - -//----------------------------------------------------------------------------- - - /*** - * Creates a new Linear motor object. - * @param port LegoPort - * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. - * @throws IOException If the LegoPort specified goes wrong - */ - public Linear(LegoPort port) throws InvalidPortException, IOException{ - super(port, MOTOR_CLASS_NAME, LINEAR_MOTOR_CLASS_NAME_PREFIX); - if (!port.getDriverName().equals(DRIVER_NAME_100MM) && !port.getDriverName().equals(DRIVER_NAME_50MM)){ - throw new InvalidPortException("The port does not connect to a Actuonix L12 EV3 100mm or 50mm linear motor!"); - } - - address = port.getAddress(); - - //Verify is the LegoPort connecting a motor / is a output - if (!address.contains("out")){ - throw new InvalidPortException("The specified port (" + port.getAddress() + ") isn't a output."); - } - } - -//----------------------------------------------------------------------------- - -//~autogen generic-get-set classes.motor>currentClass - /*** - * Get the address of this motor. - * @return LegoPort address described in String - * @throws IOException If the motor doesn't exist or IO ERROR - */ - public String getAddress() throws IOException{ - if (!this.isConnected()){ - return null; - } - return this.getAttribute(SYSFS_PROPERTY_ADDRESS); - } - - /*** - * Generic method to send commands to the motor controller. - * @param command Command that suits for the motor driver - * @throws IOException If I/O goes wrong - */ - public void sendCommand(String command) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_COMMAND, command); - } - - /*** - * Cause the motor to run until another command is sent - * @throws IOException If I/O goes wrong - */ - public void runForever() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_RUN_FOREVER); - } - - /*** - * Run to an absolute position specified by position_sp - * and then stop using the command specified in stop_command - * @throws IOException If I/O goes wrong - */ - public void runToAbsPos() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_RUN_TO_ABS_POS); - } - - /*** - * Run to a position relative to the current position value. - * The new position will be current position + position_sp. - * When the new position is reached, the motor will stop - * using the command specified by stop_command. - * @throws IOException If I/O goes wrong. - */ - public void runToRelPos() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_RUN_TO_REL_POS); - } - - /*** - * Run the motor for the amount of time specified in time_sp - * and then stop the motor using the command specified by - * stop_command - * @throws IOException If I/O goes wrong - */ - public void runTimed() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_RUN_TIMED); - } - - /*** - * Run the motor at the duty cycle specified by duty_cycle_sp. - * Unlike other run commands, changing duty_cycle_sp while - * running will take effect immediately - * @throws IOException If I/O goes wrong - */ - public void runDirect() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_RUN_DIRECT); - } - - /** - * Stop any of the run commands before they are complete using the command specified by stop_command. - * @throws IOException If I/O goes wrong - */ - public void stop() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_STOP); - } - - /** - * Reset all of the motor parameter attributes to their default value. This will also have the effect of stopping the motor. - * @throws IOException If I/O goes wrong - */ - public void reset() throws IOException{ - if (!this.isConnected()){ - return; - } - sendCommand(SYSFS_COMMAND_RESET); - } - - /** - * Returns a list of commands that are supported by the motor controller. - * Possible values are run-forever, run-to-abs-pos, run-to-rel-pos, - * run-timed, run-direct, stop and reset. Not all commands may be supported. - * @return A String Arrays with all the supported commands - * @throws IOException If I/O goes wrong - */ - public String[] getCommands() throws IOException{ - if (!this.isConnected()){ - return null; - } - String str = this.getAttribute(SYSFS_PROPERTY_COMMANDS); - return Sysfs.separateSpace(str); - } - - /** - * Returns the number of tacho counts in one metre of the motor. - * @return Counts per metre - * @throws IOException If I/O goes wrong - */ - public int getCountPerMetre() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String countpermetre = this.getAttribute(SYSFS_PROPERTY_COUNT_PER_M); - return Integer.parseInt(countpermetre); - } - - /** - * Returns the name of the driver that provides this tacho motor device. - * @return The name of the driver - * @throws IOException If I/O goes wrong - */ - public String getDriverName() throws IOException{ - if (!this.isConnected()){ - return null; - } - return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); - } - - - /** - * Returns the current duty cycle of the motor. Units are percent. Values are -100 to 100. - * @return Percentage - * @throws IOException If I/O goes wrong - */ - public int getDutyCycle() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String dutycycle = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE); - return Integer.parseInt(dutycycle); - } - - /** - * Writing sets the duty cycle setpoint. Reading returns the current value. Units are in percent. - * Valid values are -100 to 100. A negative value causes the motor to rotate in reverse. - * This value is only used when speed_regulation is off. - * @return Percentage - * @throws IOException If I/O goes wrong - */ - public int getDutyCycleSP() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String dutycyclesp = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP); - return Integer.parseInt(dutycyclesp); - } - - /** - * Writing sets the duty cycle setpoint. Reading returns the current value. Units are in percent. - * Valid values are -100 to 100. A negative value causes the motor to rotate in reverse. - * This value is only used when speed_regulation is off. - * @param sp Percentage - * @throws IOException If I/O goes wrong - */ - public void setDutyCycleSP(int sp) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); - } - - /** - * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. - * With inversed polarity, a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. - * @return The polarity of the motor - * @throws IOException If I/O goes wrong - */ - public String getPolarity() throws IOException{ - if (!this.isConnected()){ - return null; - } - return this.getAttribute(SYSFS_PROPERTY_POLARITY); - } - - /** - * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. With inversed polarity, - * a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. - * @param polarity The polarity of the motor - * @throws IOException If I/O goes wrong - */ - public void setPolarity(String polarity) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); - } - - /** - * Returns the current position of the motor in pulses of the rotary encoder. When the motor rotates clockwise, the position will increase. Likewise, - * rotating counter-clockwise causes the position to decrease. Writing will set the position to that value. - * @return The current position - * @throws IOException If I/O goes wrong - */ - public int getPosition() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute("position_p"); - return Integer.parseInt(str); - } - - /** - * Returns the current position of the motor in pulses of the rotary encoder. When the motor rotates clockwise, the position will increase. - * Likewise, rotating counter-clockwise causes the position to decrease. Writing will set the position to that value. - * @param position The current position - * @throws IOException If I/O goes wrong - */ - public void setPosition(int position) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_POSITION, Integer.toString(position)); - } - - /** - * The proportional constant for the position PID. - * @return The proportional constant for the position PID. - * @throws IOException If I/O goes wrong - */ - public int getPosition_P() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_POSITION_P); - return Integer.parseInt(str); - } - - /** - * The integral constant for the position PID. - * @return The integral constant for the position PID. - * @throws IOException If I/O goes wrong - */ - public int getPosition_I() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_POSITION_I); - return Integer.parseInt(str); - } - - /** - * The derivative constant for the position PID. - * @return The derivative constant for the position PID. - * @throws IOException If I/O goes wrong - */ - public int getPosition_D() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_POSITION_D); - return Integer.parseInt(str); - } - - /** - * The proportional constant for the position PID. - * @param position_p The proportional constant for the position PID. - * @throws IOException If I/O goes wrong - */ - public void setPosition_P(int position_p) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_POSITION_P, Integer.toString(position_p)); - } - - /** - * The integral constant for the position PID. - * @param position_i The integral constant for the position PID. - * @throws IOException If I/O goes wrong - */ - public void setPosition_I(int position_i) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_POSITION_I, Integer.toString(position_i)); - } - - /** - * The derivative constant for the position PID. - * @param position_d The derivative constant for the position PID. - * @throws IOException If I/O goes wrong - */ - public void setPosition_D(int position_d) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_POSITION_D, Integer.toString(position_d)); - } - - /** - * Writing specifies the target position for the run-to-abs-pos and run-to-rel-pos commands. Reading returns the current value. - * Units are in tacho counts. You can use the value returned by counts_per_rot to convert tacho counts to/from rotations or degrees. - * @return The target position - * @throws IOException if I/O goes wrong - */ - public int getPosition_SP() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_POSITION_SP); - return Integer.parseInt(str); - } - - /** - * Writing specifies the target position for the run-to-abs-pos and run-to-rel-pos commands. Reading returns the current value. - * Units are in tacho counts. You can use the value returned by counts_per_rot to convert tacho counts to/from rotations or degrees. - * @param position_sp The target position - * @throws IOException If I/O goes wrong - */ - public void setPosition_SP(int position_sp) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_POSITION_SP, Integer.toString(position_sp)); - } - - /** - * Returns the current motor speed in tacho counts per second. Note, this is not necessarily degrees - * (although it is for LEGO motors). Use the count_per_rot attribute to convert this value to RPM or deg/sec. - * @return The current speed - * @throws IOException If I/O goes wrong - */ - public int getSpeed() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_SPEED); - return Integer.parseInt(str); - } - - /** - * Writing sets the target speed in tacho counts per second used when speed_regulation is on. - * Reading returns the current value. Use the count_per_rot attribute to convert RPM or deg/sec to tacho counts per second. - * @return The target speed - * @throws IOException If I/O goes wrong - */ - public int getSpeed_SP() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_SPEED); - return Integer.parseInt(str); - } - - /** - * Writing sets the target speed in tacho counts per second used when speed_regulation is on. Reading returns the current value. - * Use the count_per_rot attribute to convert RPM or deg/sec to tacho counts per second. - * @param speed_sp The target speed - * @throws IOException If I/O goes wrong - */ - public void setSpeed_SP(int speed_sp) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_SPEED_SP, Integer.toString(speed_sp)); - } - - /** - * Writing sets the ramp up setpoint. Reading returns the current value. Units are in milliseconds. - * When set to a value bigger than 0, the motor will ramp the power sent to the motor from 0 to 100% duty - * cycle over the span of this setpoint when starting the motor. If the maximum duty cycle is - * limited by duty_cycle_sp or speed regulation, - * the actual ramp time duration will be less than the setpoint. - * @return The ramp-up set-point - * @throws IOException If I/O goes wrong - */ - public int getRamp_Up_SP() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_RAMP_UP_SP); - return Integer.parseInt(str); - } - - /** - * Writing sets the ramp up setpoint. Reading returns the current value. Units are in milliseconds. - * When set to a value bigger than 0, the motor will ramp the power sent to the motor from 0 to 100% duty - * cycle over the span of this setpoint when starting the motor. If the maximum duty cycle is - * limited by duty_cycle_sp or speed regulation, - * the actual ramp time duration will be less than the setpoint. - * @param ramp_up_sp The ramp-up set-point - * @throws IOException If I/O goes wrong - */ - public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); - } - - /** - * Writing sets the ramp down setpoint. Reading returns the current value. Units are in milliseconds. - * When set to a value bigger than 0, the motor will ramp the power sent to the motor from 100% duty cycle down - * to 0 over the span of this setpoint when stopping the motor. If the starting - * duty cycle is less than 100%, the ramp time duration will be less than the full span of the setpoint. - * @return The ramp-down set-point - * @throws IOException If I/O goes wrong - */ - public int getRamp_Down_SP() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP); - return Integer.parseInt(str); - } - - /** - * Writing sets the ramp down setpoint. Reading returns the current value. Units are in milliseconds. - * When set to a value bigger than 0, the motor will ramp the power sent to the motor from 100% duty cycle down - * to 0 over the span of this setpoint when stopping the motor. If the starting - * duty cycle is less than 100%, the ramp time duration will be less than the full span of the setpoint. - * @param ramp_down_sp The ramp-down set-point - * @throws IOException If I/O goes wrong - */ - public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); - } - - /** - * This function returns a string that is likely a "spaced-array".
- * Use this function to directly to return a String array: - * 
-	 * getState()
-	 *
- * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. - * @return A list of state flags. String spaced-array - * @throws IOException If I/O goes wrong - */ - public String getStateViaString() throws IOException{ - if (!this.isConnected()){ - return null; - } - return this.getAttribute(SYSFS_PROPERTY_STATE); - } - - /** - * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. - * @return A list(String array) of state flags. - * @throws IOException If I/O goes wrong - */ - public String[] getState() throws IOException{ - if (!this.isConnected()){ - return null; - } - String str = getStateViaString(); - return Sysfs.separateSpace(str); - } - - /** - * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. - * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. - * @return A stop command that listed using getStopCommands() - * @throws IOException If I/O goes wrong - */ - public String getStopAction() throws IOException{ - if (!this.isConnected()){ - return null; - } - return this.getAttribute(SYSFS_PROPERTY_STOP_ACTION); - } - - /** - * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. - * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. - * @param stop_command A stop command that listed using getStopCommands() - * @throws IOException If I/O goes wrong - */ - public void setStopAction(String stop_action) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_STOP_ACTION, stop_action); - } - - /** - * This function returns a string that is likely a "spaced-array".
- * Use this function to directly to return a String array: - * 
-	 * getStopCommands()
-	 *
- * Returns a list of stop modes supported by the motor controller. Possible values are coast, - * brake and hold. coast means that power will be removed from the motor and it will freely - * coast to a stop. brake means that power will be removed from the motor and a passive - * electrical load will be placed on the motor. This is usually done by shorting the motor - * terminals together. This load will absorb the energy from the rotation of the motors - * and cause the motor to stop more quickly than coasting. hold does not remove power from - * the motor. Instead it actively try to hold the motor at the current position. - * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. - * @return A list of stop modes supported by the motor controller - * @throws IOException If I/O goes wrong - */ - public String getStopCommandsViaString() throws IOException{ - if (!this.isConnected()){ - return null; - } - return this.getAttribute(SYSFS_PROPERTY_STOP_ACTIONS); - } - - /** - * Returns a list of stop modes supported by the motor controller. Possible values are coast, - * brake and hold. coast means that power will be removed from the motor and it will freely - * coast to a stop. brake means that power will be removed from the motor and a passive - * electrical load will be placed on the motor. This is usually done by shorting the motor - * terminals together. This load will absorb the energy from the rotation of the motors - * and cause the motor to stop more quickly than coasting. hold does not remove power from - * the motor. Instead it actively try to hold the motor at the current position. - * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. - * @return A list of stop modes supported by the motor controller - * @throws IOException If I/O goes wrong - */ - public String[] getStopCommands() throws IOException{ - if (!this.isConnected()){ - return null; - } - String str = getStopCommandsViaString(); - return Sysfs.separateSpace(str); - } - - /** - * Writing specifies the amount of time the motor will run when using the run-timed command. Reading returns the current value. Units are in milliseconds. - * @return Amount of time in ms - * @throws IOException If I/O goes wrong - */ - public int getTime_SP() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_TIME_SP); - return Integer.parseInt(str); - } - - /** - * Writing specifies the amount of time the motor will run when using the run-timed command. Reading returns the current value. Units are in milliseconds. - * @param time_sp Amount of time in ms - * @throws IOException If I/O goes wrong - */ - public void setTime_SP(int time_sp) throws IOException{ - if (!this.isConnected()){ - return; - } - this.setAttribute(SYSFS_PROPERTY_TIME_SP, Integer.toString(time_sp)); - } - - /** - * This returns the maximum speed of the motor with no load at 9V. - * @return The maximum speed - * @throws IOException If I/O goes wrong - */ - public int getMax_Speed() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_MAX_SPEED); - return Integer.parseInt(str); - } - - public int getFullTravelCount() throws IOException{ - if (!this.isConnected()){ - return -1; - } - String str = this.getAttribute(SYSFS_PROPERTY_FULL_TRAVEL_COUNT); - return Integer.parseInt(str); - } - -//~autogen -} -//----------------------------------------------------------------------------- \ No newline at end of file diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index 8ee722a..41485e7 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -187,6 +187,16 @@ public class Motor extends Device{ //----------------------------------------------------------------------------- + /*** + * Creates a new motor object. + * @param portField a LegoPort field (e.g. LegoPort.INPUT_1) + * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. + * @throws IOException If the LegoPort specified goes wrong + */ + public Motor(int portField) throws InvalidPortException, IOException{ + this(new LegoPort(portField)); + } + /*** * Creates a new motor object. * @param port LegoPort @@ -194,6 +204,17 @@ public class Motor extends Device{ * @throws IOException If the LegoPort specified goes wrong */ public Motor(LegoPort port) throws InvalidPortException, IOException{ + this(port, CLASS_NAME_PREFIX); + } + + /*** + * Creates a new motor object. + * @param port LegoPort + * @param class_name_prefix Specify a class name prefix (e.g. motor[N], which "motor" is the prefix) + * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. + * @throws IOException If the LegoPort specified goes wrong + */ + public Motor(LegoPort port, String class_name_prefix) throws InvalidPortException, IOException{ super(port, CLASS_NAME, CLASS_NAME_PREFIX); address = port.getAddress(); From 691c387c68b8715149bde4b17b3983419d30433c Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 19:26:50 +0800 Subject: [PATCH 26/75] Some fixes --- .classpath | 2 +- .settings/org.eclipse.jdt.core.prefs | 6 +++--- .../ev3dev/hardware/sensors/ColorSensor.java | 20 +++++++++---------- src/main/java/org/ev3dev/io/Sysfs.java | 7 ++----- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.classpath b/.classpath index f284b13..2491ec3 100644 --- a/.classpath +++ b/.classpath @@ -22,7 +22,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 1ab2bb5..c788ee3 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java index c613ba8..0eaf85b 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java @@ -17,52 +17,52 @@ public class ColorSensor extends Sensor { /** * Reflected Light Intensity required Sysfs mode */ - private static final String SYSFS_REFLECTED_LIGHT_INTENSITY_MODE = "COL-REFLECT"; + public static final String SYSFS_REFLECTED_LIGHT_INTENSITY_MODE = "COL-REFLECT"; /** * Reflected Light Intensity Sysfs value index */ - private static final int SYSFS_REFLECTED_LIGHT_INTENSITY_VALUE_INDEX = 0; + public static final int SYSFS_REFLECTED_LIGHT_INTENSITY_VALUE_INDEX = 0; /** * Ambient Light Intensity required Sysfs mode */ - private static final String SYSFS_AMBIENT_LIGHT_INTENSITY_MODE = "COL-AMBIENT"; + public static final String SYSFS_AMBIENT_LIGHT_INTENSITY_MODE = "COL-AMBIENT"; /** * Ambient Light Intensity Sysfs value index */ - private static final int SYSFS_AMBIENT_LIGHT_INTENSITY_VALUE_INDEX = 0; + public static final int SYSFS_AMBIENT_LIGHT_INTENSITY_VALUE_INDEX = 0; /** * Color required Sysfs mode */ - private static final String SYSFS_COLOR_MODE = "COL-COLOR"; + public static final String SYSFS_COLOR_MODE = "COL-COLOR"; /** * Color Sysfs value index */ - private static final int SYSFS_COLOR_VALUE_INDEX = 0; + public static final int SYSFS_COLOR_VALUE_INDEX = 0; /** * RGB required Sysfs mode */ - private static final String SYSFS_RGB_MODE = "RGB-RAW"; + public static final String SYSFS_RGB_MODE = "RGB-RAW"; /** * RGB Red Sysfs value index */ - private static final int SYSFS_RGB_R_VALUE_INDEX = 0; + public static final int SYSFS_RGB_R_VALUE_INDEX = 0; /** * RGB Green Sysfs value index */ - private static final int SYSFS_RGB_G_VALUE_INDEX = 1; + public static final int SYSFS_RGB_G_VALUE_INDEX = 1; /** * RGB Blue Sysfs value index */ - private static final int SYSFS_RGB_B_VALUE_INDEX = 2; + public static final int SYSFS_RGB_B_VALUE_INDEX = 2; /** * This device's default driver name diff --git a/src/main/java/org/ev3dev/io/Sysfs.java b/src/main/java/org/ev3dev/io/Sysfs.java index 060905a..a836635 100644 --- a/src/main/java/org/ev3dev/io/Sysfs.java +++ b/src/main/java/org/ev3dev/io/Sysfs.java @@ -18,9 +18,9 @@ public class Sysfs { /** - * The Sysfs class path (/sys/class) + * The Sysfs class path (/sys/class/) */ - public static final String SYSTEM_CLASS_PATH = "/sys/class"; + public static final String SYSTEM_CLASS_PATH = "/sys/class/"; /** * Get all sub-class files @@ -105,9 +105,6 @@ public static void setAttribute(String class_name, String subclass, String prope */ public static void setAttribute(String class_name, String property, String new_value) throws FileNotFoundException, IOException{ PrintWriter out = new PrintWriter(SYSTEM_CLASS_PATH + class_name + "/" + property); - class_name = class_name.toLowerCase(); - property = property.toLowerCase(); - new_value = new_value.toLowerCase(); out.write(new_value); out.flush(); out.close(); From 37521ab9cc9bad892b3a18fc2d9671b57ecdf024 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 20:35:46 +0800 Subject: [PATCH 27/75] Minor fixes --- src/main/java/org/ev3dev/hardware/Device.java | 19 +++++++++++++++---- src/main/java/org/ev3dev/hardware/LED.java | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/Device.java b/src/main/java/org/ev3dev/hardware/Device.java index ff822a5..84ff801 100644 --- a/src/main/java/org/ev3dev/hardware/Device.java +++ b/src/main/java/org/ev3dev/hardware/Device.java @@ -61,11 +61,14 @@ public Device(LegoPort port, String className, String classNamePrefix) throws IO connected = checkIsConnected(); if (!connected){ System.out.println(className + "-" + this.hashCode() + ": No port connected. Searching until port \"" + address + "\" connected..."); + + while (!connected){ + connected = checkIsConnected(); + } + + System.out.println(className + "-" + this.hashCode() + ": Connected to " + address); } - while (!connected){ - connected = checkIsConnected(); - } - System.out.println(className + "-" + this.hashCode() + ": Connected to " + address); + } public abstract String getAddress() throws IOException; @@ -80,6 +83,14 @@ public void setClassName(String className){ this.className = className; } + /** + * Set the Sysfs class full name (including prefix if any) + * @param className The Sysfs class name located in /sys/class/[className] + */ + public void setClassFullname(String classFullName){ + this.classFullName = classFullName; + } + /** * Set the filename prefix inside the Sysfs class (prefix (e.g. motor)) of this Device * @param classNamePrefix The filename inside the Sysfs class (e.g. "/sys/class/motor/motor0" motor is a prefix) diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index fc20dc1..43d4dfd 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -83,7 +83,7 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ String direction = leftRightField == 0 ? "left" : "right"; String color = colorField == 0 ? "green" : "red"; - this.setClassName("ev3:" + direction + ":" + color + ":ev3dev"); + this.setClassFullname("ev3:" + direction + ":" + color + ":ev3dev"); } /** From 1f5dcdeab46eace30e383a7a2660cfb71f0213f5 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 20:39:23 +0800 Subject: [PATCH 28/75] Firgelli L12 50/100 Motor update exception message --- .../java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java | 2 +- .../java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java index e1bd02a..516a534 100644 --- a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java @@ -34,7 +34,7 @@ public FirgelliL12100Motor(int portField) throws InvalidPortException, IOExcepti public FirgelliL12100Motor(LegoPort port) throws InvalidPortException, IOException { super(port, LINEAR_MOTOR_CLASS_NAME_PREFIX); if (!port.getDriverName().equals(DRIVER_NAME_100MM)){ - throw new InvalidPortException("The port does not connect to a Firgelli L12 100 Motor"); + throw new InvalidPortException("The port does not have a Firgelli L12 100 Motor."); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java index 7a3c359..be8a39c 100644 --- a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java @@ -34,7 +34,7 @@ public FirgelliL1250Motor(int portField) throws InvalidPortException, IOExceptio public FirgelliL1250Motor(LegoPort port) throws InvalidPortException, IOException { super(port, LINEAR_MOTOR_CLASS_NAME_PREFIX); if (!port.getDriverName().equals(DRIVER_NAME_50MM)){ - throw new InvalidPortException("The port does not connect to a Firgelli L12 50 Motor"); + throw new InvalidPortException("The port does not have a Firgelli L12 50 Motor driver."); } } From db23ddc33aa31f94b8cdfce47c26cad510d2f241 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 20:43:39 +0800 Subject: [PATCH 29/75] Add drivers: Lego NXT Motor, update exception message --- .../ev3dev/hardware/motors/LargeMotor.java | 6 +++- .../ev3dev/hardware/motors/MediumMotor.java | 6 +++- .../org/ev3dev/hardware/motors/NXTMotor.java | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/ev3dev/hardware/motors/NXTMotor.java diff --git a/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java b/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java index c0215ff..1cc063c 100644 --- a/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/LargeMotor.java @@ -13,11 +13,15 @@ public class LargeMotor extends Motor { */ public static final String DRIVER_NAME = "lego-ev3-l-motor"; + public LargeMotor(int portField) throws InvalidPortException, IOException { + this(new LegoPort(portField)); + } + public LargeMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException { super(port); String drivername = this.getDriverName(); if (!drivername.equals(DRIVER_NAME)){ - throw new InvalidMotorException("It is not a LargeMotor (" + DRIVER_NAME + "): " + drivername); + throw new InvalidMotorException("The port is not connected to a LargeMotor (" + DRIVER_NAME + "): " + drivername); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java b/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java index 034f15e..1674c6f 100644 --- a/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/MediumMotor.java @@ -12,12 +12,16 @@ public class MediumMotor extends Motor { * This device's default driver name */ public static final String DRIVER_NAME = "lego-ev3-m-motor"; + + public MediumMotor(int portField) throws InvalidPortException, IOException { + this(new LegoPort(portField)); + } public MediumMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException { super(port); String drivername = this.getDriverName(); if (!drivername.equals(DRIVER_NAME)){ - throw new InvalidMotorException("It is not a MediumMotor (" + DRIVER_NAME + "): " + drivername); + throw new InvalidMotorException("The port is not connected to a LargeMotor (" + DRIVER_NAME + "): " + drivername); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/NXTMotor.java b/src/main/java/org/ev3dev/hardware/motors/NXTMotor.java new file mode 100644 index 0000000..499e8b8 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/motors/NXTMotor.java @@ -0,0 +1,28 @@ +package org.ev3dev.hardware.motors; + +import java.io.IOException; + +import org.ev3dev.exception.InvalidMotorException; +import org.ev3dev.exception.InvalidPortException; +import org.ev3dev.hardware.ports.LegoPort; + +public class NXTMotor extends Motor { + + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "lego-nxt-motor"; + + public NXTMotor(int portField) throws InvalidPortException, IOException { + this(new LegoPort(portField)); + } + + public NXTMotor(LegoPort port) throws InvalidPortException, IOException { + super(port); + String drivername = port.getDriverName(); + if (!drivername.equals(DRIVER_NAME)){ + throw new InvalidMotorException("The port is not connected to a Lego NXT Motor (" + DRIVER_NAME + "): " + drivername); + } + } + +} From b3b8dbc84f33c88e8f655aaf10683cb0bbb5fc28 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:14:44 +0800 Subject: [PATCH 30/75] Improve exception structure --- src/main/java/org/ev3dev/hardware/Device.java | 29 ++- src/main/java/org/ev3dev/hardware/LED.java | 50 ++--- .../java/org/ev3dev/hardware/PowerSupply.java | 66 +++++-- .../org/ev3dev/hardware/motors/DCMotor.java | 110 +++++------ .../hardware/motors/FirgelliL12100Motor.java | 17 +- .../hardware/motors/FirgelliL1250Motor.java | 17 +- .../org/ev3dev/hardware/motors/Motor.java | 186 +++++++++--------- .../ev3dev/hardware/motors/ServoMotor.java | 79 ++++---- .../org/ev3dev/hardware/ports/LegoPort.java | 86 +++++--- .../ev3dev/hardware/sensors/ColorSensor.java | 31 ++- .../ev3dev/hardware/sensors/GyroSensor.java | 15 +- .../ev3dev/hardware/sensors/I2CSensor.java | 19 +- .../hardware/sensors/InfraredSensor.java | 11 +- .../ev3dev/hardware/sensors/LightSensor.java | 15 +- .../org/ev3dev/hardware/sensors/Sensor.java | 55 +++--- .../ev3dev/hardware/sensors/SoundSensor.java | 15 +- .../ev3dev/hardware/sensors/TouchSensor.java | 11 +- .../hardware/sensors/UltrasonicSensor.java | 19 +- 18 files changed, 436 insertions(+), 395 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/Device.java b/src/main/java/org/ev3dev/hardware/Device.java index 84ff801..8e36a68 100644 --- a/src/main/java/org/ev3dev/hardware/Device.java +++ b/src/main/java/org/ev3dev/hardware/Device.java @@ -2,6 +2,8 @@ import java.io.IOException; +import org.ev3dev.exception.EV3LibraryException; + import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.io.Sysfs; @@ -45,18 +47,14 @@ public Device(String className){ * @param port A LegoPort delared before. * @param className Sysfs class name * @param classNamePrefix The filename prefix inside the "Sysfs class" (e.g. motor[n], which "motor" is the prefix) - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public Device(LegoPort port, String className, String classNamePrefix) throws IOException{ + public Device(LegoPort port, String className, String classNamePrefix) throws EV3LibraryException{ this.port = port; this.className = className; this.classNamePrefix = classNamePrefix; - try { - address = port.getAddress(); - } catch (IOException e){ - System.err.println(className + "-" + this.hashCode() + ": The lego-port system class wasn't found."); - throw new IOException("Cannot access to the target address. Are you using a EV3?", e); - } + + address = port.getAddress(); connected = checkIsConnected(); if (!connected){ @@ -71,9 +69,9 @@ public Device(LegoPort port, String className, String classNamePrefix) throws IO } - public abstract String getAddress() throws IOException; + public abstract String getAddress() throws EV3LibraryException; - public abstract String getDriverName() throws IOException; + public abstract String getDriverName() throws EV3LibraryException; /** * Set the Sysfs class name (location) of this Device @@ -136,15 +134,14 @@ public String getClassFullName(){ * @param property The property name * @return The value of the property */ - public final String getAttribute(String property){ + public final String getAttribute(String property) throws EV3LibraryException{ try { String str = Sysfs.getAttribute(className, classFullName, property); connected = true; return str; } catch (IOException e){ - e.printStackTrace(); connected = false; - return null; + throw new EV3LibraryException("Get device attribute failed: " + property, e); } } @@ -152,17 +149,15 @@ public final String getAttribute(String property){ * Writes the property specified. * @param property The property name * @param new_value The new value of the property - * @return Boolean whether the attribute was successfully written */ - public final boolean setAttribute(String property, String new_value){ + public final void setAttribute(String property, String new_value) throws EV3LibraryException{ try { Sysfs.setAttribute(className, classFullName, property, new_value); connected = true; } catch (IOException e){ - e.printStackTrace(); connected = false; + throw new EV3LibraryException("Set device attribute failed: " + property, e); } - return connected; } private boolean checkIsConnected(){ diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index 43d4dfd..761e25f 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -1,8 +1,8 @@ package org.ev3dev.hardware; import java.io.File; -import java.io.IOException; +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidLEDException; import org.ev3dev.io.Sysfs; @@ -108,9 +108,9 @@ public LED(String ledName) throws InvalidLEDException{ /** * Returns the maximum allowable brightness value. * @return The maximum allowable brightness value. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getMaxBrightness() throws IOException{ + public int getMaxBrightness() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_MAX_BRIGHTNESS); return Integer.parseInt(str); } @@ -118,9 +118,9 @@ public int getMaxBrightness() throws IOException{ /** * Gets the brightness level. Possible values are from 0 to max_brightness. * @return The brightness level - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getBrightness() throws IOException{ + public int getBrightness() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_BRIGHTNESS); return Integer.parseInt(str); } @@ -128,9 +128,9 @@ public int getBrightness() throws IOException{ /** * Sets the brightness level. Possible values are from 0 to max_brightness. * @param brightness The brightness level - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setBrightness(int brightness) throws IOException{ + public void setBrightness(int brightness) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_BRIGHTNESS, Integer.toString(brightness)); } @@ -142,18 +142,18 @@ public void setBrightness(int brightness) throws IOException{ * * Returns a list of available triggers. * @return A spaced-array String - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getTriggersViaString() throws IOException{ + public String getTriggersViaString() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_TRIGGER); } /** * Returns a list of available triggers. * @return A String Array with a list of available triggers - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getTriggers() throws IOException{ + public String[] getTriggers() throws EV3LibraryException{ String str = getTriggersViaString(); return Sysfs.separateSpace(str); } @@ -169,9 +169,9 @@ public String[] getTriggers() throws IOException{ * change the brightness value of a LED independently of the timer trigger. However, if you set the brightness value * to 0 it will also disable the timer trigger. * @return The LED trigger - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getTrigger() throws IOException{ + public String getTrigger() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_TRIGGER); } @@ -186,9 +186,9 @@ public String getTrigger() throws IOException{ * change the brightness value of a LED independently of the timer trigger. However, if you set the brightness value * to 0 it will also disable the timer trigger. * @param selector The LED trigger that listed using getTriggers() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setTrigger(String selector) throws IOException{ + public void setTrigger(String selector) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_TRIGGER, selector); } @@ -196,9 +196,9 @@ public void setTrigger(String selector) throws IOException{ * The timer trigger will periodically change the LED brightness between 0 and the current brightness setting. * The on time can be specified via delay_on attribute in milliseconds. * @return The Delay_On Value in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDelay_On() throws IOException{ + public int getDelay_On() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_DELAY_ON); return Integer.parseInt(str); } @@ -207,9 +207,9 @@ public int getDelay_On() throws IOException{ * The timer trigger will periodically change the LED brightness between 0 and the current brightness setting. * The off time can be specified via delay_off attribute in milliseconds. * @return The Delay_Off Value in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDelay_Off() throws IOException{ + public int getDelay_Off() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_DELAY_OFF); return Integer.parseInt(str); } @@ -218,9 +218,9 @@ public int getDelay_Off() throws IOException{ * The timer trigger will periodically change the LED brightness between 0 and the current brightness setting. * The on time can be specified via delay_on attribute in milliseconds. * @param delay_on The Delay_On Value in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setDelay_On(int delay_on) throws IOException{ + public void setDelay_On(int delay_on) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_DELAY_ON, Integer.toString(delay_on)); } @@ -228,19 +228,19 @@ public void setDelay_On(int delay_on) throws IOException{ * The timer trigger will periodically change the LED brightness between 0 and the current brightness setting. * The off time can be specified via delay_off attribute in milliseconds. * @param delay_off The Delay_Off Value in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setDelay_Off(int delay_off) throws IOException{ + public void setDelay_Off(int delay_off) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_DELAY_OFF, Integer.toString(delay_off)); } @Override - public String getAddress() throws IOException { + public String getAddress() throws EV3LibraryException { return null; } @Override - public String getDriverName() throws IOException { + public String getDriverName() throws EV3LibraryException { return null; } } \ No newline at end of file diff --git a/src/main/java/org/ev3dev/hardware/PowerSupply.java b/src/main/java/org/ev3dev/hardware/PowerSupply.java index 9bd2e39..53c6949 100644 --- a/src/main/java/org/ev3dev/hardware/PowerSupply.java +++ b/src/main/java/org/ev3dev/hardware/PowerSupply.java @@ -1,7 +1,9 @@ package org.ev3dev.hardware; +import java.io.FileNotFoundException; import java.io.IOException; +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.io.Sysfs; /*** @@ -49,58 +51,86 @@ public class PowerSupply{ /*** * The measured current that the battery is supplying (in microamps) * @return Measured Current - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public static int getMeasuredCurrent() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MEASURED_CURRENT); + public static int getMeasuredCurrent() throws EV3LibraryException{ + String str; + try { + str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MEASURED_CURRENT); + } catch (IOException e) { + throw new EV3LibraryException("Get measured current attribute failed", e); + } return Integer.parseInt(str); } /*** * The measured voltage that the battery is supplying (in microvolts) * @return Measured Voltage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public static int getMeasuredVoltage() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MEASURED_VOLTAGE); + public static int getMeasuredVoltage() throws EV3LibraryException{ + String str; + try { + str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MEASURED_VOLTAGE); + } catch (IOException e) { + throw new EV3LibraryException("Get measured voltage attribute failed", e); + } return Integer.parseInt(str); } /*** * Get the maximum voltage * @return Maximum Voltage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public static int getMaxVoltage() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MAX_VOLTAGE); + public static int getMaxVoltage() throws EV3LibraryException{ + String str; + try { + str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MAX_VOLTAGE); + } catch (IOException e) { + throw new EV3LibraryException("Get max voltage attribute failed", e); + } return Integer.parseInt(str); } /*** * Get the minimum voltage * @return Minimum Voltage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public static int getMinVoltage() throws IOException{ - String str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MIN_VOLTAGE); + public static int getMinVoltage() throws EV3LibraryException{ + String str; + try { + str = Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_MIN_VOLTAGE); + } catch (IOException e) { + throw new EV3LibraryException("Get min voltage attribute failed", e); + } return Integer.parseInt(str); } /*** * Get the technology of this power supply * @return String - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public static String getTechnology() throws IOException{ - return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_TECHNOLOGY); + public static String getTechnology() throws EV3LibraryException{ + try { + return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_TECHNOLOGY); + } catch (IOException e) { + throw new EV3LibraryException("Get technology attribute failed", e); + } } /*** * Get the type of this power supply * @return String - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public static String getType() throws IOException{ - return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_TYPE); + public static String getType() throws EV3LibraryException{ + try { + return Sysfs.getAttribute(POWER_SUPPLY_CLASS_NAME, SYSFS_TYPE); + } catch (IOException e) { + throw new EV3LibraryException("Get type attribute failed", e); + } } } diff --git a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java index 9a4b3d3..1ed14b5 100644 --- a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.motors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidMotorException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; @@ -116,12 +115,11 @@ public class DCMotor extends Device{ /*** * Creates a new DC motor object. * @param port LegoPort - * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid. - * @throws IOException If the LegoPort specified goes wrong - * @throws InvalidMotorException If the specified port wasn't exist a ServoMotor + * @throws EV3LibraryException If the LegoPort specified goes wrong */ - public DCMotor(LegoPort port) throws InvalidPortException, IOException, InvalidMotorException{ + public DCMotor(LegoPort port) throws EV3LibraryException{ super(port, CLASS_NAME, CLASS_NAME_PREFIX); + address = port.getAddress(); //Verify is the LegoPort connecting a motor / is a output @@ -135,26 +133,26 @@ public DCMotor(LegoPort port) throws InvalidPortException, IOException, InvalidM /*** * Get the address of this motor. * @return LegoPort address described in String - * @throws IOException If the motor doesn't exist or IO ERROR + * @throws EV3LibraryException If the motor doesn't exist or IO ERROR */ - public String getAddress() throws IOException{ + public String getAddress() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** * Generic method to send commands to the motor controller. * @param command Command that suits for the motor driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void sendCommand(String command) throws IOException{ + public void sendCommand(String command) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /*** * Cause the motor to run until another command is sent - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runForever() throws IOException{ + public void runForever() throws EV3LibraryException{ sendCommand(SYSFS_COMMAND_RUN_FOREVER); } @@ -162,9 +160,9 @@ public void runForever() throws IOException{ * Run the motor for the amount of time specified in time_sp * and then stop the motor using the command specified by * stop_command - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runTimed() throws IOException{ + public void runTimed() throws EV3LibraryException{ sendCommand(SYSFS_COMMAND_RUN_TIMED); } @@ -172,17 +170,17 @@ public void runTimed() throws IOException{ * Runs the motor at the duty cycle specified by duty_cycle_sp. * Unlike other run commands, changing duty_cycle_sp while running * will take effect immediately. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runDirect() throws IOException{ + public void runDirect() throws EV3LibraryException{ sendCommand(SYSFS_COMMAND_RUN_DIRECT); } /** * Stop any of the run commands before they are complete using the command specified by stop_command. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void stop() throws IOException{ + public void stop() throws EV3LibraryException{ sendCommand(SYSFS_COMMAND_STOP); } @@ -191,9 +189,9 @@ public void stop() throws IOException{ * Possible values are run-forever, run-to-abs-pos, run-to-rel-pos, * run-timed, run-direct, stop and reset. Not all commands may be supported. * @return A String Arrays with all the supported commands - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getCommands() throws IOException{ + public String[] getCommands() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_COMMANDS); return Sysfs.separateSpace(str); } @@ -201,18 +199,18 @@ public String[] getCommands() throws IOException{ /** * Returns the name of the driver that provides this tacho motor device. * @return The name of the driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getDriverName() throws IOException{ + public String getDriverName() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } /** * Returns the current duty cycle of the motor. Units are percent. Values are -100 to 100. * @return Percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDutyCycle() throws IOException{ + public int getDutyCycle() throws EV3LibraryException{ String dutycycle = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE); return Integer.parseInt(dutycycle); } @@ -222,9 +220,9 @@ public int getDutyCycle() throws IOException{ * Valid values are -100 to 100. A negative value causes the motor to rotate in reverse. * This value is only used when speed_regulation is off. * @return Percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDutyCycleSP() throws IOException{ + public int getDutyCycleSP() throws EV3LibraryException{ String dutycyclesp = this.getAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP); return Integer.parseInt(dutycyclesp); } @@ -234,9 +232,9 @@ public int getDutyCycleSP() throws IOException{ * Valid values are -100 to 100. A negative value causes the motor to rotate in reverse. * This value is only used when speed_regulation is off. * @param sp Percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setDutyCycleSP(int sp) throws IOException{ + public void setDutyCycleSP(int sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_DUTY_CYCLE_SP, Integer.toString(sp)); } @@ -244,9 +242,9 @@ public void setDutyCycleSP(int sp) throws IOException{ * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. * With inversed polarity, a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. * @return The polarity of the motor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getPolarity() throws IOException{ + public String getPolarity() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_POLARITY); } @@ -254,9 +252,9 @@ public String getPolarity() throws IOException{ * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. With inversed polarity, * a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. * @param polarity The polarity of the motor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPolarity(String polarity) throws IOException{ + public void setPolarity(String polarity) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); } @@ -267,9 +265,9 @@ public void setPolarity(String polarity) throws IOException{ * limited by duty_cycle_sp or speed regulation, * the actual ramp time duration will be less than the setpoint. * @return The ramp-up set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getRamp_Up_SP() throws IOException{ + public int getRamp_Up_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_RAMP_UP_SP); return Integer.parseInt(str); } @@ -281,9 +279,9 @@ public int getRamp_Up_SP() throws IOException{ * limited by duty_cycle_sp or speed regulation, * the actual ramp time duration will be less than the setpoint. * @param ramp_up_sp The ramp-up set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ + public void setRamp_Up_SP(int ramp_up_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_RAMP_UP_SP, Integer.toString(ramp_up_sp)); } @@ -293,9 +291,9 @@ public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ * to 0 over the span of this setpoint when stopping the motor. If the starting * duty cycle is less than 100%, the ramp time duration will be less than the full span of the setpoint. * @return The ramp-down set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getRamp_Down_SP() throws IOException{ + public int getRamp_Down_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP); return Integer.parseInt(str); } @@ -306,9 +304,9 @@ public int getRamp_Down_SP() throws IOException{ * to 0 over the span of this setpoint when stopping the motor. If the starting * duty cycle is less than 100%, the ramp time duration will be less than the full span of the setpoint. * @param ramp_down_sp The ramp-down set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ + public void setRamp_Down_SP(int ramp_down_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_RAMP_DOWN_SP, Integer.toString(ramp_down_sp)); } @@ -320,18 +318,18 @@ public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ * * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. * @return A list of state flags. String spaced-array - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStateViaString() throws IOException{ + public String getStateViaString() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_STATE); } /** * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. * @return A list(String array) of state flags. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getState() throws IOException{ + public String[] getState() throws EV3LibraryException{ String str = getStateViaString(); return Sysfs.separateSpace(str); } @@ -340,9 +338,9 @@ public String[] getState() throws IOException{ * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. * @return A stop command that listed using getStopActions() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStopAction() throws IOException{ + public String getStopAction() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_STOP_ACTION); } @@ -350,9 +348,9 @@ public String getStopAction() throws IOException{ * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. * @param stop_command A stop command that listed using getStopCommands() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setStopAction(String stop_command) throws IOException{ + public void setStopAction(String stop_command) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_STOP_ACTION, stop_command); } @@ -371,9 +369,9 @@ public void setStopAction(String stop_command) throws IOException{ * the motor. Instead it actively try to hold the motor at the current position. * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. * @return A list of stop modes supported by the motor controller - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStopActionsViaString() throws IOException{ + public String getStopActionsViaString() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_STOP_ACTIONS); } @@ -387,9 +385,9 @@ public String getStopActionsViaString() throws IOException{ * the motor. Instead it actively try to hold the motor at the current position. * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. * @return A list of stop modes supported by the motor controller - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getStopActions() throws IOException{ + public String[] getStopActions() throws EV3LibraryException{ String str = getStopActionsViaString(); return Sysfs.separateSpace(str); } @@ -397,9 +395,9 @@ public String[] getStopActions() throws IOException{ /** * Writing specifies the amount of time the motor will run when using the run-timed command. Reading returns the current value. Units are in milliseconds. * @return Amount of time in ms - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getTime_SP() throws IOException{ + public int getTime_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_TIME_SP); return Integer.parseInt(str); } @@ -407,9 +405,9 @@ public int getTime_SP() throws IOException{ /** * Writing specifies the amount of time the motor will run when using the run-timed command. Reading returns the current value. Units are in milliseconds. * @param time_sp Amount of time in ms - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setTime_SP(int time_sp) throws IOException{ + public void setTime_SP(int time_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_TIME_SP, Integer.toString(time_sp)); } } diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java index 516a534..0b1455a 100644 --- a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.motors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.ports.LegoPort; @@ -27,11 +26,11 @@ public class FirgelliL12100Motor extends Motor { */ public static final String DRIVER_NAME_100MM = "act-l12-ev3-100"; - public FirgelliL12100Motor(int portField) throws InvalidPortException, IOException { + public FirgelliL12100Motor(int portField) throws EV3LibraryException { this(new LegoPort(portField)); } - public FirgelliL12100Motor(LegoPort port) throws InvalidPortException, IOException { + public FirgelliL12100Motor(LegoPort port) throws EV3LibraryException { super(port, LINEAR_MOTOR_CLASS_NAME_PREFIX); if (!port.getDriverName().equals(DRIVER_NAME_100MM)){ throw new InvalidPortException("The port does not have a Firgelli L12 100 Motor."); @@ -43,7 +42,7 @@ public FirgelliL12100Motor(LegoPort port) throws InvalidPortException, IOExcepti * -1 will be returned instead, use getCountPerMetre() */ @Override - public int getCountPerRot() throws IOException{ + public int getCountPerRot() throws EV3LibraryException{ return -1; } @@ -52,9 +51,9 @@ public int getCountPerRot() throws IOException{ * Tacho counts are used by the position and speed attributes, so you can * use this value to convert from distance to tacho counts. (linear motors only) * @return Counts per metre - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getCountPerMetre() throws IOException{ + public int getCountPerMetre() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -68,9 +67,9 @@ public int getCountPerMetre() throws IOException{ * to calculate the maximum travel distance of the motor. * (linear motors only) * @return Full Travel Count - * @throws IOException + * @throws EV3LibraryException */ - public int getFullTravelCount() throws IOException{ + public int getFullTravelCount() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java index be8a39c..3fef3e5 100644 --- a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.motors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.ports.LegoPort; @@ -27,11 +26,11 @@ public class FirgelliL1250Motor extends Motor { */ public static final String DRIVER_NAME_50MM = "act-l12-ev3-50"; - public FirgelliL1250Motor(int portField) throws InvalidPortException, IOException { + public FirgelliL1250Motor(int portField) throws EV3LibraryException { this(new LegoPort(portField)); } - public FirgelliL1250Motor(LegoPort port) throws InvalidPortException, IOException { + public FirgelliL1250Motor(LegoPort port) throws EV3LibraryException { super(port, LINEAR_MOTOR_CLASS_NAME_PREFIX); if (!port.getDriverName().equals(DRIVER_NAME_50MM)){ throw new InvalidPortException("The port does not have a Firgelli L12 50 Motor driver."); @@ -43,7 +42,7 @@ public FirgelliL1250Motor(LegoPort port) throws InvalidPortException, IOExceptio * -1 will be returned instead, use getCountPerMetre() */ @Override - public int getCountPerRot() throws IOException{ + public int getCountPerRot() throws EV3LibraryException{ return -1; } @@ -52,9 +51,9 @@ public int getCountPerRot() throws IOException{ * Tacho counts are used by the position and speed attributes, so you can * use this value to convert from distance to tacho counts. (linear motors only) * @return Counts per metre - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getCountPerMetre() throws IOException{ + public int getCountPerMetre() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -68,9 +67,9 @@ public int getCountPerMetre() throws IOException{ * to calculate the maximum travel distance of the motor. * (linear motors only) * @return Full Travel Count - * @throws IOException + * @throws EV3LibraryException */ - public int getFullTravelCount() throws IOException{ + public int getFullTravelCount() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index 41485e7..db717ed 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -8,8 +8,7 @@ //----------------------------------------------------------------------------- -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; @@ -190,20 +189,18 @@ public class Motor extends Device{ /*** * Creates a new motor object. * @param portField a LegoPort field (e.g. LegoPort.INPUT_1) - * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. - * @throws IOException If the LegoPort specified goes wrong + * @throws EV3LibraryException If the LegoPort specified goes wrong */ - public Motor(int portField) throws InvalidPortException, IOException{ + public Motor(int portField) throws EV3LibraryException{ this(new LegoPort(portField)); } /*** * Creates a new motor object. * @param port LegoPort - * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. - * @throws IOException If the LegoPort specified goes wrong + * @throws EV3LibraryException If the LegoPort specified goes wrong */ - public Motor(LegoPort port) throws InvalidPortException, IOException{ + public Motor(LegoPort port) throws EV3LibraryException{ this(port, CLASS_NAME_PREFIX); } @@ -211,10 +208,9 @@ public Motor(LegoPort port) throws InvalidPortException, IOException{ * Creates a new motor object. * @param port LegoPort * @param class_name_prefix Specify a class name prefix (e.g. motor[N], which "motor" is the prefix) - * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. - * @throws IOException If the LegoPort specified goes wrong + * @throws EV3LibraryException If the LegoPort specified goes wrong */ - public Motor(LegoPort port, String class_name_prefix) throws InvalidPortException, IOException{ + public Motor(LegoPort port, String class_name_prefix) throws EV3LibraryException{ super(port, CLASS_NAME, CLASS_NAME_PREFIX); address = port.getAddress(); @@ -232,9 +228,9 @@ public Motor(LegoPort port, String class_name_prefix) throws InvalidPortExceptio /*** * Get the address of this motor. * @return LegoPort address described in String - * @throws IOException If the motor doesn't exist or IO ERROR + * @throws EV3LibraryException If the motor doesn't exist or IO ERROR */ - public String getAddress() throws IOException{ + public String getAddress() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -244,9 +240,9 @@ public String getAddress() throws IOException{ /*** * Generic method to send commands to the motor controller. * @param command Command that suits for the motor driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void sendCommand(String command) throws IOException{ + public void sendCommand(String command) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -255,9 +251,9 @@ public void sendCommand(String command) throws IOException{ /*** * Cause the motor to run until another command is sent - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runForever() throws IOException{ + public void runForever() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -267,9 +263,9 @@ public void runForever() throws IOException{ /*** * Run to an absolute position specified by position_sp * and then stop using the command specified in stop_command - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runToAbsPos() throws IOException{ + public void runToAbsPos() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -281,9 +277,9 @@ public void runToAbsPos() throws IOException{ * The new position will be current position + position_sp. * When the new position is reached, the motor will stop * using the command specified by stop_command. - * @throws IOException If I/O goes wrong. + * @throws EV3LibraryException If I/O goes wrong. */ - public void runToRelPos() throws IOException{ + public void runToRelPos() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -294,9 +290,9 @@ public void runToRelPos() throws IOException{ * Run the motor for the amount of time specified in time_sp * and then stop the motor using the command specified by * stop_command - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runTimed() throws IOException{ + public void runTimed() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -307,9 +303,9 @@ public void runTimed() throws IOException{ * Run the motor at the duty cycle specified by duty_cycle_sp. * Unlike other run commands, changing duty_cycle_sp while * running will take effect immediately - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void runDirect() throws IOException{ + public void runDirect() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -318,9 +314,9 @@ public void runDirect() throws IOException{ /** * Stop any of the run commands before they are complete using the command specified by stop_command. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void stop() throws IOException{ + public void stop() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -329,9 +325,9 @@ public void stop() throws IOException{ /** * Reset all of the motor parameter attributes to their default value. This will also have the effect of stopping the motor. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void reset() throws IOException{ + public void reset() throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -343,9 +339,9 @@ public void reset() throws IOException{ * Possible values are run-forever, run-to-abs-pos, run-to-rel-pos, * run-timed, run-direct, stop and reset. Not all commands may be supported. * @return A String Arrays with all the supported commands - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getCommands() throws IOException{ + public String[] getCommands() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -360,9 +356,9 @@ public String[] getCommands() throws IOException{ * counts. In the case of linear actuators, the units here will * be counts per centimeter. * @return Counts per cm - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getCountPerRot() throws IOException{ + public int getCountPerRot() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -375,9 +371,9 @@ public int getCountPerRot() throws IOException{ /** * Returns the name of the driver that provides this tacho motor device. * @return The name of the driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getDriverName() throws IOException{ + public String getDriverName() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -388,9 +384,9 @@ public String getDriverName() throws IOException{ /** * Returns the current duty cycle of the motor. Units are percent. Values are -100 to 100. * @return Percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDutyCycle() throws IOException{ + public int getDutyCycle() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -403,9 +399,9 @@ public int getDutyCycle() throws IOException{ * Valid values are -100 to 100. A negative value causes the motor to rotate in reverse. * This value is only used when speed_regulation is off. * @return Percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDutyCycleSP() throws IOException{ + public int getDutyCycleSP() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -418,9 +414,9 @@ public int getDutyCycleSP() throws IOException{ * Valid values are -100 to 100. A negative value causes the motor to rotate in reverse. * This value is only used when speed_regulation is off. * @param sp Percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setDutyCycleSP(int sp) throws IOException{ + public void setDutyCycleSP(int sp) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -433,9 +429,9 @@ public void setDutyCycleSP(int sp) throws IOException{ * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. * With inversed polarity, a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. * @return The polarity of the motor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getPolarity() throws IOException{ + public String getPolarity() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -446,9 +442,9 @@ public String getPolarity() throws IOException{ * Sets the polarity of the motor. With normal polarity, a positive duty cycle will cause the motor to rotate clockwise. With inversed polarity, * a positive duty cycle will cause the motor to rotate counter-clockwise. Valid values are normal and inversed. * @param polarity The polarity of the motor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPolarity(String polarity) throws IOException{ + public void setPolarity(String polarity) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -459,9 +455,9 @@ public void setPolarity(String polarity) throws IOException{ * Returns the current position of the motor in pulses of the rotary encoder. When the motor rotates clockwise, the position will increase. Likewise, * rotating counter-clockwise causes the position to decrease. Writing will set the position to that value. * @return The current position - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getPosition() throws IOException{ + public int getPosition() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -473,9 +469,9 @@ public int getPosition() throws IOException{ * Returns the current position of the motor in pulses of the rotary encoder. When the motor rotates clockwise, the position will increase. * Likewise, rotating counter-clockwise causes the position to decrease. Writing will set the position to that value. * @param position The current position - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPosition(int position) throws IOException{ + public void setPosition(int position) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -485,9 +481,9 @@ public void setPosition(int position) throws IOException{ /** * The proportional constant for the position PID. * @return The proportional constant for the position PID. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getPosition_P() throws IOException{ + public int getPosition_P() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -498,9 +494,9 @@ public int getPosition_P() throws IOException{ /** * The integral constant for the position PID. * @return The integral constant for the position PID. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getPosition_I() throws IOException{ + public int getPosition_I() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -511,9 +507,9 @@ public int getPosition_I() throws IOException{ /** * The derivative constant for the position PID. * @return The derivative constant for the position PID. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getPosition_D() throws IOException{ + public int getPosition_D() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -524,9 +520,9 @@ public int getPosition_D() throws IOException{ /** * The proportional constant for the position PID. * @param position_p The proportional constant for the position PID. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPosition_P(int position_p) throws IOException{ + public void setPosition_P(int position_p) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -536,9 +532,9 @@ public void setPosition_P(int position_p) throws IOException{ /** * The integral constant for the position PID. * @param position_i The integral constant for the position PID. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPosition_I(int position_i) throws IOException{ + public void setPosition_I(int position_i) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -548,9 +544,9 @@ public void setPosition_I(int position_i) throws IOException{ /** * The derivative constant for the position PID. * @param position_d The derivative constant for the position PID. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPosition_D(int position_d) throws IOException{ + public void setPosition_D(int position_d) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -561,9 +557,9 @@ public void setPosition_D(int position_d) throws IOException{ * Writing specifies the target position for the run-to-abs-pos and run-to-rel-pos commands. Reading returns the current value. * Units are in tacho counts. You can use the value returned by counts_per_rot to convert tacho counts to/from rotations or degrees. * @return The target position - * @throws IOException if I/O goes wrong + * @throws EV3LibraryException if I/O goes wrong */ - public int getPosition_SP() throws IOException{ + public int getPosition_SP() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -575,9 +571,9 @@ public int getPosition_SP() throws IOException{ * Writing specifies the target position for the run-to-abs-pos and run-to-rel-pos commands. Reading returns the current value. * Units are in tacho counts. You can use the value returned by counts_per_rot to convert tacho counts to/from rotations or degrees. * @param position_sp The target position - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPosition_SP(int position_sp) throws IOException{ + public void setPosition_SP(int position_sp) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -588,9 +584,9 @@ public void setPosition_SP(int position_sp) throws IOException{ * Returns the current motor speed in tacho counts per second. Note, this is not necessarily degrees * (although it is for LEGO motors). Use the count_per_rot attribute to convert this value to RPM or deg/sec. * @return The current speed - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getSpeed() throws IOException{ + public int getSpeed() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -602,9 +598,9 @@ public int getSpeed() throws IOException{ * Writing sets the target speed in tacho counts per second used when speed_regulation is on. * Reading returns the current value. Use the count_per_rot attribute to convert RPM or deg/sec to tacho counts per second. * @return The target speed - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getSpeed_SP() throws IOException{ + public int getSpeed_SP() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -616,9 +612,9 @@ public int getSpeed_SP() throws IOException{ * Writing sets the target speed in tacho counts per second used when speed_regulation is on. Reading returns the current value. * Use the count_per_rot attribute to convert RPM or deg/sec to tacho counts per second. * @param speed_sp The target speed - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setSpeed_SP(int speed_sp) throws IOException{ + public void setSpeed_SP(int speed_sp) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -632,9 +628,9 @@ public void setSpeed_SP(int speed_sp) throws IOException{ * limited by duty_cycle_sp or speed regulation, * the actual ramp time duration will be less than the setpoint. * @return The ramp-up set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getRamp_Up_SP() throws IOException{ + public int getRamp_Up_SP() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -649,9 +645,9 @@ public int getRamp_Up_SP() throws IOException{ * limited by duty_cycle_sp or speed regulation, * the actual ramp time duration will be less than the setpoint. * @param ramp_up_sp The ramp-up set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ + public void setRamp_Up_SP(int ramp_up_sp) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -664,9 +660,9 @@ public void setRamp_Up_SP(int ramp_up_sp) throws IOException{ * to 0 over the span of this setpoint when stopping the motor. If the starting * duty cycle is less than 100%, the ramp time duration will be less than the full span of the setpoint. * @return The ramp-down set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getRamp_Down_SP() throws IOException{ + public int getRamp_Down_SP() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -680,9 +676,9 @@ public int getRamp_Down_SP() throws IOException{ * to 0 over the span of this setpoint when stopping the motor. If the starting * duty cycle is less than 100%, the ramp time duration will be less than the full span of the setpoint. * @param ramp_down_sp The ramp-down set-point - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ + public void setRamp_Down_SP(int ramp_down_sp) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -697,9 +693,9 @@ public void setRamp_Down_SP(int ramp_down_sp) throws IOException{ * * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. * @return A list of state flags. String spaced-array - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStateViaString() throws IOException{ + public String getStateViaString() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -709,9 +705,9 @@ public String getStateViaString() throws IOException{ /** * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. * @return A list(String array) of state flags. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getState() throws IOException{ + public String[] getState() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -723,9 +719,9 @@ public String[] getState() throws IOException{ * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. * @return A stop command that listed using getStopCommands() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStopAction() throws IOException{ + public String getStopAction() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -736,9 +732,9 @@ public String getStopAction() throws IOException{ * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. * @param stop_command A stop command that listed using getStopCommands() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setStopAction(String stop_action) throws IOException{ + public void setStopAction(String stop_action) throws EV3LibraryException{ if (!this.isConnected()){ return; } @@ -760,9 +756,9 @@ public void setStopAction(String stop_action) throws IOException{ * the motor. Instead it actively try to hold the motor at the current position. * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. * @return A list of stop modes supported by the motor controller - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStopCommandsViaString() throws IOException{ + public String getStopCommandsViaString() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -779,9 +775,9 @@ public String getStopCommandsViaString() throws IOException{ * the motor. Instead it actively try to hold the motor at the current position. * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. * @return A list of stop modes supported by the motor controller - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getStopCommands() throws IOException{ + public String[] getStopCommands() throws EV3LibraryException{ if (!this.isConnected()){ return null; } @@ -792,9 +788,9 @@ public String[] getStopCommands() throws IOException{ /** * Writing specifies the amount of time the motor will run when using the run-timed command. Reading returns the current value. Units are in milliseconds. * @return Amount of time in ms - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getTime_SP() throws IOException{ + public int getTime_SP() throws EV3LibraryException{ if (!this.isConnected()){ return -1; } @@ -805,9 +801,9 @@ public int getTime_SP() throws IOException{ /** * Writing specifies the amount of time the motor will run when using the run-timed command. Reading returns the current value. Units are in milliseconds. * @param time_sp Amount of time in ms - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setTime_SP(int time_sp) throws IOException{ + public void setTime_SP(int time_sp) throws EV3LibraryException{ if (!this.isConnected()){ return; } diff --git a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java index 98eca3b..81a4a0a 100644 --- a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.motors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidMotorException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; @@ -91,10 +90,10 @@ public class ServoMotor extends Device{ * Creates a new motor object. * @param port LegoPort * @throws InvalidPortException If the LegoPort isn't a OUTPUT, invalid or a tacho-motor. - * @throws IOException If the LegoPort specified goes wrong + * @throws EV3LibraryException If the LegoPort specified goes wrong * @throws InvalidMotorException The specified motor wasn't a motor */ - public ServoMotor(LegoPort port) throws InvalidPortException, InvalidMotorException, IOException{ + public ServoMotor(LegoPort port) throws EV3LibraryException{ super(port, CLASS_NAME, CLASS_NAME_PREFIX); address = port.getAddress(); @@ -109,44 +108,44 @@ public ServoMotor(LegoPort port) throws InvalidPortException, InvalidMotorExcept /*** * Get the address of this motor. * @return LegoPort address described in String - * @throws IOException If the motor doesn't exist or IO ERROR + * @throws EV3LibraryException If the motor doesn't exist or IO ERROR */ - public String getAddress() throws IOException{ + public String getAddress() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** * Generic method to send commands to the motor controller. * @param command Command that suits for the motor driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void sendCommand(String command) throws IOException{ + public void sendCommand(String command) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } /*** * Setting to run will cause the servo to be driven to the position_sp set in the position_sp attribute. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void run() throws IOException{ + public void run() throws EV3LibraryException{ sendCommand(SYSFS_COMMAND_RUN); } /*** * Run to an absolute position specified by position_sp * and then stop using the command specified in stop_command - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void Float() throws IOException{ + public void Float() throws EV3LibraryException{ sendCommand(SYSFS_COMMAND_FLOAT); } /** * Returns the name of the driver that provides this tacho motor device. * @return The name of the driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getDriverName() throws IOException{ + public String getDriverName() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } @@ -154,9 +153,9 @@ public String getDriverName() throws IOException{ * Used to set the pulse size in milliseconds for the signal that tells the servo to drive to the maximum (clockwise) position_sp. Default value is 2400. * Valid values are 2300 to 2700. You must write to the position_sp attribute for changes to this attribute to take effect. * @return The pulse size in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getMaxPulse_SP() throws IOException{ + public int getMaxPulse_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_MAX_PULSE_SP); return Integer.parseInt(str); } @@ -165,9 +164,9 @@ public int getMaxPulse_SP() throws IOException{ * Used to set the pulse size in milliseconds for the signal that tells the servo to drive to the maximum (clockwise) position_sp. Default value is 2400. * Valid values are 2300 to 2700. You must write to the position_sp attribute for changes to this attribute to take effect. * @param max_pulse_sp The pulse size in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setMaxPulse_SP(int max_pulse_sp) throws IOException{ + public void setMaxPulse_SP(int max_pulse_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_MAX_PULSE_SP, Integer.toString(max_pulse_sp)); } @@ -177,9 +176,9 @@ public void setMaxPulse_SP(int max_pulse_sp) throws IOException{ * On continuous rotation servo, this is the ˇĄneutralˇ¦ position_sp where the motor does not turn. * You must write to the position_sp attribute for changes to this attribute to take effect. * @return The pulse size in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getMidPulse_SP() throws IOException{ + public int getMidPulse_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_MID_PULSE_SP); return Integer.parseInt(str); } @@ -190,9 +189,9 @@ public int getMidPulse_SP() throws IOException{ * On continuous rotation servo, this is the ˇĄneutralˇ¦ position_sp where the motor does not turn. * You must write to the position_sp attribute for changes to this attribute to take effect. * @param mid_pulse_sp The pulse size in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setMidPulse_SP(int mid_pulse_sp) throws IOException{ + public void setMidPulse_SP(int mid_pulse_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_MID_PULSE_SP, Integer.toString(mid_pulse_sp)); } @@ -201,9 +200,9 @@ public void setMidPulse_SP(int mid_pulse_sp) throws IOException{ * minimum (counter-clockwise) position_sp. Default value is 600. Valid values are 300 to 700. * You must write to the position_sp attribute for changes to this attribute to take effect. * @return The pulse size in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getMinPulse_SP() throws IOException{ + public int getMinPulse_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_MIN_PULSE_SP); return Integer.parseInt(str); } @@ -213,9 +212,9 @@ public int getMinPulse_SP() throws IOException{ * minimum (counter-clockwise) position_sp. Default value is 600. Valid values are 300 to 700. * You must write to the position_sp attribute for changes to this attribute to take effect. * @param min_pulse_sp The pulse size in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setMinPulse_SP(int min_pulse_sp) throws IOException{ + public void setMinPulse_SP(int min_pulse_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_MIN_PULSE_SP, Integer.toString(min_pulse_sp)); } @@ -223,9 +222,9 @@ public void setMinPulse_SP(int min_pulse_sp) throws IOException{ * Sets the polarity of the servo. Valid values are normal and inversed. Setting the value to inversed will cause the position_sp value to be inversed. * i.e -100 will correspond to max_pulse_sp, and 100 will correspond to min_pulse_sp. * @return The polarity of the servo - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getPolarity() throws IOException{ + public String getPolarity() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_POLARITY); } @@ -233,9 +232,9 @@ public String getPolarity() throws IOException{ * Sets the polarity of the servo. Valid values are normal and inversed. Setting the value to inversed will cause the position_sp value to be inversed. * i.e -100 will correspond to max_pulse_sp, and 100 will correspond to min_pulse_sp. * @param polarity The polarity of the servo - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPolarity(String polarity) throws IOException{ + public void setPolarity(String polarity) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_POLARITY, polarity); } @@ -244,9 +243,9 @@ public void setPolarity(String polarity) throws IOException{ * Units are percent. Valid values are -100 to 100 (-100% to 100%) * where -100 corresponds to min_pulse_sp, 0 corresponds to mid_pulse_sp and 100 corresponds to max_pulse_sp. * @return The current position_sp of the servo - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getPosition_SP() throws IOException{ + public int getPosition_SP() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_POSITION_SP); return Integer.parseInt(str); } @@ -256,9 +255,9 @@ public int getPosition_SP() throws IOException{ * Units are percent. Valid values are -100 to 100 (-100% to 100%) * where -100 corresponds to min_pulse_sp, 0 corresponds to mid_pulse_sp and 100 corresponds to max_pulse_sp. * @param position_sp The current position_sp of the servo - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPosition_SP(int position_sp) throws IOException{ + public void setPosition_SP(int position_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_POSITION_SP, Integer.toString(position_sp)); } @@ -269,9 +268,9 @@ public void setPosition_SP(int position_sp) throws IOException{ * in which case reading and writing will fail with -EOPNOTSUPP. * In continuous rotation servos, this value will affect the rate_sp at which the speed ramps up or down. * @param rate_sp The rate_sp value - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setRate_SP(int rate_sp) throws IOException{ + public void setRate_SP(int rate_sp) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_RATE_SP, Integer.toString(rate_sp)); } @@ -283,18 +282,18 @@ public void setRate_SP(int rate_sp) throws IOException{ * * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. * @return A list of state flags. String spaced-array - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getStateViaString() throws IOException{ + public String getStateViaString() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_STATE); } /** * Reading returns a list of state flags. Possible flags are running, ramping holding and stalled. * @return A list(String array) of state flags. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getState() throws IOException{ + public String[] getState() throws EV3LibraryException{ String str = getStateViaString(); return Sysfs.separateSpace(str); } diff --git a/src/main/java/org/ev3dev/hardware/ports/LegoPort.java b/src/main/java/org/ev3dev/hardware/ports/LegoPort.java index 652b790..6ca28aa 100644 --- a/src/main/java/org/ev3dev/hardware/ports/LegoPort.java +++ b/src/main/java/org/ev3dev/hardware/ports/LegoPort.java @@ -2,6 +2,7 @@ import java.io.IOException; +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.io.Sysfs; @@ -91,30 +92,45 @@ public LegoPort(int port) throws InvalidPortException{ /** * Returns the name of the port. See individual driver documentation for the name that will be returned. * @return Address (e.g. in1, outA) - * @throws IOException If I/O goes wrong - */ - public String getAddress() throws IOException{ - String address = Sysfs.getAttribute(CLASS_NAME, "port" + port, "address"); + * @throws EV3LibraryException If I/O goes wrong + */ + public String getAddress() throws EV3LibraryException{ + String address; + try { + address = Sysfs.getAttribute(CLASS_NAME, "port" + port, "address"); + } catch (IOException e) { + throw new EV3LibraryException("Get address attribute failed", e); + } return address; } /** * Returns the name of the driver that loaded this device. You can find the complete list of drivers in the [list of port drivers]. * @return Driver Name of this port - * @throws IOException if I/O goes wrong - */ - public String getDriverName() throws IOException{ - String drivername = Sysfs.getAttribute(CLASS_NAME, "port" + port, "driver_name"); + * @throws EV3LibraryException if I/O goes wrong + */ + public String getDriverName() throws EV3LibraryException{ + String drivername; + try { + drivername = Sysfs.getAttribute(CLASS_NAME, "port" + port, "driver_name"); + } catch (IOException e) { + throw new EV3LibraryException("Get driver name attribute failed", e); + } return drivername; } /** * Returns a list of the available modes of the port. * @return A String Array with a list of available modes - * @throws IOException If I/O goes wrong - */ - public String[] getModes() throws IOException{ - String modesstr = Sysfs.getAttribute(CLASS_NAME, "port" + port, "modes"); + * @throws EV3LibraryException If I/O goes wrong + */ + public String[] getModes() throws EV3LibraryException{ + String modesstr; + try { + modesstr = Sysfs.getAttribute(CLASS_NAME, "port" + port, "modes"); + } catch (IOException e) { + throw new EV3LibraryException("Get modes attribute failed", e); + } return Sysfs.separateSpace(modesstr); } @@ -124,10 +140,15 @@ public String[] getModes() throws IOException{ * the port will be removed new ones loaded, * however this this will depend on the individual driver implementing this class. * @return The currently selected mode - * @throws IOException If I/O goes wrong - */ - public String getMode() throws IOException{ - String mode = Sysfs.getAttribute(CLASS_NAME, "port" + port, "mode"); + * @throws EV3LibraryException If I/O goes wrong + */ + public String getMode() throws EV3LibraryException{ + String mode; + try { + mode = Sysfs.getAttribute(CLASS_NAME, "port" + port, "mode"); + } catch (IOException e) { + throw new EV3LibraryException("Get mode attribute failed", e); + } return mode; } @@ -137,10 +158,14 @@ public String getMode() throws IOException{ * the port will be removed new ones loaded, * however this this will depend on the individual driver implementing this class. * @param mode A available mode listed using getModes() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setMode(String mode) throws IOException{ - Sysfs.setAttribute(CLASS_NAME, "port" + port, "mode", mode); + public void setMode(String mode) throws EV3LibraryException{ + try { + Sysfs.setAttribute(CLASS_NAME, "port" + port, "mode", mode); + } catch (IOException e) { + throw new EV3LibraryException("Set mode attribute failed", e); + } } /** @@ -148,10 +173,14 @@ public void setMode(String mode) throws IOException{ * attached to this port. For example, since NXT/Analog sensors cannot be auto-detected, you must use this attribute to * load the correct driver. Returns -EOPNOTSUPP if setting a device is not supported. * @param driver A generic driver name - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setDevice(String driver) throws IOException{ - Sysfs.setAttribute(CLASS_NAME, "port" + port, "set_device", driver); + public void setDevice(String driver) throws EV3LibraryException{ + try { + Sysfs.setAttribute(CLASS_NAME, "port" + port, "set_device", driver); + } catch (IOException e) { + throw new EV3LibraryException("Set device attribute failed", e); + } } /** @@ -159,10 +188,15 @@ public void setDevice(String driver) throws IOException{ * auto mode additional values may be returned, such as no-device or error. * See individual port driver documentation for the full list of possible values. * @return The same as mode or some errors like: no-device or error. - * @throws IOException If I/O goes wrong - */ - public String getStatus() throws IOException{ - String status = Sysfs.getAttribute(CLASS_NAME, "port" + port, "status"); + * @throws EV3LibraryException If I/O goes wrong + */ + public String getStatus() throws EV3LibraryException{ + String status; + try { + status = Sysfs.getAttribute(CLASS_NAME, "port" + port, "status"); + } catch (IOException e) { + throw new EV3LibraryException("Get status attribute failed", e); + } return status; } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java index 0eaf85b..153cdf4 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/ColorSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -76,9 +75,9 @@ public class ColorSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a ColorSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public ColorSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public ColorSensor(LegoPort port) throws EV3LibraryException { super(port); if (!DRIVER_NAME.equals(this.getDriverName())){ throw new InvalidSensorException("The specified device is not a color sensor."); @@ -89,10 +88,10 @@ public ColorSensor(LegoPort port) throws IOException, InvalidPortException, Inva /** * Reflected light intensity as a percentage. Light on sensor is red. * @return Reflected Light Intensity in percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getReflectedLightIntensity() throws IOException, InvalidModeException{ + public int getReflectedLightIntensity() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_REFLECTED_LIGHT_INTENSITY_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_REFLECTED_LIGHT_INTENSITY_MODE); @@ -107,10 +106,10 @@ public int getReflectedLightIntensity() throws IOException, InvalidModeException /** * Ambient light intensity. Light on sensor is dimly lit blue. * @return Ambient light intensity in percentage - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getAmbientLightIntensity() throws IOException, InvalidModeException{ + public int getAmbientLightIntensity() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_AMBIENT_LIGHT_INTENSITY_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_AMBIENT_LIGHT_INTENSITY_MODE); @@ -133,10 +132,10 @@ public int getAmbientLightIntensity() throws IOException, InvalidModeException{ * - 6: White
* - 7: Brown * @return Color value - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getColor() throws IOException, InvalidModeException{ + public int getColor() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_COLOR_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_COLOR_MODE); @@ -151,10 +150,10 @@ public int getColor() throws IOException, InvalidModeException{ /** * Red component of the detected color, in the range 0-1020 * @return RGB Red component - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getRGB_Red() throws IOException, InvalidModeException{ + public int getRGB_Red() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_RGB_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_RGB_MODE); @@ -169,10 +168,10 @@ public int getRGB_Red() throws IOException, InvalidModeException{ /** * Green component of the detected color, in the range 0-1020 * @return Green Red component - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getRGB_Green() throws IOException, InvalidModeException{ + public int getRGB_Green() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_RGB_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_RGB_MODE); @@ -187,10 +186,10 @@ public int getRGB_Green() throws IOException, InvalidModeException{ /** * Blue component of the detected color, in the range 0-1020 * @return Blue Red component - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getRGB_Blue() throws IOException, InvalidModeException{ + public int getRGB_Blue() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_RGB_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_RGB_MODE); diff --git a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java index 02693ce..24cc4eb 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/GyroSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -46,9 +45,9 @@ public class GyroSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a GyroSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public GyroSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public GyroSensor(LegoPort port) throws EV3LibraryException, InvalidPortException, InvalidSensorException { super(port); if (!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a GyroSensor instance if port isn't connected to a GyroSensor!"); @@ -58,10 +57,10 @@ public GyroSensor(LegoPort port) throws IOException, InvalidPortException, Inval /** * The number of degrees that the sensor has been rotated since it was put into this mode. * @return The number of degrees - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getAngle() throws InvalidModeException, IOException{ + public int getAngle() throws InvalidModeException, EV3LibraryException{ if (!this.getMode().equals(SYSFS_ANGLE_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_ANGLE_MODE); @@ -76,10 +75,10 @@ public int getAngle() throws InvalidModeException, IOException{ /** * The rate at which the sensor is rotating, in degrees/second. * @return The rate at which the sensor is rotating - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getRate() throws InvalidModeException, IOException{ + public int getRate() throws InvalidModeException, EV3LibraryException{ if (!this.getMode().equals(SYSFS_RATE_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_RATE_MODE); diff --git a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java index 8b9fbf6..3d7f555 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; import org.ev3dev.hardware.ports.LegoPort; @@ -33,9 +32,9 @@ public class I2CSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a I2CSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorException, IOException { + public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorException, EV3LibraryException { super(port); if (!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("The specified port is not a I2C sensor."); @@ -45,9 +44,9 @@ public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorExcept /** * Returns the firmware version of the sensor if available. Currently only I2C/NXT sensors support this. * @return The firmware version - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getFirmwareVersion() throws IOException{ + public String getFirmwareVersion() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_FIRMWARE_VERSION); } @@ -56,9 +55,9 @@ public String getFirmwareVersion() throws IOException{ * Minimum value is hard coded as 50 msec. Returns -EOPNOTSUPP if changing polling is not supported. * Currently only I2C/NXT sensors support changing the polling period. * @return The polling period in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getPollMs() throws IOException{ + public int getPollMs() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_POLL_MS); return Integer.parseInt(str); } @@ -68,9 +67,9 @@ public int getPollMs() throws IOException{ * Minimum value is hard coded as 50 msec. Returns -EOPNOTSUPP if changing polling is not supported. * Currently only I2C/NXT sensors support changing the polling period. * @param ms The polling period in milliseconds - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setPollMs(int ms) throws IOException{ + public void setPollMs(int ms) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_POLL_MS, Integer.toString(ms)); } } diff --git a/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java b/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java index 27414ff..8f28447 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/InfraredSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -36,9 +35,9 @@ public class InfraredSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a InfraredSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public InfraredSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public InfraredSensor(LegoPort port) throws EV3LibraryException, InvalidPortException, InvalidSensorException { super(port); if (!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a InfraredSensor instance if the port isn't connected a infrared sensor!"); @@ -48,10 +47,10 @@ public InfraredSensor(LegoPort port) throws IOException, InvalidPortException, I /** * A measurement of the distance between the sensor and the remote, as a percentage. 100% is approximately 70cm/27in. * @return A measurement of the distance - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public int getProximity() throws InvalidModeException, IOException{ + public int getProximity() throws InvalidModeException, EV3LibraryException{ if (!this.getMode().equals(SYSFS_PROXIMITY_REQUIRED_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_PROXIMITY_REQUIRED_MODE); diff --git a/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java b/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java index 7044422..1618fa9 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/LightSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -46,9 +45,9 @@ public class LightSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a LightSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public LightSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public LightSensor(LegoPort port) throws EV3LibraryException, InvalidPortException, InvalidSensorException { super(port); if(!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a LightSensor instance if the port isn't connected to a light sensor!"); @@ -58,10 +57,10 @@ public LightSensor(LegoPort port) throws IOException, InvalidPortException, Inva /** * A measurement of the reflected light intensity, as a percentage. * @return A measurement of the reflected light intensity - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public float getReflectedLightIntensity() throws IOException, InvalidModeException{ + public float getReflectedLightIntensity() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_REFLECTED_REQUIRED_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_REFLECTED_REQUIRED_MODE); @@ -76,10 +75,10 @@ public float getReflectedLightIntensity() throws IOException, InvalidModeExcepti /** * A measurement of the ambient light intensity, as a percentage. * @return A measurement of the ambient light intensity - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public float getAmbientLightIntensity() throws IOException, InvalidModeException{ + public float getAmbientLightIntensity() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_AMBIENT_REQUIRED_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_AMBIENT_REQUIRED_MODE); diff --git a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java index 0bf72b7..fa46562 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.Device; import org.ev3dev.hardware.ports.LegoPort; @@ -81,10 +80,10 @@ public class Sensor extends Device{ /** * Creates a new Sensor instance using a LegoPort * @param port LegoPort - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidPortException If the specified LegoPort was invalid */ - public Sensor(LegoPort port) throws IOException, InvalidPortException{ + public Sensor(LegoPort port) throws EV3LibraryException{ super(port, CLASS_NAME, CLASS_NAME_PREFIX); } @@ -92,18 +91,18 @@ public Sensor(LegoPort port) throws IOException, InvalidPortException{ * Returns the name of the port that the sensor is connected to, e.g. ev3:in1. * I2C sensors also include the I2C address (decimal), e.g. ev3:in1:i2c8. * @return A sensor address - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getAddress() throws IOException{ + public String getAddress() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_ADDRESS); } /*** * Generic method to send commands to the sensor controller. * @param command Command that suits for the sensor driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void sendCommand(String command) throws IOException{ + public void sendCommand(String command) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_COMMAND, command); } @@ -115,18 +114,18 @@ public void sendCommand(String command) throws IOException{ * * Returns a list of the valid commands for the sensor. Returns -EOPNOTSUPP if no commands are supported. * @return A list of valid commands - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getCommandsViaString() throws IOException{ + public String getCommandsViaString() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_COMMANDS); } /** * Returns a list of the valid commands for the sensor. Returns -EOPNOTSUPP if no commands are supported. * @return A list of valid commands - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getCommands() throws IOException{ + public String[] getCommands() throws EV3LibraryException{ String str = getCommandsViaString(); return Sysfs.separateSpace(str); } @@ -134,9 +133,9 @@ public String[] getCommands() throws IOException{ /** * Returns the number of decimal places for the values in the value[N] attributes of the current mode. * @return The number of decimal places - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getDecimals() throws IOException{ + public int getDecimals() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_DECIMALS); return Integer.parseInt(str); } @@ -144,27 +143,27 @@ public int getDecimals() throws IOException{ /** * Returns the name of the sensor device/driver. See the list of [supported sensors] for a complete list of drivers. * @return The name of the sensor device or driver - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getDriverName() throws IOException{ + public String getDriverName() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_DRIVER_NAME); } /** * Returns the current mode. Writing one of the values returned by modes sets the sensor to that mode. * @return The current mode - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getMode() throws IOException{ + public String getMode() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_MODE); } /** * Sets the current mode. Writing one of the values returned by modes sets the sensor to that mode. * @param mode The mode listed using getModes() - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public void setMode(String mode) throws IOException{ + public void setMode(String mode) throws EV3LibraryException{ this.setAttribute(SYSFS_PROPERTY_MODE, mode); } @@ -176,18 +175,18 @@ public void setMode(String mode) throws IOException{ * * Returns a list of the valid modes for the sensor. * @return A list of valid modes for the sensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getModesViaString() throws IOException{ + public String getModesViaString() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_MODES); } /** * Returns a list of the valid modes for the sensor. * @return A list of valid modes for the sensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String[] getModes() throws IOException{ + public String[] getModes() throws EV3LibraryException{ String str = getModesViaString(); return Sysfs.separateSpace(str); } @@ -195,9 +194,9 @@ public String[] getModes() throws IOException{ /** * Returns the number of value[N] attributes that will return a valid value for the current mode. * @return The number if value[N] attributes - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public int getNumValues() throws IOException{ + public int getNumValues() throws EV3LibraryException{ String str = this.getAttribute(SYSFS_PROPERTY_NUM_VALUES); return Integer.parseInt(str); } @@ -205,9 +204,9 @@ public int getNumValues() throws IOException{ /** * Returns the units of the measured value for the current mode. May return empty string * @return The units of measured value - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public String getUnits() throws IOException{ + public String getUnits() throws EV3LibraryException{ return this.getAttribute(SYSFS_PROPERTY_UNITS); } diff --git a/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java b/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java index 79751fa..8f4455b 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/SoundSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -46,9 +45,9 @@ public class SoundSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a SoundSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public SoundSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public SoundSensor(LegoPort port) throws EV3LibraryException, InvalidPortException, InvalidSensorException { super(port); if(!this.getDriverName().equals(DRIVER_NAME)){ throw new InvalidSensorException("Can't create a SoundSensor instance if the port isn't connected to a sound sensor!"); @@ -58,10 +57,10 @@ public SoundSensor(LegoPort port) throws IOException, InvalidPortException, Inva /** * A measurement of the measured sound pressure level, as a percent. Uses a flat weighting. * @return The measured sound pressure level - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public float getSoundPressure() throws InvalidModeException, IOException{ + public float getSoundPressure() throws InvalidModeException, EV3LibraryException{ if (!this.getMode().equals(SYSFS_SOUND_PRESSURE_REQUIRED_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_SOUND_PRESSURE_REQUIRED_MODE); @@ -76,10 +75,10 @@ public float getSoundPressure() throws InvalidModeException, IOException{ /** * A measurement of the measured sound pressure level, as a percent. Uses A-weighting, which focuses on levels up to 55 dB. * @return The measured sound pressure level, A-weighting. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public float getSoundPressureLow() throws InvalidModeException, IOException{ + public float getSoundPressureLow() throws InvalidModeException, EV3LibraryException{ if (!this.getMode().equals(SYSFS_SOUND_PRESSURE_LOW_REQUIRED_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_SOUND_PRESSURE_LOW_REQUIRED_MODE); diff --git a/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java b/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java index 7c142d0..95c285c 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/TouchSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -36,9 +35,9 @@ public class TouchSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a TouchSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public TouchSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public TouchSensor(LegoPort port) throws EV3LibraryException, InvalidPortException, InvalidSensorException { super(port); if (!this.getDriverName().equals(DRIVER_NAME_EV3) && !this.getDriverName().equals(DRIVER_NAME_NXT)){ @@ -53,10 +52,10 @@ public TouchSensor(LegoPort port) throws IOException, InvalidPortException, Inva /** * A boolean indicating whether the current touch sensor is being pressed. * @return The touch sensor is pressed or not. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public boolean isPressed() throws IOException, InvalidModeException{ + public boolean isPressed() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_REQUIRED_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_REQUIRED_MODE); diff --git a/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java b/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java index 2b9f45b..075f543 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/UltrasonicSensor.java @@ -1,7 +1,6 @@ package org.ev3dev.hardware.sensors; -import java.io.IOException; - +import org.ev3dev.exception.EV3LibraryException; import org.ev3dev.exception.InvalidModeException; import org.ev3dev.exception.InvalidPortException; import org.ev3dev.exception.InvalidSensorException; @@ -56,9 +55,9 @@ public class UltrasonicSensor extends Sensor { * @param port LegoPort * @throws InvalidPortException If the specified port wasn't valid * @throws InvalidSensorException If the specified sensor wasn't a UltrasonicSensor - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong */ - public UltrasonicSensor(LegoPort port) throws IOException, InvalidPortException, InvalidSensorException { + public UltrasonicSensor(LegoPort port) throws EV3LibraryException, InvalidPortException, InvalidSensorException { super(port); String driverName = this.getDriverName(); if (!driverName.equals(DRIVER_NAME_EV3) && @@ -70,10 +69,10 @@ public UltrasonicSensor(LegoPort port) throws IOException, InvalidPortException, /** * Measurement of the distance detected by the sensor, in centimeters. * @return The distance in centimeters - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public float getDistanceCentimeters() throws IOException, InvalidModeException{ + public float getDistanceCentimeters() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_CM_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_CM_MODE); @@ -88,10 +87,10 @@ public float getDistanceCentimeters() throws IOException, InvalidModeException{ /** * Measurement of the distance detected by the sensor, in inches. * @return The distance in inches. - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public float getDistanceInches() throws IOException, InvalidModeException{ + public float getDistanceInches() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_IN_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_IN_MODE); @@ -106,10 +105,10 @@ public float getDistanceInches() throws IOException, InvalidModeException{ /** * Value indicating whether another ultrasonic sensor could be heard nearby. * @return Boolean - * @throws IOException If I/O goes wrong + * @throws EV3LibraryException If I/O goes wrong * @throws InvalidModeException The mode selected wasn't valid, or Auto Switch Mode has disabled. */ - public boolean isOtherSensorPresent() throws IOException, InvalidModeException{ + public boolean isOtherSensorPresent() throws EV3LibraryException, InvalidModeException{ if (!this.getMode().equals(SYSFS_OTHER_PRESENT_MODE)){ if (autoSwitchMode){ this.setMode(SYSFS_OTHER_PRESENT_MODE); From 2780078660ca6620abbe164173206a86f91003a2 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:17:20 +0800 Subject: [PATCH 31/75] Add drivers: NXT Analog Sensor --- .../sensors/generic/NXTAnalogSensor.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java new file mode 100644 index 0000000..aa2ebf4 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -0,0 +1,23 @@ +package org.ev3dev.hardware.sensors.generic; + +import org.ev3dev.exception.EV3LibraryException; +import org.ev3dev.exception.InvalidPortException; +import org.ev3dev.hardware.ports.LegoPort; +import org.ev3dev.hardware.sensors.Sensor; + +public class NXTAnalogSensor extends Sensor { + + /** + * The NXT Analog sensor driver name + */ + public static final String DRIVER_NAME = "nxt-analog"; + + public NXTAnalogSensor(LegoPort port) throws EV3LibraryException, InvalidPortException { + super(port); + String drivername = port.getDriverName(); + if (!drivername.equals(DRIVER_NAME)){ + throw new EV3LibraryException("The port is not connected to a NXT analog sensor: " + drivername); + } + } + +} From b12f0ff9d6d8ea24d7db81b28739e4edccf06c7d Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:19:28 +0800 Subject: [PATCH 32/75] Add drivers: EV3 analog sensor --- .../sensors/generic/EV3AnalogSensor.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java new file mode 100644 index 0000000..1b0d2d6 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java @@ -0,0 +1,23 @@ +package org.ev3dev.hardware.sensors.generic; + +import org.ev3dev.exception.EV3LibraryException; +import org.ev3dev.exception.InvalidPortException; +import org.ev3dev.hardware.ports.LegoPort; +import org.ev3dev.hardware.sensors.Sensor; + +public class EV3AnalogSensor extends Sensor { + + /** + * The EV3 Analog sensor driver name + */ + public static final String DRIVER_NAME = "ev3-analog"; + + public EV3AnalogSensor(LegoPort port, String typeId) throws EV3LibraryException, InvalidPortException { + super(port); + String drivername = port.getDriverName(); + if (!drivername.equals(DRIVER_NAME + "-" + typeId)){ + throw new EV3LibraryException("The port is not connected to a EV3 analog sensor with type id \"" + typeId + "\": " + drivername); + } + } + +} From ee9df6f8bfd8544a1a805df3c7dcf2396f86602d Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:20:34 +0800 Subject: [PATCH 33/75] Put javadoc --- .../org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java | 5 +++++ .../org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java index 1b0d2d6..f4891f3 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java @@ -5,6 +5,11 @@ import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.hardware.sensors.Sensor; +/** + * Generic NXT Analog Sensor driver + * @author Anthony + * + */ public class EV3AnalogSensor extends Sensor { /** diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java index aa2ebf4..b2f86df 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -5,6 +5,11 @@ import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.hardware.sensors.Sensor; +/** + * Generic EV3 Analog Sensor driver + * @author Anthony + * + */ public class NXTAnalogSensor extends Sensor { /** From e7c479eb715f28e4c90579666fade0aee52db083 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:22:59 +0800 Subject: [PATCH 34/75] Update Javadoc --- .../hardware/sensors/generic/EV3AnalogSensor.java | 11 ++++++++--- .../hardware/sensors/generic/NXTAnalogSensor.java | 12 +++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java index f4891f3..202f5d2 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java @@ -1,12 +1,11 @@ package org.ev3dev.hardware.sensors.generic; import org.ev3dev.exception.EV3LibraryException; -import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.hardware.sensors.Sensor; /** - * Generic NXT Analog Sensor driver + * Generic EV3 Analog Sensor driver * @author Anthony * */ @@ -17,7 +16,13 @@ public class EV3AnalogSensor extends Sensor { */ public static final String DRIVER_NAME = "ev3-analog"; - public EV3AnalogSensor(LegoPort port, String typeId) throws EV3LibraryException, InvalidPortException { + /** + * Creates a new EV3 analog sensor + * @param port The LegoPort instance + * @param typeId The sensor type ID, see here for more details. + * @throws EV3LibraryException If I/O goes wrong + */ + public EV3AnalogSensor(LegoPort port, String typeId) throws EV3LibraryException{ super(port); String drivername = port.getDriverName(); if (!drivername.equals(DRIVER_NAME + "-" + typeId)){ diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java index b2f86df..b3eab5b 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -1,12 +1,11 @@ package org.ev3dev.hardware.sensors.generic; import org.ev3dev.exception.EV3LibraryException; -import org.ev3dev.exception.InvalidPortException; import org.ev3dev.hardware.ports.LegoPort; import org.ev3dev.hardware.sensors.Sensor; /** - * Generic EV3 Analog Sensor driver + * Generic NXT Analog Sensor driver * @author Anthony * */ @@ -17,12 +16,19 @@ public class NXTAnalogSensor extends Sensor { */ public static final String DRIVER_NAME = "nxt-analog"; - public NXTAnalogSensor(LegoPort port) throws EV3LibraryException, InvalidPortException { + /** + * Creates a new NXT analog sensor + * @param port The LegoPort instance + * @throws EV3LibraryException If I/O goes wrong + */ + public NXTAnalogSensor(LegoPort port) throws EV3LibraryException{ super(port); String drivername = port.getDriverName(); if (!drivername.equals(DRIVER_NAME)){ throw new EV3LibraryException("The port is not connected to a NXT analog sensor: " + drivername); } } + + } From 1414056e8be6edb6b5dbab7f31ac517c0105c80a Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:31:53 +0800 Subject: [PATCH 35/75] Driver: NXT Analog Sensor: Implement modes --- .../sensors/generic/NXTAnalogSensor.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java index b3eab5b..ac20aba 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -11,6 +11,21 @@ */ public class NXTAnalogSensor extends Sensor { + /** + * ANALOG-0 Mode - Raw analog value + */ + public static final String MODE_ANALOG_0 = "ANALOG-0"; + + /** + * ANALOG-1 Mode - Raw analog value, Pin 5 high + */ + public static final String MODE_ANALOG_1 = "ANALOG-1"; + + /** + * The Sysfs value index + */ + public static final int VALUE_INDEX = 0; + /** * The NXT Analog sensor driver name */ @@ -29,6 +44,31 @@ public NXTAnalogSensor(LegoPort port) throws EV3LibraryException{ } } + /** + * Set mode as ANALOG-0 Mode - Raw analog value + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAnalog0() throws EV3LibraryException{ + setMode(MODE_ANALOG_0); + } + + /** + * Set mode as ANALOG-1 Mode - Raw analog value, Pin 5 high + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAnalog1() throws EV3LibraryException{ + setMode(MODE_ANALOG_1); + } + /** + * Returns the raw analog voltage / value.
+ * Both mode uses the same value index (value0) + * @throws EV3LibraryException If I/O goes wrong + * @return The voltage + */ + public int getValue() throws EV3LibraryException{ + String str = getAttribute("value" + VALUE_INDEX); + return Integer.parseInt(str); + } } From 49f02ba7ac9ba0751bd06729eacf41d738f02d73 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:36:36 +0800 Subject: [PATCH 36/75] Driver: NXT Analog Sensor: Decimal places --- .../sensors/generic/NXTAnalogSensor.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java index ac20aba..4608dd0 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -61,14 +61,35 @@ public void setModeAnalog1() throws EV3LibraryException{ } /** - * Returns the raw analog voltage / value.
- * Both mode uses the same value index (value0) + * Returns the raw analog voltage / value (0-5000).
+ * Both mode uses the same value index (value0)
+ *
+ * This function does not calculate decimal places. * @throws EV3LibraryException If I/O goes wrong * @return The voltage */ - public int getValue() throws EV3LibraryException{ + public int getRawValue() throws EV3LibraryException{ String str = getAttribute("value" + VALUE_INDEX); return Integer.parseInt(str); } + + /** + * Returns the raw analog voltage / value (0-5000), and with decimal places
+ * Both mode uses the same value index (value0)
+ * @throws EV3LibraryException If I/O goes wrong + * @return The voltage + */ + public float getValue() throws EV3LibraryException{ + float out = getRawValue(); + + int dec = getDecimals(); + for (int i = 0; i <= dec; i++){ + out /= 10; + } + + return out; + } + + //TODO Decimal places http://www.ev3dev.org/docs/sensors/generic-nxt-analog-sensor/ } From 3447ea20798febfc5f7e9c200e75a5d22aaa4fa5 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:41:45 +0800 Subject: [PATCH 37/75] Driver: EV3 Analog Sensor: Implement modes, values --- .../sensors/generic/EV3AnalogSensor.java | 47 +++++++++++++++++++ .../sensors/generic/NXTAnalogSensor.java | 4 +- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java index 202f5d2..c93248e 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/EV3AnalogSensor.java @@ -10,6 +10,16 @@ * */ public class EV3AnalogSensor extends Sensor { + + /** + * ANALOG Mode - Raw analog value + */ + public static final String MODE_ANALOG = "ANALOG"; + + /** + * The Sysfs value index + */ + public static final int VALUE_INDEX = 0; /** * The EV3 Analog sensor driver name @@ -29,5 +39,42 @@ public EV3AnalogSensor(LegoPort port, String typeId) throws EV3LibraryException{ throw new EV3LibraryException("The port is not connected to a EV3 analog sensor with type id \"" + typeId + "\": " + drivername); } } + + /** + * Set mode as ANALOG Mode - Raw analog value + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAnalog() throws EV3LibraryException{ + setMode(MODE_ANALOG); + } + + /** + * Returns the raw analog voltage / value (0-5000).
+ *
+ * This function does not calculate decimal places. + * @throws EV3LibraryException If I/O goes wrong + * @return The voltage + */ + public int getRawValue() throws EV3LibraryException{ + String str = getAttribute("value" + VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Returns the raw analog voltage / value (0-5000), and with decimal places
+ * @throws EV3LibraryException If I/O goes wrong + * @return The voltage + */ + public float getValue() throws EV3LibraryException{ + float out = getRawValue(); + + int dec = getDecimals(); + for (int i = 1; i <= dec; i++){ + out /= 10; + } + + return out; + } + } diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java index 4608dd0..864678f 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -83,13 +83,11 @@ public float getValue() throws EV3LibraryException{ float out = getRawValue(); int dec = getDecimals(); - for (int i = 0; i <= dec; i++){ + for (int i = 1; i <= dec; i++){ out /= 10; } return out; } - - //TODO Decimal places http://www.ev3dev.org/docs/sensors/generic-nxt-analog-sensor/ } From 296c92062cc3a23b25f4718024af231e74a6f735 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 21:46:32 +0800 Subject: [PATCH 38/75] I2CSensor: Disable driver check --- .../org/ev3dev/hardware/sensors/I2CSensor.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java index 3d7f555..2cbd722 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java @@ -22,10 +22,10 @@ public class I2CSensor extends Sensor { */ public static final String SYSFS_PROPERTY_POLL_MS = "poll_ms"; - /** - * This device's default driver name - */ - public static final String DRIVER_NAME = "nxt-i2c-sensor"; + ///** + // * This device's default driver name + // */ + //public static final String DRIVER_NAME = "nxt-i2c-sensor"; /** * Creates a new I2CSensor instance. @@ -36,9 +36,9 @@ public class I2CSensor extends Sensor { */ public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorException, EV3LibraryException { super(port); - if (!this.getDriverName().equals(DRIVER_NAME)){ - throw new InvalidSensorException("The specified port is not a I2C sensor."); - } + //if (!this.getDriverName().equals(DRIVER_NAME)){ + // throw new InvalidSensorException("The specified port is not a I2C sensor."); + //} } /** From 741a4bebee30395a473dd71e610e455f1bd10744 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 22:53:06 +0800 Subject: [PATCH 39/75] Add drivers: Pixy Cmucam 5 --- .../sensors/charmedlabs/PixyCmucam5.java | 474 ++++++++++++++++++ 1 file changed, 474 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java diff --git a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java new file mode 100644 index 0000000..7e4629c --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java @@ -0,0 +1,474 @@ +package org.ev3dev.hardware.sensors.charmedlabs; + +import org.ev3dev.exception.EV3LibraryException; +import org.ev3dev.hardware.ports.LegoPort; +import org.ev3dev.hardware.sensors.I2CSensor; + +/** + * Pixy Cmucam 5 for Lego + * @author Anthony + * + */ +public class PixyCmucam5 extends I2CSensor { + + /** + * ALL Mode - All + */ + public static final String MODE_ALL = "ALL"; + + /** + * ALL Mode - Signature low byte Sysfs value index + */ + public static final int MODE_ALL_SIG_LOW_BYTE_VALUE_INDEX = 0; + + /** + * ALL Mode - Signature high byte Sysfs value index + */ + public static final int MODE_ALL_SIG_HIGH_BYTE_VALUE_INDEX = 1; + + /** + * ALL Mode - X Sysfs value index + */ + public static final int MODE_ALL_X_VALUE_INDEX = 2; + + /** + * ALL Mode - Y Sysfs value index + */ + public static final int MODE_ALL_Y_VALUE_INDEX = 3; + + /** + * ALL Mode - Width Sysfs value index + */ + public static final int MODE_ALL_WIDTH_VALUE_INDEX = 4; + + /** + * ALL Mode - Height Sysfs value index + */ + public static final int MODE_ALL_HEIGHT_VALUE_INDEX = 5; + + /** + * SIG[N] Mode (All signature modes) - Count Sysfs value index + */ + public static final int MODE_SIG_COUNT_VALUE_INDEX = 0; + + /** + * SIG[N] Mode (All signature modes) - X Sysfs value index + */ + public static final int MODE_SIG_X_VALUE_INDEX = 1; + + /** + * SIG[N] Mode (All signature modes) - Y Sysfs value index + */ + public static final int MODE_SIG_Y_VALUE_INDEX = 2; + + /** + * SIG[N] Mode (All signature modes) - Width Sysfs value index + */ + public static final int MODE_SIG_WIDTH_VALUE_INDEX = 3; + + /** + * SIG[N] Mode (All signature modes) - Height Sysfs value index + */ + public static final int MODE_SIG_HEIGHT_VALUE_INDEX = 4; + + /** + * The prefix of modes SIG[N], where SIG is the prefix. + */ + public static final String PREFIX_MODE_SIG = "SIG"; + + /** + * SIG1 Mode - Signature #1 + */ + public static final String MODE_SIG1 = "SIG1"; + + /** + * SIG2 Mode - Signature #2 + */ + public static final String MODE_SIG2 = "SIG2"; + + /** + * SIG3 Mode - Signature #3 + */ + public static final String MODE_SIG3 = "SIG3"; + + /** + * SIG4 Mode - Signature #4 + */ + public static final String MODE_SIG4 = "SIG4"; + + /** + * SIG5 Mode - Signature #5 + */ + public static final String MODE_SIG5 = "SIG5"; + + /** + * SIG6 Mode - Signature #6 + */ + public static final String MODE_SIG6 = "SIG6"; + + /** + * SIG7 Mode - Signature #7 + */ + public static final String MODE_SIG7 = "SIG7"; + + /** + * Vendor ID + */ + public static final String VENDOR_ID = "Pixy"; + + /** + * Product ID + */ + public static final String PRODUCT_ID = "Pixy"; + + /** + * Pixy Cmucam 5 Sensor driver name + */ + public static final String DRIVER_NAME = "pixy-lego"; + + /** + * Address + */ + public static final byte ADDRESS = 0x01; + + /** + * Creates a new Pixy Cmucam 5 instnace + * @param port The LegoPort instance + * @throws EV3LibraryException If I/O goes wrong + */ + public PixyCmucam5(LegoPort port) throws EV3LibraryException { + super(port); + } + + /** + * Returns the vendor id + * @return Vendor Id + */ + public String getVendorId(){ + return VENDOR_ID; + } + + /** + * Returns the product id + * @return Product Id + */ + public String getProductId(){ + return PRODUCT_ID; + } + + /** + * Set mode to ALL.
+ *
+ * And returns a ModeAll instance for communication. + * @return ModeAll instance + */ + public ModeAll modeAll(){ + setMode(MODE_ALL); + return new ModeAll(MODE_ALL); + } + + /** + * Set mode to SIG[N], where [N] is the integer parameter specified
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig(int sigcount){ + setMode(PREFIX_MODE_SIG + sigcount); + return new ModeSig(PREFIX_MODE_SIG + sigcount); + } + + /** + * Set mode to SIG1
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig1(){ + return modeSig(1); + } + + /** + * Set mode to SIG2
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig2(){ + return modeSig(2); + } + + /** + * Set mode to SIG3
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig3(){ + return modeSig(3); + } + + /** + * Set mode to SIG4
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig4(){ + return modeSig(4); + } + + /** + * Set mode to SIG5
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig5(){ + return modeSig(5); + } + + /** + * Set mode to SIG6
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig6(){ + return modeSig(6); + } + + /** + * Set mode to SIG7
+ *
+ * And returns a ModeSig instance for communication. + * @return ModeSig instance + */ + public ModeSig modeSig7(){ + return modeSig(7); + } + + /** + * A class to communicate with Pixy Cmucam 5 using mode ALL + * @author Anthony + * + */ + class ModeAll { + + private final String mode; + + private boolean autoSwitchMode = true; + + private ModeAll(String mode){ + this.mode = mode; + } + + /** + * Check mode and switch automatically if autoSwitchMode is false
+ * Otherwise, EV3LibraryException will be thrown.
+ *
+ * Formerly called Fix Mode. + * @throws EV3LibraryException + */ + private void fixMode() throws EV3LibraryException{ + String currMode = getMode(); + if (!currMode.equals(mode)){ + if (autoSwitchMode){ + setMode(mode); + } else { + throw new EV3LibraryException("[Auto Switch Mode Off] You cannot use this function of mode " + mode + " with the current mode: " + currMode); + } + } + } + + /** + * Sets whether it should switch mode automatically if the mode is invalid.
+ * By default, it will auto switch mode. + * @param autoSwitchMode Switch or not + */ + public void setAutoSwitchMode(boolean autoSwitchMode){ + this.autoSwitchMode = autoSwitchMode; + } + + /** + * Returns whether it will auto switch mode or not. + * @return Boolean + */ + public boolean isAutoSwitchMode(){ + return autoSwitchMode; + } + + /** + * Get the signature low byte + * @return A byte representing the signature low byte + * @throws EV3LibraryException If I/O goes wrong + */ + public byte getSignatureLowByte() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_ALL_SIG_LOW_BYTE_VALUE_INDEX); + return Byte.parseByte(str); + } + + /** + * Get the signature high byte + * @return A byte representing the signature high byte + * @throws EV3LibraryException If I/O goes wrong + */ + public byte getSignatureHighByte() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_ALL_SIG_HIGH_BYTE_VALUE_INDEX); + return Byte.parseByte(str); + } + + /** + * Get the X point + * @return X point + * @throws EV3LibraryException If I/O goes wrong + */ + public int getX() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_ALL_X_VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Get the Y point + * @return Y point + * @throws EV3LibraryException If I/O goes wrong + */ + public int getY() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_ALL_Y_VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Get the width + * @return Width + * @throws EV3LibraryException If I/O goes wrong + */ + public int getWidth() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_ALL_WIDTH_VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Get the height + * @return Height + * @throws EV3LibraryException If I/O goes wrong + */ + public int getHeight() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_ALL_HEIGHT_VALUE_INDEX); + return Integer.parseInt(str); + } + } + + /** + * A class to communicate with Pixy Cmucam 5 using mode SIG[N] + * @author Anthony + * + */ + class ModeSig { + + private final String mode; + + private boolean autoSwitchMode = true; + + private ModeSig(String mode){ + this.mode = mode; + } + + /** + * Check mode and switch automatically if autoSwitchMode is false
+ * Otherwise, EV3LibraryException will be thrown.
+ *
+ * Formerly called Fix Mode. + * @throws EV3LibraryException + */ + private void fixMode() throws EV3LibraryException{ + String currMode = getMode(); + if (!currMode.equals(mode)){ + if (autoSwitchMode){ + setMode(mode); + } else { + throw new EV3LibraryException("[Auto Switch Mode Off] You cannot use this function of mode " + mode + " with the current mode: " + currMode); + } + } + } + + /** + * Sets whether it should switch mode automatically if the mode is invalid.
+ * By default, it will auto switch mode. + * @param autoSwitchMode Switch or not + */ + public void setAutoSwitchMode(boolean autoSwitchMode){ + this.autoSwitchMode = autoSwitchMode; + } + + /** + * Returns whether it will auto switch mode or not. + * @return Boolean + */ + public boolean isAutoSwitchMode(){ + return autoSwitchMode; + } + + /** + * Get the count + * @return Count + * @throws EV3LibraryException If I/O goes wrong + */ + public byte getCount() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_SIG_COUNT_VALUE_INDEX); + return Byte.parseByte(str); + } + + /** + * Get the X point + * @return X point + * @throws EV3LibraryException If I/O goes wrong + */ + public int getX() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_SIG_X_VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Get the Y point + * @return Y point + * @throws EV3LibraryException If I/O goes wrong + */ + public int getY() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_SIG_Y_VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Get the width + * @return Width + * @throws EV3LibraryException If I/O goes wrong + */ + public int getWidth() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_SIG_WIDTH_VALUE_INDEX); + return Integer.parseInt(str); + } + + /** + * Get the height + * @return Height + * @throws EV3LibraryException If I/O goes wrong + */ + public int getHeight() throws EV3LibraryException{ + fixMode(); + String str = getAttribute("value" + MODE_SIG_HEIGHT_VALUE_INDEX); + return Integer.parseInt(str); + } + } + +} From ee7b93807681ecea50bd0ffbc2c77431326b4e55 Mon Sep 17 00:00:00 2001 From: mob41 Date: Tue, 6 Sep 2016 22:58:32 +0800 Subject: [PATCH 40/75] Driver: Pixy Cmucam 5: Visibility fixes --- .../org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java index 7e4629c..4077f50 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java +++ b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java @@ -253,7 +253,7 @@ public ModeSig modeSig7(){ * @author Anthony * */ - class ModeAll { + public class ModeAll { private final String mode; @@ -370,7 +370,7 @@ public int getHeight() throws EV3LibraryException{ * @author Anthony * */ - class ModeSig { + public class ModeSig { private final String mode; From e08beb3e01023b0c876963a0c60069f2eae22b26 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 7 Sep 2016 18:27:51 +0800 Subject: [PATCH 41/75] Update some JavaDoc and rename PixyCmucam5 --- src/main/java/org/ev3dev/hardware/Device.java | 2 +- .../java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java | 2 +- .../java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java | 2 +- src/main/java/org/ev3dev/hardware/motors/Motor.java | 2 +- .../charmedlabs/{PixyCmucam5.java => PixyCmucam5Sensor.java} | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) rename src/main/java/org/ev3dev/hardware/sensors/charmedlabs/{PixyCmucam5.java => PixyCmucam5Sensor.java} (94%) diff --git a/src/main/java/org/ev3dev/hardware/Device.java b/src/main/java/org/ev3dev/hardware/Device.java index 8e36a68..16eec85 100644 --- a/src/main/java/org/ev3dev/hardware/Device.java +++ b/src/main/java/org/ev3dev/hardware/Device.java @@ -83,7 +83,7 @@ public void setClassName(String className){ /** * Set the Sysfs class full name (including prefix if any) - * @param className The Sysfs class name located in /sys/class/[className] + * @param classFullName The Sysfs class name located in /sys/class/[className] */ public void setClassFullname(String classFullName){ this.classFullName = classFullName; diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java index 0b1455a..52b2cd9 100644 --- a/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL12100Motor.java @@ -67,7 +67,7 @@ public int getCountPerMetre() throws EV3LibraryException{ * to calculate the maximum travel distance of the motor. * (linear motors only) * @return Full Travel Count - * @throws EV3LibraryException + * @throws EV3LibraryException If I/O goes wrong */ public int getFullTravelCount() throws EV3LibraryException{ if (!this.isConnected()){ diff --git a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java index 3fef3e5..ea1d49f 100644 --- a/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/FirgelliL1250Motor.java @@ -67,7 +67,7 @@ public int getCountPerMetre() throws EV3LibraryException{ * to calculate the maximum travel distance of the motor. * (linear motors only) * @return Full Travel Count - * @throws EV3LibraryException + * @throws EV3LibraryException If I/O goes wrong */ public int getFullTravelCount() throws EV3LibraryException{ if (!this.isConnected()){ diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index db717ed..fa77329 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -731,7 +731,7 @@ public String getStopAction() throws EV3LibraryException{ /** * Reading returns the current stop command. Writing sets the stop command. The value determines the motors behavior when command is set to stop. * Also, it determines the motors behavior when a run command completes. See stop_commands for a list of possible values. - * @param stop_command A stop command that listed using getStopCommands() + * @param stop_action A stop command that listed using getStopCommands() * @throws EV3LibraryException If I/O goes wrong */ public void setStopAction(String stop_action) throws EV3LibraryException{ diff --git a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java similarity index 94% rename from src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java rename to src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java index 4077f50..2442cd6 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5.java +++ b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java @@ -9,7 +9,7 @@ * @author Anthony * */ -public class PixyCmucam5 extends I2CSensor { +public class PixyCmucam5Sensor extends I2CSensor { /** * ALL Mode - All @@ -136,7 +136,7 @@ public class PixyCmucam5 extends I2CSensor { * @param port The LegoPort instance * @throws EV3LibraryException If I/O goes wrong */ - public PixyCmucam5(LegoPort port) throws EV3LibraryException { + public PixyCmucam5Sensor(LegoPort port) throws EV3LibraryException { super(port); } @@ -171,6 +171,7 @@ public ModeAll modeAll(){ * Set mode to SIG[N], where [N] is the integer parameter specified
*
* And returns a ModeSig instance for communication. + * @param sigcount The value [N] of mode SIG[N]. (e.g. SIG1 specify 1) * @return ModeSig instance */ public ModeSig modeSig(int sigcount){ From ac3000a9adf42976d62310b1024f532f2403f6f3 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 7 Sep 2016 23:55:25 +0800 Subject: [PATCH 42/75] Maven Central: Modify pom.xml and add settings.xml --- pom.xml | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 2b95a39..1d7d9d4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,31 +9,14 @@ 1.7 1.7 - - - - maven-surefire-plugin - 2.10 - - false - - - - maven-assembly-plugin - - - package - - single - - - - - - jar-with-dependencies - - - - - + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + \ No newline at end of file From d7b1180bfa85a5a3cdae605384ddb254d5351061 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 7 Sep 2016 23:57:11 +0800 Subject: [PATCH 43/75] Maven Central: Add settings.xml --- settings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 settings.xml diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000..b16d835 --- /dev/null +++ b/settings.xml @@ -0,0 +1,9 @@ + + + + ossrh + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + \ No newline at end of file From 5fa6353bcd1607446774f1d21b240d6b3647bdd1 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 7 Sep 2016 23:59:02 +0800 Subject: [PATCH 44/75] Move something --- .travis.yml | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 190731e..85efdd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,39 +2,8 @@ language: java install: true -before_deploy: -- echo - - - - - - - - - - - - - - - - - - - -- echo M a v e n P a c k a g i n g -- echo - - - - - - - - - - - - - - - - - - - -- mvn package -- echo - - - - - - - - - - - - - - - - - -- echo E n d M a v e n P k g -- echo - - - - - - - - - - - - - - - - - -- ls -R -- echo ===================================== -- echo Automatic development preparation -- echo ===================================== -- echo This state:.$TRAVIS_BRANCH -- echo Project Version:.$projectversion -- git config --global user.email "builds@travis-ci.com" -- git config --global user.name "Travis CI" -- export GIT_TAG=$projectversion-$TRAVIS_BRANCH-B$TRAVIS_BUILD_NUMBER -- git tag $GIT_TAG -a -m "Generated tag from TravisCI for $TRAVIS_BRANCH build $TRAVIS_BUILD_NUMBER" -- git push -q https://$GITPERM@github.com/mob41/ev3dev-lang-java --tags -- echo ===================================== -- echo Deploy Preparation done. -- echo ===================================== - -deploy: - - provider: releases - skip_cleanup: true - api_key: $GITPERM - file: - - target/ev3dev-lang-java-$projectversion.jar - - target/ev3dev-lang-java-$projectversion-jar-with-dependencies.jar - on: - tags: false - branch: master +after_success: +- branches: only: From e4b1ebf0801f87c342bfd0387a53210ffabaa434 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 00:05:24 +0800 Subject: [PATCH 45/75] Maven Central: Update .travis.yml --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85efdd2..f49e2a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ language: java install: true after_success: -- +- ls +- mvn deploy --settings settings.xml branches: only: @@ -11,4 +12,6 @@ branches: - develop env: -- projectversion=1.0.0-SNAPSHOT \ No newline at end of file + global: + - secure: "GcIwBLB8ZVeUtxibJsnbvtol/msXvSv2+iIjbf2ZW13f75E5J3mpsE/yzcATStjGSK2KXf4KKpwaqj5XI76I53qrbo5fmAQtHVJ13CoPYgDesRbMj2KKQHlr2tuXHYMjp85KvWMlPR8idZ7YBy4GFnoBZzH3N517K/X2kwsQHrKz2m/7MVtZoNgWSr3FZZW+BkUK6L0rebKECxICqtCua2XoL2j1UwfN/u4fk4qdPGaOWhhaSgjIdvlPRqikZXJ0Ia9X/ankJ89Ee0M6iLOJ3mjOZMPQU06XGu6Etse7jy2w3jaYgZaTjQ1ekIZXIDRP9pwaZ1ew+vHZSC3Ug97jSeevQmaKW+IwrXOZXp4ID4Uo2fYUSVcBB9zkAaZNO/Xu+viXuCgIVVl9DCevOT89Vq2OAEBJ9k/EgIy7njup7k6p0QKKl8id9gd59XN9pinYgM8g8ltdBfbIRAYCz+5m4PGAkE3IKzY3FxFAnrp+Qgs4LPB4Z4hTni+LeJGzw2RtUGHBq9HcmOSJ8tFGNUrtFXB+/06CqsugtmDF5aDXfuVGPzJoaq1Hs5wytzt4GhtUDyPhoNmaElBnkR1oIUhQ9bjtRJvQkH4RExsXJjOzThNHQfydTBcE/nwhLWKoYLO8//wcbYi22UJXgjbSWS/PeUNkm+JrGLws7QgjwZEc+Pc=" + - secure: "EsZpjMxtRHHbmIz/eS/i2rAzRD3BzpGti//gTyLMXv1nbs7eHjJdYu4qjM4Ry0SzR+OIcTZk0+qsdjzZqeN8VgR+OpDp86lvZDCy4rKey3sXsgOlxFBMeQ5DJaJgIMosyeAu/o+s75bYAu2PMq8AmfQS8KX6qppF+GfxLKMUd8RYfZCls/VGovZs4Fn5LRa/tGsmrBbq+QxVLRApt9GaRd7vpZ48b6LfxOd/xkH7c9rD4nTzMusFrveE5KAgK6P5XdPeRzeDbtVXFbdL6Gw7ZasSxwhh+d8Chv3ffVCD3s9zvsIv9JJUjbKNCvTBNFP9pHZxckNvd3ZK8gY809iK2BRNMpYKCcH5n3lJkL9YU224bTqUSQbe/ozDvR2Rs26S8WuHHm5BBsg5MRwQJFvGzVnt650rCqDNxSVPGYxTuzpa3lvC9z8aFadVYbKec8CoHd+u4yNe5eW13bNTbV/rI0j1WfC2Ked+O9De0AlumcS/Z0cUXASS0duemFWwdirRheCRPDbp57K2XGj3EdQbMsU/0s1llcbTS8YFqLtDU6zPZuMbwTx0Bcfk7tjzkAc84g3zUCeCg9vN3QZYVFsZDq6pGx31FrGy1HQRA8uaGFE2Liq6rgzFElJUOPf6BO7Pv0FhvtTorzw3EjnLZZfP0iG3Br/JJWjCCfnO5r6CZxk=" From d9d78694e35c2a9192bba01f50a0f87db3f5fa56 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 00:26:47 +0800 Subject: [PATCH 46/75] Temporary disable uploading to sonatype --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f49e2a6..a035f78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ after_success: - mvn deploy --settings settings.xml branches: - only: + except: - master - develop From 83a2684a5e1ee9f45ae3876c307a9de1f50e1495 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 01:17:54 +0800 Subject: [PATCH 47/75] Update README.md and pom.xml --- README.md | 28 +++++++++++++++++++++++++++- pom.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e63512..058e939 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,30 @@ You can build your own library with some steps. >cd target -6. There should have ```ev3dev-lang-java-x.x.x-x.jar``` and ```ev3dev-lang-java-x.x.x-x-jar-with-dependencies.jar``` in the directory. \ No newline at end of file +6. There should have ```ev3dev-lang-java-x.x.x-x.jar``` and ```ev3dev-lang-java-x.x.x-x-jar-with-dependencies.jar``` in the directory. + +## License + +This project is based on the MIT License + +>MIT License +> +>Copyright (c) 2016 Anthony Law +> +>Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +> +>The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +> +>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1d7d9d4..fbcf4aa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,38 @@ org.ev3dev ev3dev-lang-java 1.0.0-SNAPSHOT + ev3dev-lang-java An ev3dev programming language binding for Java. + https://github.com/mob41/ev3dev-lang-java + + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + + + Anthony Law + anthonylaw0401@gmail.com + Anthony Law + http://github.com/mob41 + + + + + scm:git:git://github.com/mob41/ev3dev-lang-java.git + scm:git:ssh://github.com:mob41/ev3dev-lang-java.git + http://github.com/mob41/ev3dev-lang-java/tree/master + + 1.7 1.7 + ossrh From 5ec1b9c5155ca6a9540c927406200cb3e275f82f Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 16:27:20 +0800 Subject: [PATCH 48/75] Update deploy things --- .travis.yml | 7 ++++++- pom.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ settings.xml | 12 ++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a035f78..9ee48e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,16 @@ language: java install: true +before_install: +- sudo apt-get update +- sudo apt-get install gnupg gnupg2 + after_success: - ls - mvn deploy --settings settings.xml branches: - except: + only: - master - develop @@ -15,3 +19,4 @@ env: global: - secure: "GcIwBLB8ZVeUtxibJsnbvtol/msXvSv2+iIjbf2ZW13f75E5J3mpsE/yzcATStjGSK2KXf4KKpwaqj5XI76I53qrbo5fmAQtHVJ13CoPYgDesRbMj2KKQHlr2tuXHYMjp85KvWMlPR8idZ7YBy4GFnoBZzH3N517K/X2kwsQHrKz2m/7MVtZoNgWSr3FZZW+BkUK6L0rebKECxICqtCua2XoL2j1UwfN/u4fk4qdPGaOWhhaSgjIdvlPRqikZXJ0Ia9X/ankJ89Ee0M6iLOJ3mjOZMPQU06XGu6Etse7jy2w3jaYgZaTjQ1ekIZXIDRP9pwaZ1ew+vHZSC3Ug97jSeevQmaKW+IwrXOZXp4ID4Uo2fYUSVcBB9zkAaZNO/Xu+viXuCgIVVl9DCevOT89Vq2OAEBJ9k/EgIy7njup7k6p0QKKl8id9gd59XN9pinYgM8g8ltdBfbIRAYCz+5m4PGAkE3IKzY3FxFAnrp+Qgs4LPB4Z4hTni+LeJGzw2RtUGHBq9HcmOSJ8tFGNUrtFXB+/06CqsugtmDF5aDXfuVGPzJoaq1Hs5wytzt4GhtUDyPhoNmaElBnkR1oIUhQ9bjtRJvQkH4RExsXJjOzThNHQfydTBcE/nwhLWKoYLO8//wcbYi22UJXgjbSWS/PeUNkm+JrGLws7QgjwZEc+Pc=" - secure: "EsZpjMxtRHHbmIz/eS/i2rAzRD3BzpGti//gTyLMXv1nbs7eHjJdYu4qjM4Ry0SzR+OIcTZk0+qsdjzZqeN8VgR+OpDp86lvZDCy4rKey3sXsgOlxFBMeQ5DJaJgIMosyeAu/o+s75bYAu2PMq8AmfQS8KX6qppF+GfxLKMUd8RYfZCls/VGovZs4Fn5LRa/tGsmrBbq+QxVLRApt9GaRd7vpZ48b6LfxOd/xkH7c9rD4nTzMusFrveE5KAgK6P5XdPeRzeDbtVXFbdL6Gw7ZasSxwhh+d8Chv3ffVCD3s9zvsIv9JJUjbKNCvTBNFP9pHZxckNvd3ZK8gY809iK2BRNMpYKCcH5n3lJkL9YU224bTqUSQbe/ozDvR2Rs26S8WuHHm5BBsg5MRwQJFvGzVnt650rCqDNxSVPGYxTuzpa3lvC9z8aFadVYbKec8CoHd+u4yNe5eW13bNTbV/rI0j1WfC2Ked+O9De0AlumcS/Z0cUXASS0duemFWwdirRheCRPDbp57K2XGj3EdQbMsU/0s1llcbTS8YFqLtDU6zPZuMbwTx0Bcfk7tjzkAc84g3zUCeCg9vN3QZYVFsZDq6pGx31FrGy1HQRA8uaGFE2Liq6rgzFElJUOPf6BO7Pv0FhvtTorzw3EjnLZZfP0iG3Br/JJWjCCfnO5r6CZxk=" + - secure: "M8il7KAiot0/P+PNKzhTVDCeFbL99PIDiG8O3kZaRaj1oMlO7VKQkm9LD1ZhBEQJm7MsyO4dr9ScXa6rEsB8B1hRmP062EL/0/7cwvZhj3xLc2dP8Jl7JNuZF3XwiQnqin61nXaKCzfpF7rQv/lz1FhCVytTwbUWBKVKPcjg5auk4gGQU0FWk0UgOiyB/8pMFPwRo9emBS/DCCt61/P9TTZwZsFpyWpWEe34SZ9xNU8qYdjP2z1pJtDNX0Uw89NBF5aFY8JSj17yp1LYoZhG8NhjpkYY6tahs21vuT24grFBcapuo1gkXKTV0GRdiI0XQn54Poto9n2Rn0/Ewx/fCP/MWTJVNHq9ddbqerY/+pd7DZCtlAjHvLVFAwxVXmJaHLYtgf14h2VHTM6V9ba5kRZxviaWmEU60IhVZ2KHeWzhSAeNI/XzHgczceYeK+t2MUNWM0Z4gzLZhVlCO2ZCCpOo8RHiPAIP+NMeM0+zOcX5D5jujkXP19SNbFNINaTUiUH7+Wa3/cRwQ2qcTF2OiJPVB7FBCgmaDz5OFIow+o3Q4BQKRbrApLpoE5oHiFVGBLvVo55NqMw9pBmz3B/4dnBHaB5xDa2DKnHN7eJKXBCH0VenkkqhpEfw6vwz384fsE39tMFLamhmMhlwvMQAKupQJUoaiPYESw/L+wXWfzY=" \ No newline at end of file diff --git a/pom.xml b/pom.xml index fbcf4aa..976360e 100644 --- a/pom.xml +++ b/pom.xml @@ -45,4 +45,49 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + \ No newline at end of file diff --git a/settings.xml b/settings.xml index b16d835..8071dcc 100644 --- a/settings.xml +++ b/settings.xml @@ -6,4 +6,16 @@ ${env.CI_DEPLOY_PASSWORD} + + + ossrh + + true + + + gpg2 + ${env.CI_KEY_PASSPHRASE} + + + \ No newline at end of file From adae7d04f94c7b70c70839c9aef92b3efa57d6e0 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 16:35:43 +0800 Subject: [PATCH 49/75] Removed all invalid characters --- src/main/java/org/ev3dev/hardware/Button.java | 2 +- src/main/java/org/ev3dev/hardware/Device.java | 2 +- src/main/java/org/ev3dev/hardware/LED.java | 2 +- src/main/java/org/ev3dev/hardware/PowerSupply.java | 2 +- src/main/java/org/ev3dev/hardware/motors/DCMotor.java | 4 ++-- src/main/java/org/ev3dev/hardware/motors/Motor.java | 4 ++-- src/main/java/org/ev3dev/hardware/motors/ServoMotor.java | 4 ++-- src/main/java/org/ev3dev/hardware/sensors/Sensor.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/Button.java b/src/main/java/org/ev3dev/hardware/Button.java index 38226e3..1dc681b 100644 --- a/src/main/java/org/ev3dev/hardware/Button.java +++ b/src/main/java/org/ev3dev/hardware/Button.java @@ -9,7 +9,7 @@ /*** * Provides a generic button reading mechanism that can be adapted to platform specific implementations. - * Each platformˇ¦s specific button capabilites are enumerated in the ˇĄplatformsˇ¦ section of this specification. + * Each platform's specific button capabilites are enumerated in the 'platforms' section of this specification. * @author Anthony * */ diff --git a/src/main/java/org/ev3dev/hardware/Device.java b/src/main/java/org/ev3dev/hardware/Device.java index 16eec85..ae0262c 100644 --- a/src/main/java/org/ev3dev/hardware/Device.java +++ b/src/main/java/org/ev3dev/hardware/Device.java @@ -10,7 +10,7 @@ /** * This is the base class that handles control tasks for a single port or index. The class must chose one device out of the available ports to control. Given an IO port (in the constructor), an implementation should:

-- If the specified port is blank or unspecified/undefined/null, the available devices should be enumerated until a suitable device is found. Any device is suitable when itˇ¦s type is known to be compatible with the controlling class, and it meets any other requirements specified by the caller.
+- If the specified port is blank or unspecified/undefined/null, the available devices should be enumerated until a suitable device is found. Any device is suitable when it's type is known to be compatible with the controlling class, and it meets any other requirements specified by the caller.

- If the specified port name is not blank, the available devices should be enumerated until a device is found that is plugged in to the specified port. The supplied port name should be compared directly to the value from the file, so that advanced port strings will match, such as in1:mux3.

diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index 761e25f..cc08796 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -160,7 +160,7 @@ public String[] getTriggers() throws EV3LibraryException{ /** * Gets the led trigger. A trigger is a kernel based source of led events. Triggers can either be simple or complex. - * A simple trigger isnˇ¦t configurable and is designed to slot into existing subsystems with minimal additional code. + * A simple trigger isn't configurable and is designed to slot into existing subsystems with minimal additional code. * Examples are the ide-disk and nand-disk triggers.
*
* Complex triggers whilst available to all LEDs have LED specific parameters and work on a per LED basis. The timer diff --git a/src/main/java/org/ev3dev/hardware/PowerSupply.java b/src/main/java/org/ev3dev/hardware/PowerSupply.java index 53c6949..27eb760 100644 --- a/src/main/java/org/ev3dev/hardware/PowerSupply.java +++ b/src/main/java/org/ev3dev/hardware/PowerSupply.java @@ -7,7 +7,7 @@ import org.ev3dev.io.Sysfs; /*** - * A generic interface to read data from the systemˇ¦s power_supply class. Uses the built-in legoev3-battery if none is specified. + * A generic interface to read data from the system's power_supply class. Uses the built-in legoev3-battery if none is specified. * @author Anthony * */ diff --git a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java index 1ed14b5..2707c23 100644 --- a/src/main/java/org/ev3dev/hardware/motors/DCMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/DCMotor.java @@ -367,7 +367,7 @@ public void setStopAction(String stop_command) throws EV3LibraryException{ * terminals together. This load will absorb the energy from the rotation of the motors * and cause the motor to stop more quickly than coasting. hold does not remove power from * the motor. Instead it actively try to hold the motor at the current position. - * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. + * If an external force tries to turn the motor, the motor will 'push back' to maintain its position. * @return A list of stop modes supported by the motor controller * @throws EV3LibraryException If I/O goes wrong */ @@ -383,7 +383,7 @@ public String getStopActionsViaString() throws EV3LibraryException{ * terminals together. This load will absorb the energy from the rotation of the motors * and cause the motor to stop more quickly than coasting. hold does not remove power from * the motor. Instead it actively try to hold the motor at the current position. - * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. + * If an external force tries to turn the motor, the motor will 'push back' to maintain its position. * @return A list of stop modes supported by the motor controller * @throws EV3LibraryException If I/O goes wrong */ diff --git a/src/main/java/org/ev3dev/hardware/motors/Motor.java b/src/main/java/org/ev3dev/hardware/motors/Motor.java index fa77329..dff8009 100644 --- a/src/main/java/org/ev3dev/hardware/motors/Motor.java +++ b/src/main/java/org/ev3dev/hardware/motors/Motor.java @@ -754,7 +754,7 @@ public void setStopAction(String stop_action) throws EV3LibraryException{ * terminals together. This load will absorb the energy from the rotation of the motors * and cause the motor to stop more quickly than coasting. hold does not remove power from * the motor. Instead it actively try to hold the motor at the current position. - * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. + * If an external force tries to turn the motor, the motor will 'push back' to maintain its position. * @return A list of stop modes supported by the motor controller * @throws EV3LibraryException If I/O goes wrong */ @@ -773,7 +773,7 @@ public String getStopCommandsViaString() throws EV3LibraryException{ * terminals together. This load will absorb the energy from the rotation of the motors * and cause the motor to stop more quickly than coasting. hold does not remove power from * the motor. Instead it actively try to hold the motor at the current position. - * If an external force tries to turn the motor, the motor will ˇĄpush backˇ¦ to maintain its position. + * If an external force tries to turn the motor, the motor will 'push back' to maintain its position. * @return A list of stop modes supported by the motor controller * @throws EV3LibraryException If I/O goes wrong */ diff --git a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java index 81a4a0a..bd22e42 100644 --- a/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java +++ b/src/main/java/org/ev3dev/hardware/motors/ServoMotor.java @@ -173,7 +173,7 @@ public void setMaxPulse_SP(int max_pulse_sp) throws EV3LibraryException{ /** * Used to set the pulse size in milliseconds for the signal that tells the servo to drive to the mid position_sp. * Default value is 1500. Valid values are 1300 to 1700. For example, on a 180 degree servo, this would be 90 degrees. - * On continuous rotation servo, this is the ˇĄneutralˇ¦ position_sp where the motor does not turn. + * On continuous rotation servo, this is the 'neutral' position_sp where the motor does not turn. * You must write to the position_sp attribute for changes to this attribute to take effect. * @return The pulse size in milliseconds * @throws EV3LibraryException If I/O goes wrong @@ -186,7 +186,7 @@ public int getMidPulse_SP() throws EV3LibraryException{ /** * Used to set the pulse size in milliseconds for the signal that tells the servo to drive to the mid position_sp. * Default value is 1500. Valid values are 1300 to 1700. For example, on a 180 degree servo, this would be 90 degrees. - * On continuous rotation servo, this is the ˇĄneutralˇ¦ position_sp where the motor does not turn. + * On continuous rotation servo, this is the 'neutral' position_sp where the motor does not turn. * You must write to the position_sp attribute for changes to this attribute to take effect. * @param mid_pulse_sp The pulse size in milliseconds * @throws EV3LibraryException If I/O goes wrong diff --git a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java index fa46562..deea682 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/Sensor.java @@ -15,7 +15,7 @@ *
* Since the name of the sensor[N] device node does not correspond to the port that a sensor is plugged in * to, you must look at the address attribute if you need to know which port a sensor is plugged in to. - * However, if you donˇ¦t have more than one sensor of each type, you can just look for a matching driver_name. + * However, if you don't have more than one sensor of each type, you can just look for a matching driver_name. * Then it will not matter which port a sensor is plugged in to - your program will still work. * @author Anthony * From 5c3fb72905ba20433ba0c55a90e5dcd70246af7b Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 16:38:21 +0800 Subject: [PATCH 50/75] Removed invalid charachers (again) --- src/main/java/org/ev3dev/hardware/LED.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index cc08796..ae7f96a 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -177,7 +177,7 @@ public String getTrigger() throws EV3LibraryException{ /** * Sets the led trigger. A trigger is a kernel based source of led events. Triggers can either be simple or complex. - * A simple trigger isnˇ¦t configurable and is designed to slot into existing subsystems with minimal additional code. + * A simple trigger isn't configurable and is designed to slot into existing subsystems with minimal additional code. * Examples are the ide-disk and nand-disk triggers.
*
* Complex triggers whilst available to all LEDs have LED specific parameters and work on a per LED basis. The timer From 39e65202370365331a59ee5c7b27d81dd4c41813 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 18:43:59 +0800 Subject: [PATCH 51/75] Add deploy things --- .travis.yml | 8 +++++++- .travis/codesigning.asc.enc | Bin 0 -> 5488 bytes 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .travis/codesigning.asc.enc diff --git a/.travis.yml b/.travis.yml index 9ee48e0..3970953 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,16 @@ install: true before_install: - sudo apt-get update - sudo apt-get install gnupg gnupg2 +- if [[ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then + openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d + gpg --fast-import .travis/codesigning.asc + fi after_success: - ls -- mvn deploy --settings settings.xml +- if [[ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then + mvn deploy --settings settings.xml + fi branches: only: diff --git a/.travis/codesigning.asc.enc b/.travis/codesigning.asc.enc new file mode 100644 index 0000000000000000000000000000000000000000..4248ed20fb67810d05aac1c82ab2a5d3fbc92ccf GIT binary patch literal 5488 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 Date: Thu, 8 Sep 2016 18:49:42 +0800 Subject: [PATCH 52/75] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3970953..93db24e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,14 @@ install: true before_install: - sudo apt-get update - sudo apt-get install gnupg gnupg2 -- if [[ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then +- if ( [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ] ) && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d gpg --fast-import .travis/codesigning.asc fi after_success: - ls -- if [[ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then +- if ( [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ] ) && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then mvn deploy --settings settings.xml fi From c0edb38f8327dcd91174d4c0b8595c6b0be5e278 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 18:56:49 +0800 Subject: [PATCH 53/75] Update .travis.yml (2) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93db24e..628b7c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: true before_install: - sudo apt-get update - sudo apt-get install gnupg gnupg2 -- if ( [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ] ) && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then +- if ([ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]) && [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d gpg --fast-import .travis/codesigning.asc fi From 20a077e8f48108519e283e32ffe04599d6243393 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 19:03:29 +0800 Subject: [PATCH 54/75] Update .travis.yml (3) --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 628b7c9..61ce9ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,11 @@ install: true before_install: - sudo apt-get update - sudo apt-get install gnupg gnupg2 -- if ([ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]) && [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then - openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d - gpg --fast-import .travis/codesigning.asc +- if [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then + if [ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]; then + openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d + gpg --fast-import .travis/codesigning.asc + fi fi after_success: From 73cbe8d8bf64f951b6dcfa3d53bb14892daed531 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 19:07:53 +0800 Subject: [PATCH 55/75] Put deploy script --- .travis.yml | 8 ++------ .travis/prepare | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .travis/prepare diff --git a/.travis.yml b/.travis.yml index 61ce9ac..b667d00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,8 @@ install: true before_install: - sudo apt-get update - sudo apt-get install gnupg gnupg2 -- if [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then - if [ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]; then - openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d - gpg --fast-import .travis/codesigning.asc - fi - fi +- chmod +x .travis/prepare +- .travis/prepare after_success: - ls diff --git a/.travis/prepare b/.travis/prepare new file mode 100644 index 0000000..8a3157a --- /dev/null +++ b/.travis/prepare @@ -0,0 +1,7 @@ +#!/usr/bin/bash +if [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then + if [ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]; then + openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d + gpg --fast-import .travis/codesigning.asc + fi +fi From 3729ae0647b0ff3193e5640018d29cc52af8a001 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 19:12:56 +0800 Subject: [PATCH 56/75] Update deploy script --- .travis/prepare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/prepare b/.travis/prepare index 8a3157a..0834978 100644 --- a/.travis/prepare +++ b/.travis/prepare @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash if [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then if [ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]; then openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d From c19e1cb24724e69622f390ba497d625cd1b15e00 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 19:18:02 +0800 Subject: [PATCH 57/75] Update deploy script --- .travis/prepare | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/prepare b/.travis/prepare index 0834978..63a3248 100644 --- a/.travis/prepare +++ b/.travis/prepare @@ -1,6 +1,6 @@ #!/bin/bash -if [ "$TRAVIS_PULL_REQUEST" -eq 'false' ]; then - if [ "$TRAVIS_BRANCH" -eq 'master' ] || [ "$TRAVIS_BRANCH" -eq 'develop' ]; then +if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then + if [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]; then openssl aes-256-cbc -K $encrypted_040459e821a3_key -iv $encrypted_040459e821a3_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d gpg --fast-import .travis/codesigning.asc fi From cd2edf30d215c8a1c8588b96dbd09565b70f5b41 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 19:21:29 +0800 Subject: [PATCH 58/75] Update deploy stuffs --- .travis.yml | 5 ++--- .travis/deploy | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .travis/deploy diff --git a/.travis.yml b/.travis.yml index b667d00..0f79bcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,8 @@ before_install: after_success: - ls -- if ( [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ] ) && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then - mvn deploy --settings settings.xml - fi +- chmod +x .travis/deploy +- .travis/deploy branches: only: diff --git a/.travis/deploy b/.travis/deploy new file mode 100644 index 0000000..ac28128 --- /dev/null +++ b/.travis/deploy @@ -0,0 +1,6 @@ +if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then + if [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]; then + mvn deploy --settings settings.xml + fi +fi + From bb98d8664cf28cc533313d30513aac8c22986001 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Sep 2016 19:23:00 +0800 Subject: [PATCH 59/75] Add /bin/bash at the top in deploy script --- .travis/deploy | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/deploy b/.travis/deploy index ac28128..272ace6 100644 --- a/.travis/deploy +++ b/.travis/deploy @@ -1,3 +1,4 @@ +#!/bin/bash if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then if [ "$TRAVIS_BRANCH" = 'master' ] || [ "$TRAVIS_BRANCH" = 'develop' ]; then mvn deploy --settings settings.xml From bfabdf80783b18bb158081108109b4752632d37f Mon Sep 17 00:00:00 2001 From: mob41 Date: Fri, 9 Sep 2016 23:35:30 +0800 Subject: [PATCH 60/75] Update README.md --- README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 058e939..1f788b8 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,55 @@ An ev3dev unified language binding for Java, that followed with the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html). +If you are finding a document or a tutorial for a specific version, come to https://mob41.github.io/ev3dev-lang-java + ## Library -This library currently legacy supports ev3dev kernel version 15, but does not support new drivers listed since kernel version 11, and optional drivers in [http://www.ev3dev.org/docs/sensors/](http://www.ev3dev.org/docs/sensors/). +This library supports ev3dev kernel version 15: + +- ```v4.4.19-15-ev3dev-ev3``` for EV3 +- ```v4.4.19-ti-rt-r41-15-ev3dev-bb.org``` for BeagleBone +- ```v4.4.19-15-ev3dev-rpi``` for Raspberry Pi 0/1 +- ```v4.4.19-15-ev3dev-rpi2``` for Raspberry Pi 2/3 + +All the drivers and functions listed in the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html) are all supported, but without confirming the stability of those devices. + +Other motors listed in http://www.ev3dev.org/docs/motors are also supported. ```DCMotor``` handles ```rcx-motor``` motors. + +Other sensors listed in http://www.ev3dev.org/docs/sensors are still in heavy development. + +Still in heavy development, please don't expect all things to be working, see issue [#15](https://github.com/mob41/ev3dev-lang-java/issues/15) for more details or tracking development stage. + +## Release + +This library currently **does not have any** releases, but snapshots (nightly builds) instead. + +You can download the latest snapshot from the [OSSRH repository](https://oss.sonatype.org/content/groups/public/org/ev3dev/ev3dev-lang-java/) directly or via Maven: + +1. Add the Sonatype snapshot repository. + + ``` + + + oss-sonatype + oss-sonatype + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + + ``` + +2. Add the dependency. -Still in heavy development, see issue [#15](https://github.com/mob41/ev3dev-lang-java/issues/15) for more details or tracking development stage. + ``` + + org.ev3dev + ev3dev-lang-java + 1.0.0-SNAPSHOT + + ``` ## Build your own From df9b198b45db5c50614844f225417f453b2c4b52 Mon Sep 17 00:00:00 2001 From: mob41 Date: Fri, 9 Sep 2016 23:37:29 +0800 Subject: [PATCH 61/75] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1f788b8..14fae24 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ You can download the latest snapshot from the [OSSRH repository](https://oss.son 1. Add the Sonatype snapshot repository. - ``` + ```xml oss-sonatype @@ -44,7 +44,7 @@ You can download the latest snapshot from the [OSSRH repository](https://oss.son 2. Add the dependency. - ``` + ```xml org.ev3dev ev3dev-lang-java From 7ccd0c4608a7ecfec1938cb514b9c24c4ac288fa Mon Sep 17 00:00:00 2001 From: mob41 Date: Fri, 9 Sep 2016 23:41:55 +0800 Subject: [PATCH 62/75] Put license file --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..58790fe --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Anthony Law + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From c1ac91f6fe326b2fbb64f1a275cf11990027a5af Mon Sep 17 00:00:00 2001 From: Anthony Date: Wed, 12 Oct 2016 00:23:10 +0800 Subject: [PATCH 63/75] I2CSensor: Adds a parameter to specify an alternative driver name --- .../ev3dev/hardware/sensors/I2CSensor.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java index 2cbd722..904a6e1 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java @@ -22,10 +22,10 @@ public class I2CSensor extends Sensor { */ public static final String SYSFS_PROPERTY_POLL_MS = "poll_ms"; - ///** - // * This device's default driver name - // */ - //public static final String DRIVER_NAME = "nxt-i2c-sensor"; + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "nxt-i2c-sensor"; /** * Creates a new I2CSensor instance. @@ -35,10 +35,22 @@ public class I2CSensor extends Sensor { * @throws EV3LibraryException If I/O goes wrong */ public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorException, EV3LibraryException { + this(port, DRIVER_NAME); + } + + /** + * Creates a new I2CSensor instance, and an alternative driver name can be specified. + * @param port LegoPort + * @param target_driver_name The target driver name to be checked. + * @throws InvalidPortException If the specified port wasn't valid + * @throws InvalidSensorException If the specified sensor wasn't a I2CSensor + * @throws EV3LibraryException If I/O goes wrong + */ + public I2CSensor(LegoPort port, String target_driver_name) throws InvalidPortException, InvalidSensorException, EV3LibraryException { super(port); - //if (!this.getDriverName().equals(DRIVER_NAME)){ - // throw new InvalidSensorException("The specified port is not a I2C sensor."); - //} + if (!this.getDriverName().equals(DRIVER_NAME)){ + throw new InvalidSensorException("The specified port is not a I2C sensor."); + } } /** From 52464f5b0b0d0a8d14e0d81c73466611bbefa940 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 12 Oct 2016 00:29:48 +0800 Subject: [PATCH 64/75] Some minor fixes --- src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java index 904a6e1..c441766 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/I2CSensor.java @@ -48,7 +48,7 @@ public I2CSensor(LegoPort port) throws InvalidPortException, InvalidSensorExcept */ public I2CSensor(LegoPort port, String target_driver_name) throws InvalidPortException, InvalidSensorException, EV3LibraryException { super(port); - if (!this.getDriverName().equals(DRIVER_NAME)){ + if (!this.getDriverName().equals(target_driver_name)){ throw new InvalidSensorException("The specified port is not a I2C sensor."); } } From e769a026f49f416e225a6b26227d6330c80617cd Mon Sep 17 00:00:00 2001 From: Anthony Date: Wed, 12 Oct 2016 00:41:25 +0800 Subject: [PATCH 65/75] NXTAnalogSensor: Adds a parameter to specify an alternative driver name. --- .../hardware/sensors/generic/NXTAnalogSensor.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java index 864678f..5aaaa7d 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/generic/NXTAnalogSensor.java @@ -32,14 +32,24 @@ public class NXTAnalogSensor extends Sensor { public static final String DRIVER_NAME = "nxt-analog"; /** - * Creates a new NXT analog sensor + * Creates a new NXT analog sensor. * @param port The LegoPort instance * @throws EV3LibraryException If I/O goes wrong */ public NXTAnalogSensor(LegoPort port) throws EV3LibraryException{ + this(port, DRIVER_NAME); + } + + /** + * Creates a new NXT analog sensor, and an alternative driver name can be specified. + * @param port The LegoPort instance + * @param target_driver_name The target driver name to be checked. + * @throws EV3LibraryException If I/O goes wrong + */ + public NXTAnalogSensor(LegoPort port, String target_driver_name) throws EV3LibraryException{ super(port); String drivername = port.getDriverName(); - if (!drivername.equals(DRIVER_NAME)){ + if (!drivername.equals(target_driver_name)){ throw new EV3LibraryException("The port is not connected to a NXT analog sensor: " + drivername); } } From beea4cd90603327310fefeed26b8ffb71f5ea783 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 12 Oct 2016 00:43:42 +0800 Subject: [PATCH 66/75] PixyCmucam: Specify its driver name to I2CSensor --- .../ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java index 2442cd6..5429fef 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/charmedlabs/PixyCmucam5Sensor.java @@ -137,7 +137,7 @@ public class PixyCmucam5Sensor extends I2CSensor { * @throws EV3LibraryException If I/O goes wrong */ public PixyCmucam5Sensor(LegoPort port) throws EV3LibraryException { - super(port); + super(port, DRIVER_NAME); } /** From 19f82d3fbc4126b1f1352aec6207257c5671ce6a Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 12 Oct 2016 00:49:30 +0800 Subject: [PATCH 67/75] Add Dflex sensor --- .../hardware/sensors/di/DflexSensor.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/sensors/di/DflexSensor.java diff --git a/src/main/java/org/ev3dev/hardware/sensors/di/DflexSensor.java b/src/main/java/org/ev3dev/hardware/sensors/di/DflexSensor.java new file mode 100644 index 0000000..b441dd1 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/sensors/di/DflexSensor.java @@ -0,0 +1,41 @@ +package org.ev3dev.hardware.sensors.di; + +import org.ev3dev.exception.EV3LibraryException; +import org.ev3dev.hardware.ports.LegoPort; +import org.ev3dev.hardware.sensors.generic.NXTAnalogSensor; + +public class DflexSensor extends NXTAnalogSensor { + + /** + * FLEX Mode - Flex + */ + public static final String MODE_FLEX = "FLEX"; + + /** + * FLEX Mode - Flex Sysfs value index + */ + public static final int MODE_FLEX_VALUE_INDEX = 0; + + /** + * dFlex Sensor driver name + */ + public static final String DRIVER_NAME = "di-dflex"; + + /** + * Creates a DflexSensor instance. + * @param port The LegoPort instance + * @throws EV3LibraryException If I/O goes wrong + */ + public DflexSensor(LegoPort port) throws EV3LibraryException { + super(port, DRIVER_NAME); + } + + /** + * Flex + * @return an integer from 0-100 + */ + public int getFlex(){ + return Integer.parseInt(this.getAttribute("value" + MODE_FLEX_VALUE_INDEX)); + } + +} From b6c5a3f317e531921df126c5b38ac71d9540d796 Mon Sep 17 00:00:00 2001 From: mob41 Date: Wed, 12 Oct 2016 23:56:41 +0800 Subject: [PATCH 68/75] Partial commit: HTNXTColorSensor implementment --- .../sensors/hitechnic/HTNXTColorSensor.java | 220 ++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java diff --git a/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java new file mode 100644 index 0000000..751c802 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java @@ -0,0 +1,220 @@ +package org.ev3dev.hardware.sensors.hitechnic; + +import org.ev3dev.exception.EV3LibraryException; +import org.ev3dev.exception.InvalidPortException; +import org.ev3dev.exception.InvalidSensorException; +import org.ev3dev.hardware.ports.LegoPort; +import org.ev3dev.hardware.sensors.I2CSensor; + +public class HTNXTColorSensor extends I2CSensor { + + /** + * HiTechnic NXT Color sensor + */ + public static final String DRIVER_NAME = "ht-nxt-color"; + + /** + * The vendor id of this sensor + */ + public static final String VENDOR_ID = "HiTechnic"; + + /** + * The product id of this sensor + */ + public static final String PRODUCT_ID = "Color"; + + /** + * Mode "Color" + */ + public static final String MODE_COLOR = "COLOR"; + + /** + * Mode "Red component" + */ + public static final String MODE_RED = "RED"; + + /** + * Mode "Green component" + */ + public static final String MODE_GREEN = "GREEN"; + + /** + * Mode "Blue component" + */ + public static final String MODE_BLUE = "BLUE"; + + /** + * Mode "Raw values" + */ + public static final String MODE_RAW = "RAW"; + + /** + * Mode "Normalized values" + */ + public static final String MODE_NORM = "NORM"; + + /** + * Mode "All values" + */ + public static final String MODE_ALL = "ALL"; + + /** + * Color (0 to 17) Sysfs value index of mode "Color" + */ + public static final int INDEX_MODE_COLOR_COLOR = 0; + + /** + * Reflected light intensity (0 to 255) Sysfs value index of mode "Red","Green","Blue" + */ + public static final int INDEX_REFLECTED = 0; + + /** + * Red component color value (0 to 255) Sysfs value index of mode "Raw","Normalized values" + */ + public static final int INDEX_RED_COMP = 0; + + /** + * Green component color value (0 to 255) Sysfs value index of mode "Raw","Normalized values" + */ + public static final int INDEX_GREEN_COMP = 1; + + /** + * Blue component color value (0 to 255) Sysfs value index of mode "Raw","Normalized values" + */ + public static final int INDEX_BLUE_COMP = 2; + + /** + * ??? (Unknown) component color value (0 to 255) Sysfs value index of mode "Normalized values" + */ + public static final int INDEX_MODE_NORM_UNKNOWN = 3; + + /** + * Color value (0 to 17) Sysfs value index of mode "All" + */ + public static final int INDEX_MODE_ALL_COLOR = 0; + + /** + * Red component color value (0 to 255) Sysfs value index of mode "All" + */ + public static final int INDEX_MODE_ALL_RED = 1; + + /** + * Green component color value (0 to 255) Sysfs value index of mode "All" + */ + public static final int INDEX_MODE_ALL_GREEN = 2; + + /** + * Blue component color value (0 to 255) Sysfs value index of mode "All" + */ + public static final int INDEX_MODE_ALL_BLUE = 3; + + /** + * The attribute prefix before the value index + */ + public static final String VALUE_PREFIX = "value"; + + /** + * I2C Address + */ + public static final byte address = 0x01; + + /** + * Creates a HTNXTColorSensor instance. + * @param port The LegoPort instance + * @throws EV3LibraryException If I/O goes wrong + */ + public HTNXTColorSensor(LegoPort port) throws EV3LibraryException { + super(port, DRIVER_NAME); + } + + /** + * Set mode as mode "Color" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsColor() throws EV3LibraryException { + setMode(MODE_COLOR); + } + + /** + * Set mode as mode "Red" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsRed() throws EV3LibraryException { + setMode(MODE_RED); + } + + /** + * Set mode as mode "Green" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsGreen() throws EV3LibraryException{ + setMode(MODE_GREEN); + } + + /** + * Set mode as mode "Blue" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsBlue() throws EV3LibraryException{ + setMode(MODE_BLUE); + } + + /** + * Set mode as mode "Raw" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsRaw() throws EV3LibraryException{ + setMode(MODE_RAW); + } + + /** + * Set mode as mode "Normalized values" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsNorm() throws EV3LibraryException{ + setMode(MODE_NORM); + } + + /** + * Set mode as mode "All" + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsAll() throws EV3LibraryException{ + setMode(MODE_ALL); + } + + /** + * This function requires mode COLOR or ALL.
+ *
+ * Get the color value from 0 to 17. Color values chart can be found at http://www.ev3dev.org/docs/sensors/hitechnic-nxt-color-sensor/ + * @return a integer from 0 to 17 + */ + public int getColor(){ + String str = getAttribute(VALUE_PREFIX + INDEX_MODE_COLOR_COLOR); + return Integer.parseInt(str); + } + + /** + * This function requires mode RED, GREEN or BLUE.
+ *
+ * Get the reflected color intensity. + * @return a integer from 0 to 255 + */ + public int getReflectedLightIntensity(){ + String str = getAttribute(VALUE_PREFIX + INDEX_REFLECTED); + return Integer.parseInt(str); + } + + public int getRedComponent(){ + String mode = getMode(); + String str; + if (mode.equals(MODE_ALL)){ + str = getAttribute(VALUE_PREFIX + INDEX_MODE_ALL_RED); + } else if (mode.equals(MODE_RAW) || mode.equals(MODE_NORM)){ + str = getAttribute(VALUE_PREFIX + INDEX_RED_COMP); + } else { + throw new EV3LibraryException("The function does not support with the current mode: " + mode); + } + return Integer.parseInt(str); + } +} From 735ccbd0dce7fa3ad3acfac38284e54b126da5da Mon Sep 17 00:00:00 2001 From: mob41 Date: Sun, 13 Nov 2016 18:58:31 +0800 Subject: [PATCH 69/75] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 14fae24..81b3908 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # ev3dev-lang-java [![Build Status](https://travis-ci.org/mob41/ev3dev-lang-java.svg?branch=master)](https://travis-ci.org/mob41/ev3dev-lang-java) +>This project is currently inactive in development. (Cause I don't have time...) + An ev3dev unified language binding for Java, that followed with the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html). If you are finding a document or a tutorial for a specific version, come to https://mob41.github.io/ev3dev-lang-java @@ -8,10 +10,10 @@ If you are finding a document or a tutorial for a specific version, come to http This library supports ev3dev kernel version 15: -- ```v4.4.19-15-ev3dev-ev3``` for EV3 -- ```v4.4.19-ti-rt-r41-15-ev3dev-bb.org``` for BeagleBone -- ```v4.4.19-15-ev3dev-rpi``` for Raspberry Pi 0/1 -- ```v4.4.19-15-ev3dev-rpi2``` for Raspberry Pi 2/3 +- ```v4.4.24-16-ev3dev-ev3``` for EV3 +- ```v4.4.24-ti-rt-r55-16-ev3dev-bb.org``` for BeagleBone +- ```v4.4.23-16-ev3dev-rpi``` for Raspberry Pi 0/1 +- ```v4.4.23-16-ev3dev-rpi2``` for Raspberry Pi 2/3 All the drivers and functions listed in the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html) are all supported, but without confirming the stability of those devices. From 48d56315152cbc2ac3a089fda19645fdd8c8d159 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sun, 13 Nov 2016 18:59:03 +0800 Subject: [PATCH 70/75] Update README.md --- README.md | 2 +- .../ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 81b3908..96ad4da 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you are finding a document or a tutorial for a specific version, come to http ## Library -This library supports ev3dev kernel version 15: +This library supports ev3dev kernel version 16: - ```v4.4.24-16-ev3dev-ev3``` for EV3 - ```v4.4.24-ti-rt-r55-16-ev3dev-bb.org``` for BeagleBone diff --git a/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java b/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java index 751c802..832f475 100644 --- a/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java +++ b/src/main/java/org/ev3dev/hardware/sensors/hitechnic/HTNXTColorSensor.java @@ -205,6 +205,12 @@ public int getReflectedLightIntensity(){ return Integer.parseInt(str); } + /** + * This function requires mode RAW, NORM or ALL.
+ *
+ * Get the red component + * @return + */ public int getRedComponent(){ String mode = getMode(); String str; From baf8ad52c87066c4ce0fd0e22dee27fc1bfec5cc Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Dec 2016 23:20:09 +0800 Subject: [PATCH 71/75] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 96ad4da..b2fb942 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ev3dev-lang-java [![Build Status](https://travis-ci.org/mob41/ev3dev-lang-java.svg?branch=master)](https://travis-ci.org/mob41/ev3dev-lang-java) ->This project is currently inactive in development. (Cause I don't have time...) +>This project isn't dead. Just "not very active" in development. An ev3dev unified language binding for Java, that followed with the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html). @@ -8,12 +8,12 @@ If you are finding a document or a tutorial for a specific version, come to http ## Library -This library supports ev3dev kernel version 16: +This library supports ev3dev kernel version 17: -- ```v4.4.24-16-ev3dev-ev3``` for EV3 -- ```v4.4.24-ti-rt-r55-16-ev3dev-bb.org``` for BeagleBone -- ```v4.4.23-16-ev3dev-rpi``` for Raspberry Pi 0/1 -- ```v4.4.23-16-ev3dev-rpi2``` for Raspberry Pi 2/3 +- ```v4.4.32-17-ev3dev-ev3``` for EV3 +- ```v4.4.31-ti-rt-r67-17-ev3dev-bb.org``` for BeagleBone +- ```v4.4.32-17-ev3dev-rpi``` for Raspberry Pi 0/1 +- ```v4.4.32-17-ev3dev-rpi2``` for Raspberry Pi 2/3 All the drivers and functions listed in the [language wrapper specification](http://ev3dev-lang.readthedocs.org/en/latest/spec.html) are all supported, but without confirming the stability of those devices. From 967bdc61ff07a6b779ff40b6cf56da71edaca2bb Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Dec 2016 23:20:27 +0800 Subject: [PATCH 72/75] Add ADCAdapter --- .../sensors/fatcatlab/ADCAdapter.java | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/sensors/fatcatlab/ADCAdapter.java diff --git a/src/main/java/org/ev3dev/hardware/sensors/fatcatlab/ADCAdapter.java b/src/main/java/org/ev3dev/hardware/sensors/fatcatlab/ADCAdapter.java new file mode 100644 index 0000000..ca32e5d --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/sensors/fatcatlab/ADCAdapter.java @@ -0,0 +1,122 @@ +package org.ev3dev.hardware.sensors.fatcatlab; + +import org.ev3dev.exception.EV3LibraryException; +import org.ev3dev.exception.InvalidModeException; +import org.ev3dev.exception.InvalidSensorException; +import org.ev3dev.hardware.ports.LegoPort; +import org.ev3dev.hardware.sensors.Sensor; + +public class ADCAdapter extends Sensor { + + /** + * Channel 1 voltage Mode + */ + public static final String MODE_CH1_VOLTAGE = "CH1-VOLTAGE"; + + /** + * Channel 1 voltage mode Sysfs value index + */ + public static final int INDEX_MODE_CH1_VOLTAGE = 0; + + /** + * Channel 2 voltage Mode + */ + public static final String MODE_CH2_VOLTAGE = "CH2-VOLTAGE"; + + /** + * Channel 2 voltage mode Sysfs value index + */ + public static final int INDEX_MODE_CH2_VOLTAGE = 0; + + /** + * All channels voltage Mode + */ + public static final String MODE_ALL_VOLTAGE = "VOLTAGE"; + + /** + * All channels mode channel 1 voltage Sysfs value index + */ + public static final int INDEX_MODE_ALL_CH1_VOLTAGE = 0; + + /** + * All channels mode channel 2 voltage Sysfs value index + */ + public static final int INDEX_MODE_ALL_CH2_VOLTAGE = 1; + + /** + * The property "valueX" prefix + */ + public static final String PROPERTY_PREFIX = "value"; + + /** + * This device's default driver name + */ + public static final String DRIVER_NAME = "fcl-adc"; + + /** + * Creates a new ADCAdapter instance + * @param port LegoPort + * @throws EV3LibraryException If I/O goes wrong + */ + public ADCAdapter(LegoPort port) throws EV3LibraryException { + super(port); + if(!this.getDriverName().equals(DRIVER_NAME)){ + throw new InvalidSensorException("Can't create a ADCAdapter instance if the port isn't connected to a light sensor!"); + } + } + + /** + * Set the device mode as Channel 1 Voltage Mode + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsCh1() throws EV3LibraryException{ + setMode(MODE_CH1_VOLTAGE); + } + + /** + * Set the device mode as Channel 2 Voltage Mode + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsCh2() throws EV3LibraryException{ + setMode(MODE_CH2_VOLTAGE); + } + + /** + * Set the device mode as All Channels Voltage Mode + * @throws EV3LibraryException If I/O goes wrong + */ + public void setModeAsAllCh() throws EV3LibraryException{ + setMode(MODE_ALL_VOLTAGE); + } + + /** + * Gets the voltage in millivolts from channel 1. The device mode must be CH1-VOLTAGE or VOLTAGE. Otherwise, a InvalidModeException will be thrown. + * @return millivolts in Integer + * @throws EV3LibraryException If the mode is invalid or I/O goes wrong + */ + public int getCh1Volt() throws EV3LibraryException{ + String mode = getAttribute(SYSFS_PROPERTY_MODE); + if (mode.equals(MODE_CH1_VOLTAGE) || mode.equals(MODE_ALL_VOLTAGE)){ + String str = getAttribute(PROPERTY_PREFIX + INDEX_MODE_CH1_VOLTAGE); + return Integer.parseInt(str); + } else { + throw new InvalidModeException("The Channel 1 voltage property cannot be accessed if the mode is not \"" + MODE_CH1_VOLTAGE + "\" or \"" + MODE_ALL_VOLTAGE + "\""); + } + } + + /** + * Gets the voltage in millivolts from channel 2. The device mode must be CH2-VOLTAGE or VOLTAGE. Otherwise, a InvalidModeException will be thrown. + * @return millivolts in Integer + * @throws EV3LibraryException If the mode is invalid or I/O goes wrong + */ + public int getCh2Volt() throws EV3LibraryException{ + String mode = getAttribute(SYSFS_PROPERTY_MODE); + if (mode.equals(MODE_CH2_VOLTAGE) || mode.equals(MODE_ALL_VOLTAGE)){ + String str = getAttribute(PROPERTY_PREFIX + (mode.equals(MODE_ALL_VOLTAGE) ? INDEX_MODE_ALL_CH2_VOLTAGE : INDEX_MODE_CH1_VOLTAGE)); + return Integer.parseInt(str); + } else { + throw new InvalidModeException("The Channel 2 voltage property cannot be accessed if the mode is not \"" + MODE_CH2_VOLTAGE + "\" or \"" + MODE_ALL_VOLTAGE + "\""); + } + } + +} From 418f78a30db7a55cfdb6d0779306c5f8a3f01c97 Mon Sep 17 00:00:00 2001 From: mob41 Date: Thu, 8 Dec 2016 23:31:44 +0800 Subject: [PATCH 73/75] Allow Sysfs path to be modified --- src/main/java/org/ev3dev/hardware/LED.java | 5 ++-- src/main/java/org/ev3dev/io/Sysfs.java | 29 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/ev3dev/hardware/LED.java b/src/main/java/org/ev3dev/hardware/LED.java index ae7f96a..fc94c55 100644 --- a/src/main/java/org/ev3dev/hardware/LED.java +++ b/src/main/java/org/ev3dev/hardware/LED.java @@ -77,7 +77,8 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ super(CLASS_NAME); if (leftRightField != 0 && leftRightField != 1){ throw new InvalidLEDException("You are not specifying a EV3_LEFT_LED or EV3_RIGHT_LED field!"); - } else if (colorField != 0 && colorField != 1){ + } + if (colorField != 0 && colorField != 1){ throw new InvalidLEDException("You are not specifying a EV3_LED_GREEN or EV3_LED_RED field!"); } String direction = leftRightField == 0 ? "left" : "right"; @@ -98,7 +99,7 @@ public LED(int leftRightField, int colorField) throws InvalidLEDException{ */ public LED(String ledName) throws InvalidLEDException{ super(CLASS_NAME); - File file = new File(Sysfs.SYSTEM_CLASS_PATH + CLASS_NAME + "/" + ledName); + File file = new File(Sysfs.getSysfsPath() + CLASS_NAME + "/" + ledName); if (!file.exists()){ throw new InvalidLEDException("The specified LED does not exist"); } diff --git a/src/main/java/org/ev3dev/io/Sysfs.java b/src/main/java/org/ev3dev/io/Sysfs.java index a836635..90bc93f 100644 --- a/src/main/java/org/ev3dev/io/Sysfs.java +++ b/src/main/java/org/ev3dev/io/Sysfs.java @@ -18,9 +18,11 @@ public class Sysfs { /** - * The Sysfs class path (/sys/class/) + * The default ev3dev Sysfs class path (/sys/class/) */ - public static final String SYSTEM_CLASS_PATH = "/sys/class/"; + public static final String DEFAULT_SYSTEM_CLASS_PATH = "/sys/class/"; + + private static String SYSTEM_CLASS_PATH = DEFAULT_SYSTEM_CLASS_PATH; /** * Get all sub-class files @@ -33,6 +35,29 @@ public static File[] getAllSubClass(String class_name){ return files; } + /** + * Returns the current ev3dev Sysfs path. + * @return the current Sysfs path + */ + public static String getSysfsPath(){ + return SYSTEM_CLASS_PATH; + } + + /** + * Modify the current ev3dev Sysfs path in this library instance to be used. This is probably used for debugging purpose. Any invalid modification to the path will break the library. + * @param path The file-system path to be used + */ + public static void setSysfsPath(String path){ + SYSTEM_CLASS_PATH = path; + } + + /** + * Sets the current ev3dev Sysfs path to default + */ + public static void resetSysfsPath(){ + SYSTEM_CLASS_PATH = DEFAULT_SYSTEM_CLASS_PATH; + } + /*** * Reads the property of the class specified. * @param class_name The class name From 1a6d7848d0f8a04485e148bd9fbf15fc4ce07345 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 14 Jan 2017 12:17:16 +0800 Subject: [PATCH 74/75] Implemented LCD Graphics --- src/main/java/org/ev3dev/hardware/LCD.java | 44 +++ .../java/org/ev3dev/hardware/LCDGraphics.java | 280 ++++++++++++++++++ 2 files changed, 324 insertions(+) create mode 100644 src/main/java/org/ev3dev/hardware/LCD.java create mode 100644 src/main/java/org/ev3dev/hardware/LCDGraphics.java diff --git a/src/main/java/org/ev3dev/hardware/LCD.java b/src/main/java/org/ev3dev/hardware/LCD.java new file mode 100644 index 0000000..a67df85 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/LCD.java @@ -0,0 +1,44 @@ +package org.ev3dev.hardware; + +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; + +import org.ev3dev.exception.EV3LibraryException; + +/** + * Provides an interface to draw to the EV3's LCD + * @author Anthony + * + */ +public class LCD { + + public static final String FB_PATH = "/dev/fb0"; + + //This should not be hard-coded, however just for testing + public static final int SCREEN_WIDTH = 128; + + public static final int SCREEN_HEIGHT = 178; + + public LCD() { + + } + + public void draw(byte[] data) throws EV3LibraryException{ + File file = new File(FB_PATH); + if (!file.exists()){ + throw new EV3LibraryException("The framebuffer device does not exist! Are you using a EV3?"); + } + try { + DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); + out.write(data); + out.flush(); + out.close(); + } catch (IOException e) { + throw new EV3LibraryException("Unable to draw the LCD", e); + } + } + +} diff --git a/src/main/java/org/ev3dev/hardware/LCDGraphics.java b/src/main/java/org/ev3dev/hardware/LCDGraphics.java new file mode 100644 index 0000000..2915aa2 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/LCDGraphics.java @@ -0,0 +1,280 @@ +package org.ev3dev.hardware; + +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.image.ImageObserver; +import java.text.AttributedCharacterIterator; + +import org.ev3dev.exception.EV3LibraryException; + +public class LCDGraphics extends Graphics { + + public static final int LINE_LEN = 24; + + public static final int ROWS = 128; + + public static final int BUF_SIZE = LINE_LEN * ROWS; + + private LCD lcd; + + private boolean whiteColor = false; + + private byte[] buf; + + private int transx = 0; + + private int transy = 0; + + public LCDGraphics() { + lcd = new LCD(); + buf = new byte[BUF_SIZE]; + } + + /** + * Applies the Graphics context onto the ev3dev's LCD + */ + public void flush(){ + lcd.draw(buf); + } + + @Override + public Graphics create() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void translate(int x, int y) { + this.transx = x; + this.transy = y; + } + + public void setWhiteColor(){ + whiteColor = true; + } + + public void setBlackColor(){ + whiteColor = false; + } + + @Override + public Color getColor() { + return whiteColor ? Color.WHITE : Color.BLACK; + } + + @Override + public void setColor(Color c) throws EV3LibraryException{ + if (c == null || !c.equals(Color.BLACK) || !c.equals(Color.WHITE)){ + throw new EV3LibraryException("The EV3 LCD only supports Color.BLACK and Color.WHITE"); + } + whiteColor = c.equals(Color.WHITE); + } + + /** + * The ev3 LCD does not support PaintMode + */ + @Override + public void setPaintMode() { + throw new EV3LibraryException("The EV3 LCD does not support PaintMode"); + } + + /** + * The ev3 LCD does not support XORMode + */ + @Override + public void setXORMode(Color c1) { + throw new EV3LibraryException("The EV3 LCD does not support XORMode"); + } + + @Override + public Font getFont() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setFont(Font font) { + // TODO Auto-generated method stub + + } + + @Override + public FontMetrics getFontMetrics(Font f) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Rectangle getClipBounds() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void clipRect(int x, int y, int width, int height) { + // TODO Auto-generated method stub + + } + + @Override + public void setClip(int x, int y, int width, int height) { + // TODO Auto-generated method stub + + } + + @Override + public Shape getClip() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setClip(Shape clip) { + // TODO Auto-generated method stub + + } + + @Override + public void copyArea(int x, int y, int width, int height, int dx, int dy) { + + } + + @Override + public void drawLine(int x1, int y1, int x2, int y2) { + + } + + @Override + public void fillRect(int x, int y, int width, int height) { + for (int i = 0; i < height; i++){ + for (int j = 0; j < width; j++){ + buf[(((i+y) * LINE_LEN)) + (x + j) / 8] = (byte) 0xff; + } + } + } + + @Override + public void clearRect(int x, int y, int width, int height) { + for (int i = 0; i < height; i++){ + for (int j = 0; j < width; j++){ + buf[(((i+y) * LINE_LEN)) + (x + j) / 8] = (byte) 0x00; + } + } + } + + @Override + public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { + // TODO Auto-generated method stub + + } + + @Override + public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { + // TODO Auto-generated method stub + + } + + @Override + public void drawOval(int x, int y, int width, int height) { + // TODO Auto-generated method stub + + } + + @Override + public void fillOval(int x, int y, int width, int height) { + // TODO Auto-generated method stub + + } + + @Override + public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) { + // TODO Auto-generated method stub + + } + + @Override + public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) { + // TODO Auto-generated method stub + + } + + @Override + public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) { + // TODO Auto-generated method stub + + } + + @Override + public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) { + // TODO Auto-generated method stub + + } + + @Override + public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) { + // TODO Auto-generated method stub + + } + + @Override + public void drawString(String str, int x, int y) { + // TODO Auto-generated method stub + + } + + @Override + public void drawString(AttributedCharacterIterator iterator, int x, int y) { + // TODO Auto-generated method stub + + } + + @Override + public boolean drawImage(Image img, int x, int y, ImageObserver observer) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, + ImageObserver observer) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + +} From fa9ce3beb3658a0c2d8a4ed43fb5664f34755691 Mon Sep 17 00:00:00 2001 From: mob41 Date: Sat, 14 Jan 2017 23:52:55 +0800 Subject: [PATCH 75/75] Implemented drawing line, VirtualLCD --- src/main/java/org/ev3dev/hardware/LCD.java | 9 +- .../java/org/ev3dev/hardware/LCDGraphics.java | 83 ++++++++++++++++-- .../java/org/ev3dev/hardware/VLCDFrame.java | 54 ++++++++++++ .../java/org/ev3dev/hardware/VirtualLCD.java | 70 +++++++++++++++ .../ev3dev/hardware/defaultvirtuallcd.fw.png | Bin 0 -> 52544 bytes 5 files changed, 208 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/ev3dev/hardware/VLCDFrame.java create mode 100644 src/main/java/org/ev3dev/hardware/VirtualLCD.java create mode 100644 src/main/java/org/ev3dev/hardware/defaultvirtuallcd.fw.png diff --git a/src/main/java/org/ev3dev/hardware/LCD.java b/src/main/java/org/ev3dev/hardware/LCD.java index a67df85..3d1d485 100644 --- a/src/main/java/org/ev3dev/hardware/LCD.java +++ b/src/main/java/org/ev3dev/hardware/LCD.java @@ -18,14 +18,19 @@ public class LCD { public static final String FB_PATH = "/dev/fb0"; //This should not be hard-coded, however just for testing - public static final int SCREEN_WIDTH = 128; + public static final int SCREEN_WIDTH = 178; - public static final int SCREEN_HEIGHT = 178; + public static final int SCREEN_HEIGHT = 128; public LCD() { } + /** + * Draws a byte array into the EV3 framebuffer + * @param data Byte array to be drawn (128 (height) * 178 / 8 (length) = 3072 bytes) + * @throws EV3LibraryException + */ public void draw(byte[] data) throws EV3LibraryException{ File file = new File(FB_PATH); if (!file.exists()){ diff --git a/src/main/java/org/ev3dev/hardware/LCDGraphics.java b/src/main/java/org/ev3dev/hardware/LCDGraphics.java index 2915aa2..c36a65c 100644 --- a/src/main/java/org/ev3dev/hardware/LCDGraphics.java +++ b/src/main/java/org/ev3dev/hardware/LCDGraphics.java @@ -29,9 +29,11 @@ public class LCDGraphics extends Graphics { private int transx = 0; private int transy = 0; + + private Font font; - public LCDGraphics() { - lcd = new LCD(); + public LCDGraphics(LCD lcd) { + this.lcd = lcd; buf = new byte[BUF_SIZE]; } @@ -42,6 +44,9 @@ public void flush(){ lcd.draw(buf); } + /** + * Not implemented + */ @Override public Graphics create() { // TODO Auto-generated method stub @@ -90,7 +95,10 @@ public void setPaintMode() { public void setXORMode(Color c1) { throw new EV3LibraryException("The EV3 LCD does not support XORMode"); } - + + /** + * Not implemented + */ @Override public Font getFont() { // TODO Auto-generated method stub @@ -103,6 +111,9 @@ public void setFont(Font font) { } + /** + * Not implemented + */ @Override public FontMetrics getFontMetrics(Font f) { // TODO Auto-generated method stub @@ -143,17 +154,75 @@ public void setClip(Shape clip) { public void copyArea(int x, int y, int width, int height, int dx, int dy) { } - + @Override - public void drawLine(int x1, int y1, int x2, int y2) { + public void drawLine(int x1, int y1, int x2, int y2) { //Uses Bresenham's line algorithm + boolean steep = Math.abs(y2 - y1) > Math.abs(x2 - x1); + if (steep){ + int tmp = x1; + x1 = y1; + y1 = tmp; + + tmp = x2; + x2 = y2; + y2 = x2; + } + + if (x1 > x2){ + int tmp = x1; + x1 = x2; + x2 = tmp; + + tmp = y1; + y1 = y2; + y2 = tmp; + } + + double deltax = x2 - x1; + double deltay = Math.abs(y2 - y1); + + double err = deltax / 2; + + int xlen = x2 - x1; + int y = y1; + + int ystep; + if (y1 < y2){ + ystep = 1; + } else { + ystep = -1; + } + + for (int i = 0; i < xlen; i++){ + if (steep){ + plot(y,i); + } else { + plot(i,y); + } + + err -= deltay; + if (err < 0){ + y += ystep; + err += deltax; + } + } + } + + /** + * Plot the specified (x,y) position with the selected color (Color.BLACK or Color.WHITE) + * @param x Position x + * @param y Position y + */ + public void plot(int x, int y){ + buf[y * LINE_LEN + x / 8] = (byte) (whiteColor ? 0x00 : 0xff); } @Override public void fillRect(int x, int y, int width, int height) { for (int i = 0; i < height; i++){ for (int j = 0; j < width; j++){ - buf[(((i+y) * LINE_LEN)) + (x + j) / 8] = (byte) 0xff; + buf[(((i+y) * LINE_LEN)) + (x + j) / 8] = (byte) (whiteColor ? 0x00 : 0xff); } } } @@ -223,12 +292,14 @@ public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) { @Override public void drawString(String str, int x, int y) { + System.out.println("Draw string"); // TODO Auto-generated method stub } @Override public void drawString(AttributedCharacterIterator iterator, int x, int y) { + System.out.println("Draw string2"); // TODO Auto-generated method stub } diff --git a/src/main/java/org/ev3dev/hardware/VLCDFrame.java b/src/main/java/org/ev3dev/hardware/VLCDFrame.java new file mode 100644 index 0000000..972f43b --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/VLCDFrame.java @@ -0,0 +1,54 @@ +package org.ev3dev.hardware; + +import java.awt.BorderLayout; +import java.awt.EventQueue; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.ImageIcon; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.Timer; +import javax.swing.border.EmptyBorder; + +import org.ev3dev.hardware.VirtualLCD; +import javax.swing.JLabel; +import javax.swing.SwingConstants; +import java.awt.Color; + +public class VLCDFrame extends JFrame { + + private JPanel contentPane; + private VirtualLCD lcd; + private Thread thread; + private JLabel lblImg; + + /** + * Create the frame. + */ + public VLCDFrame(VirtualLCD vlcd) { + setTitle("ev3dev-lang-java VirtualLCD"); + this.lcd = vlcd; + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + setBounds(100, 100, 418, 321); + contentPane = new JPanel(); + contentPane.setBackground(Color.LIGHT_GRAY); + contentPane.setBorder(null); + contentPane.setLayout(new BorderLayout(0, 0)); + setContentPane(contentPane); + + lblImg = new JLabel(""); + lblImg.setHorizontalAlignment(SwingConstants.CENTER); + contentPane.add(lblImg, BorderLayout.CENTER); + + thread = new Thread(new Runnable(){ + + public void run() { + lblImg.setIcon(new ImageIcon(lcd.getImage())); + } + + }); + thread.start(); + } + +} diff --git a/src/main/java/org/ev3dev/hardware/VirtualLCD.java b/src/main/java/org/ev3dev/hardware/VirtualLCD.java new file mode 100644 index 0000000..930bd24 --- /dev/null +++ b/src/main/java/org/ev3dev/hardware/VirtualLCD.java @@ -0,0 +1,70 @@ +package org.ev3dev.hardware; + +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Toolkit; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; + +/** + * Provides an interface for developers to emulate the LCD in ev3 + * @author Anthony + * + */ +public class VirtualLCD extends LCD{ + + private BufferedImage image; + + /** + * Creates a new virtual LCD instance + */ + public VirtualLCD(){ + //image = new BufferedImage(SCREEN_WIDTH, SCREEN_HEIGHT, BufferedImage.TYPE_INT_ARGB); + try { + image = ImageIO.read(VirtualLCD.class.getResource("/org/ev3dev/hardware/defaultvirtuallcd.fw.png")); + } catch (IOException e) { + } + } + + /** + * Returns the image drawn + * @return BufferedImage + */ + public BufferedImage getImage(){ + return image; + } + + /** + * Starts up an UI showing the virtual LCD + */ + public void showVLCD(){ + VLCDFrame frame = new VLCDFrame(this); + frame.setVisible(true); + frame.setTitle(this.hashCode() + " - VirtualLCD"); + } + + /** + * This function overrides the original draw() function to draw directly into a BufferedImage + */ + @Override + public void draw(byte[] data){ + if (data == null){ + return; + } + + Graphics g = image.getGraphics(); + for (int i = 0; i < 128; i++){ + for (int j = 0; j < 178; j++){ + if (data[i * 24 + j / 8] == (byte) 0xff){ + g.setColor(Color.BLACK); + g.drawLine(j, i, j, i); + } else { + g.setColor(Color.WHITE); + g.drawLine(j, i, j, i); + } + } + } + } +} diff --git a/src/main/java/org/ev3dev/hardware/defaultvirtuallcd.fw.png b/src/main/java/org/ev3dev/hardware/defaultvirtuallcd.fw.png new file mode 100644 index 0000000000000000000000000000000000000000..c6cb3efcaec923dc0f68af0112da87d85adeb427 GIT binary patch literal 52544 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 z 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 yR?%y5G|0ugau3!H@$D;%YKw2C+F