Compare commits
1 Commits
master
...
android-us
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60880311dc |
@ -28,7 +28,7 @@ apply plugin: 'com.android.application'
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation 'com.github.mik3y:usb-serial-for-android:v2.2.2'
|
implementation 'com.github.mik3y:usb-serial-for-android:v3.4.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@ -62,6 +62,11 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
abortOnError false
|
abortOnError false
|
||||||
}
|
}
|
||||||
|
|||||||
@ -298,9 +298,10 @@ public class AndroidSerial {
|
|||||||
Log.d(TAG, "in " + Thread.currentThread().getStackTrace()[2].getMethodName());
|
Log.d(TAG, "in " + Thread.currentThread().getStackTrace()[2].getMethodName());
|
||||||
try {
|
try {
|
||||||
Log.d(TAG, "write length: " + data.length);
|
Log.d(TAG, "write length: " + data.length);
|
||||||
int retval = usbSerialPort.write(data, timeout);
|
usbSerialPort.write(data, timeout);
|
||||||
Log.d(TAG, "actual write length: " + retval);
|
/* throws an exception if we didn't write all data successfully */
|
||||||
return retval;
|
Log.d(TAG, "successfully written");
|
||||||
|
return data.length;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.e(TAG, "Error in " + Thread.currentThread().getStackTrace()[2].getMethodName(), e);
|
Log.e(TAG, "Error in " + Thread.currentThread().getStackTrace()[2].getMethodName(), e);
|
||||||
return AndroidSerial.DC_STATUS_IO;
|
return AndroidSerial.DC_STATUS_IO;
|
||||||
@ -313,8 +314,9 @@ public class AndroidSerial {
|
|||||||
Log.d(TAG, "in " + Thread.currentThread().getStackTrace()[2].getMethodName());
|
Log.d(TAG, "in " + Thread.currentThread().getStackTrace()[2].getMethodName());
|
||||||
try {
|
try {
|
||||||
if ((direction | AndroidSerial.DC_DIRECTION_INPUT) > 0) readBuffer.clear();
|
if ((direction | AndroidSerial.DC_DIRECTION_INPUT) > 0) readBuffer.clear();
|
||||||
boolean retval = this.usbSerialPort.purgeHwBuffers((direction | AndroidSerial.DC_DIRECTION_OUTPUT) > 0, (direction | AndroidSerial.DC_DIRECTION_INPUT) > 0);
|
this.usbSerialPort.purgeHwBuffers((direction | AndroidSerial.DC_DIRECTION_OUTPUT) > 0, (direction | AndroidSerial.DC_DIRECTION_INPUT) > 0);
|
||||||
return retval ? AndroidSerial.DC_STATUS_SUCCESS : AndroidSerial.DC_STATUS_IO;
|
/* throws exeption if an error occured or flush isn't supported */
|
||||||
|
return AndroidSerial.DC_STATUS_SUCCESS;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.e(TAG, "Error in " + Thread.currentThread().getStackTrace()[2].getMethodName(), e);
|
Log.e(TAG, "Error in " + Thread.currentThread().getStackTrace()[2].getMethodName(), e);
|
||||||
return AndroidSerial.DC_STATUS_IO;
|
return AndroidSerial.DC_STATUS_IO;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user