diff options
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | examples/java/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/java/DBTScanner10.java (renamed from examples/java/ScannerTinyB10.java) | 4 | ||||
-rw-r--r-- | java/org/tinyb/BluetoothFactory.java | 2 | ||||
-rw-r--r-- | scripts/run-java-scanner10.sh | 4 |
5 files changed, 11 insertions, 11 deletions
@@ -129,7 +129,7 @@ are available, [dbt_scanner10.cpp](https://jausoft.com/projects/direct_bt/build/ demonstrates the event driven and multithreading workflow. *Direct-BT* [Java examples](https://jausoft.com/projects/direct_bt/build/documentation/java/html/examples.html) -are availble, [ScannerTinyB10.java](https://jausoft.com/projects/direct_bt/build/documentation/java/html/ScannerTinyB10_8java-example.html) +are availble, [DBTScanner10.java](https://jausoft.com/projects/direct_bt/build/documentation/java/html/DBTScanner10_8java-example.html) demonstrates the event driven and multithreading workflow - matching *dbt_scanner10.cpp*. A guide for getting started with *TinyB* on Java is available from Intel: @@ -263,7 +263,7 @@ make doc Changes ============ -**2.1.26 Early *Direct-BT* Maturity (Bluetooth LE)** +**2.1.29 Early *Direct-BT* Maturity (Bluetooth LE)** * Reaching robust implementation state of *Direct-BT*, including recovery from L2CAP transmission breakdown on Raspberry Pi. * Resolved race conditions on rapid device discovery and connect, using one thread per device. diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index 25e719a8..d7a374aa 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -44,10 +44,10 @@ add_custom_command(TARGET ScannerTinyB02 ) add_dependencies(ScannerTinyB02 tinybjar) -add_jar(ScannerTinyB10 SOURCES ScannerTinyB10.java INCLUDE_JARS "${CMAKE_CURRENT_BINARY_DIR}/../../java/tinyb2.jar" ENTRY_POINT Notification) -add_custom_command(TARGET ScannerTinyB10 +add_jar(DBTScanner10 SOURCES DBTScanner10.java INCLUDE_JARS "${CMAKE_CURRENT_BINARY_DIR}/../../java/tinyb2.jar" ENTRY_POINT Notification) +add_custom_command(TARGET DBTScanner10 POST_BUILD - COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/ScannerTinyB10.dir/ScannerTinyB10.class" "${CMAKE_CURRENT_BINARY_DIR}" + COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/DBTScanner10.dir/DBTScanner10.class" "${CMAKE_CURRENT_BINARY_DIR}" ) -add_dependencies(ScannerTinyB10 tinybjar) +add_dependencies(DBTScanner10 tinybjar) diff --git a/examples/java/ScannerTinyB10.java b/examples/java/DBTScanner10.java index c6692b7d..71528ad1 100644 --- a/examples/java/ScannerTinyB10.java +++ b/examples/java/DBTScanner10.java @@ -63,7 +63,7 @@ import direct_bt.tinyb.DBTManager; * This example represents the recommended utilization of Direct-BT. * </p> */ -public class ScannerTinyB10 { +public class DBTScanner10 { static final String EUI48_ANY_DEVICE = "00:00:00:00:00:00"; final List<String> waitForDevices = new ArrayList<String>(); @@ -603,7 +603,7 @@ public class ScannerTinyB10 { return; } println("DirectBT BluetoothManager initialized!"); - final ScannerTinyB10 test = new ScannerTinyB10(); + final DBTScanner10 test = new DBTScanner10(); boolean waitForEnter=false; { diff --git a/java/org/tinyb/BluetoothFactory.java b/java/org/tinyb/BluetoothFactory.java index 272a15ba..f47d44e0 100644 --- a/java/org/tinyb/BluetoothFactory.java +++ b/java/org/tinyb/BluetoothFactory.java @@ -508,7 +508,7 @@ public class BluetoothFactory { /* pp */ static long getStartupTimeMilliseconds() { return t0; } } -/** \example ScannerTinyB10.java +/** \example DBTScanner10.java * This Java scanner example uses the Direct-BT fully event driven workflow * and adds multithreading, i.e. one thread processes each found device found * as notified via the event listener. diff --git a/scripts/run-java-scanner10.sh b/scripts/run-java-scanner10.sh index 465644b4..4867238b 100644 --- a/scripts/run-java-scanner10.sh +++ b/scripts/run-java-scanner10.sh @@ -11,7 +11,7 @@ # ../scripts/run-java-scanner10.sh -wait 2>&1 | tee ~/scanner-h01-java10.log # -if [ ! -e lib/java/tinyb2.jar -o ! -e bin/java/ScannerTinyB10.jar -o ! -e lib/libdirect_bt.so ] ; then +if [ ! -e lib/java/tinyb2.jar -o ! -e bin/java/DBTScanner10.jar -o ! -e lib/libdirect_bt.so ] ; then echo run from dist directory exit 1 fi @@ -26,4 +26,4 @@ echo COMMANDLINE $0 $* echo direct_bt_debug $direct_bt_debug echo direct_bt_verbose $direct_bt_verbose -java -cp lib/java/tinyb2.jar:bin/java/ScannerTinyB10.jar -Djava.library.path=`pwd`/lib ScannerTinyB10 $* +java -cp lib/java/tinyb2.jar:bin/java/DBTScanner10.jar -Djava.library.path=`pwd`/lib DBTScanner10 $* |