Skip to content

Commit 0ca2293

Browse files
committed
Merge branch 'development' of https://github.com/rondlh/java-bowler.git into development
2 parents 3c4c485 + 267fac7 commit 0ca2293

13 files changed

Lines changed: 25 additions & 26 deletions

File tree

src/main/java/com/neuronrobotics/replicator/driver/interpreter/EmptyCodeHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class EmptyCodeHandler extends CodeHandler {
1313
*/
1414
public void execute(GCodeLineData prev, GCodeLineData line) throws Exception {
1515

16-
//throw new RuntimeException("No handler availible "+line);
16+
//throw new RuntimeException("No handler available " + line);
1717
}
1818
}
1919

src/main/java/com/neuronrobotics/sdk/addons/kinematics/imu/IMUUpdate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
/**
66
* This is a state object for the IMU
7-
* any function that returns null has no new data availible.
7+
* any function that returns null has no new data available.
88
* @author hephaestus
99
*
1010
*/

src/main/java/com/neuronrobotics/sdk/common/BowlerDatagram.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class BowlerDatagram implements ISendable,IthreadedTimoutListener {
7777

7878
//private long timestamp;
7979

80-
private boolean isPackedAvailibleForLoading = true;
80+
private boolean isPackedAvailableForLoading = true;
8181

8282
/** The timeout. */
8383
private ThreadedTimeout timeout=new ThreadedTimeout();
@@ -601,7 +601,7 @@ private void checkValidPacket(){
601601
* @return true, if is free
602602
*/
603603
public boolean isFree() {
604-
return isPackedAvailibleForLoading;
604+
return isPackedAvailableForLoading;
605605
}
606606

607607

@@ -642,7 +642,7 @@ void setFree(boolean isFree) {
642642
}else{
643643
setToFree();
644644
}
645-
this.isPackedAvailibleForLoading = isFree;
645+
this.isPackedAvailableForLoading = isFree;
646646
}
647647

648648
/* (non-Javadoc)

src/main/java/com/neuronrobotics/sdk/common/DMDevice.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class DMDevice extends NonBowlerDevice {
99
Method methodConnect = null;
1010
Method methodDisconnect = null;
1111
boolean hasGetName = false;
12-
boolean hasIsAvailible=false;
12+
boolean hasIsAvailable = false;
1313
Method methodGetName = null;
1414
Method isAvaibleMeth=null;
1515

@@ -20,7 +20,7 @@ public DMDevice(Object o) throws NoSuchMethodException, SecurityException {
2020
methodConnect = getWrapped().getClass().getMethod("connect", null);
2121
methodDisconnect = getWrapped().getClass().getMethod("disconnect", null);
2222
hasGetName = methodExists(getWrapped(), "getName");
23-
hasIsAvailible = methodExists(getWrapped(), "isAvailable");
23+
hasIsAvailable = methodExists(getWrapped(), "isAvailable");
2424
methodGetName = null;
2525
}
2626

@@ -71,8 +71,8 @@ public void disconnectDeviceImp() {
7171
*/
7272
@Override
7373
public boolean isAvailable() throws InvalidConnectionException{
74-
if(hasIsAvailible) {
75-
if(isAvaibleMeth==null) {
74+
if (hasIsAvailable) {
75+
if (isAvaibleMeth == null) {
7676
try {
7777
isAvaibleMeth = getWrapped().getClass().getMethod("isAvailable", null);
7878
} catch (Exception e) {

src/main/java/com/neuronrobotics/sdk/common/DeviceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private static void addConnectionBAD(final BowlerAbstractDevice newDevice, Strin
8080
newDevice.connect();
8181
if (!newDevice.isAvailable()) {
8282
throw new BowlerRuntimeException(
83-
"Device " + name + " of type " + newDevice.getClass().getSimpleName() + " is not availible");
83+
"Device " + name + " of type " + newDevice.getClass().getSimpleName() + " is not available");
8484
}
8585
if (devices.contains(newDevice)) {
8686
Log.warning("Device is already added " + newDevice.getScriptingName());

src/main/java/com/neuronrobotics/sdk/dyio/DyIO.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,12 +1362,12 @@ public Integer getDyIOChannelCount(){
13621362
}
13631363

13641364
/**
1365-
* Gets the availible channel modes.
1365+
* Gets the available channel modes.
13661366
*
13671367
* @param channel the channel
1368-
* @return the availible channel modes
1368+
* @return the available channel modes
13691369
*/
1370-
public ArrayList<DyIOChannelMode> getAvailibleChannelModes(int channel){
1370+
public ArrayList<DyIOChannelMode> getAvailableChannelModes(int channel){
13711371
ArrayList<DyIOChannelMode> modes = new ArrayList<DyIOChannelMode>();
13721372
ByteList m;
13731373

@@ -1387,7 +1387,7 @@ public ArrayList<DyIOChannelMode> getAvailibleChannelModes(int channel){
13871387
m = (ByteList)args[0];
13881388
//Log.setMinimumPrintLevel(l);
13891389
}
1390-
String modeString = " Availible modes on "+channel;
1390+
String modeString = " Available modes on " + channel;
13911391
for(int i=0;i<m.size();i++){
13921392
DyIOChannelMode tmpMode = DyIOChannelMode.get(m.getByte(i));
13931393
modeString +="\r\n\t"+tmpMode.toString()+"\r\n\t";

src/main/java/com/neuronrobotics/sdk/dyio/DyIOChannel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public boolean hasAsync(){
309309
*/
310310
public Collection<DyIOChannelMode> getAvailableModes() {
311311
if(myModes== null)
312-
myModes = getDevice().getAvailibleChannelModes(getChannelNumber());
312+
myModes = getDevice().getAvailableChannelModes(getChannelNumber());
313313

314314
for(int i=0;i<myModes.size();i++){
315315
if(myModes.get(i) == DyIOChannelMode.SERVO_OUT){
@@ -490,7 +490,7 @@ public boolean setMode(DyIOChannelMode mode, boolean async) {
490490

491491
if(!canBeMode(mode)){
492492
if(mode == DyIOChannelMode.SERVO_OUT)
493-
new RuntimeException("\nChannel: "+getChannelNumber()+" can not be mode '"+mode+"' in current configuration. \nCheck the power switch settings and availible modes.").printStackTrace();
493+
new RuntimeException("\nChannel: "+getChannelNumber()+" can not be mode '"+mode+"' in current configuration. \nCheck the power switch settings and available modes.").printStackTrace();
494494
else
495495
new RuntimeException("\nChannel: "+getChannelNumber()+" can not be mode '"+mode+"'.").printStackTrace();
496496
mode=getMode();

src/main/java/com/neuronrobotics/sdk/dyio/DyIOChannelMode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public static DyIOChannelMode getFromSlug(String slug) {
169169
if(cm.toSlug().toLowerCase().contentEquals(slug.toLowerCase()))
170170
return cm;
171171
}
172-
throw new RuntimeException("No mode availible for slug: "+slug);
172+
throw new RuntimeException("No mode available for slug: "+slug);
173173
}
174174

175175
/* (non-Javadoc)

src/main/java/com/neuronrobotics/sdk/javaxusb/UsbCDCSerialConnection.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,7 @@ public void write(byte[] src) throws IOException {
703703
//e.printStackTrace();
704704
disconnect();
705705
throw new BowlerRuntimeException(
706-
"Connection is no longer availible "
707-
+ e.getLocalizedMessage());
706+
"Connection is no longer available " + e.getLocalizedMessage());
708707
}
709708

710709
return;

src/main/java/com/neuronrobotics/sdk/namespace/bcs/pid/AbstractPidNamespaceImp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public boolean SetPIDInterpolatedVelocity(int group, int unitsPerSecond, double
9797
}
9898

9999
/**
100-
* Gets the number of PID channels availible to the system. It is determined by how many PID channels the device reports
100+
* Gets the number of PID channels available to the system. It is determined by how many PID channels the device reports
101101
* back after a calling GetAllPIDPosition();
102102
*
103103
* @return the number of channels

0 commit comments

Comments
 (0)