projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosBTDevice.java
diff --git
a/altosui/AltosBTDevice.java
b/altosui/AltosBTDevice.java
index 55b8f8fc8bf5f28c2b7f848bbe56bf9b2434ff17..a6eee0859213c275f4f94fe07ed76634ca7cf6ab 100644
(file)
--- a/
altosui/AltosBTDevice.java
+++ b/
altosui/AltosBTDevice.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package
altosui
;
+package
AltosUI
;
import java.lang.*;
import java.util.*;
import libaltosJNI.*;
import java.lang.*;
import java.util.*;
import libaltosJNI.*;
@@
-87,7
+87,6
@@
public class AltosBTDevice extends altos_bt_device implements AltosDevice {
public boolean matchProduct(int want_product) {
public boolean matchProduct(int want_product) {
- System.out.printf("matchProduct %s %d\n", toString(), want_product);
// if (!isAltusMetrum())
// return false;
// if (!isAltusMetrum())
// return false;
@@
-107,7
+106,6
@@
public class AltosBTDevice extends altos_bt_device implements AltosDevice {
if (!(o instanceof AltosBTDevice))
return false;
AltosBTDevice other = (AltosBTDevice) o;
if (!(o instanceof AltosBTDevice))
return false;
AltosBTDevice other = (AltosBTDevice) o;
- System.out.printf("AltosBTDevice equals %s == %s\n", toString(), other.toString());
return getName().equals(other.getName()) && getAddr().equals(other.getAddr());
}
return getName().equals(other.getName()) && getAddr().equals(other.getAddr());
}
@@
-116,6
+114,7
@@
public class AltosBTDevice extends altos_bt_device implements AltosDevice {
}
public AltosBTDevice(String name, String addr) {
}
public AltosBTDevice(String name, String addr) {
+ Altos.load_library();
libaltos.altos_bt_fill_in(name, addr,this);
}
libaltos.altos_bt_fill_in(name, addr,this);
}