harald/iconsole-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add state machine and callbacks

Browse source
This commit is contained in:
Harald Hoyer 2017-04-26 08:13:25 +02:00 committed by Harald Hoyer
parent 994aa5ac5a
commit 6e7bb3598a
3 changed files with 164 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Application/Application.iml
View file

@ -66,13 +66,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/template/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/template/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/tests/assets" type="java-test-resource" />
@ -80,6 +73,13 @@
<sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

77
Application/src/main/java/org/surfsite/iconsole/BluetoothChatService.java
View file

@ -323,6 +323,7 @@ public class BluetoothChatService {
private final BluetoothSocket mmSocket; private final BluetoothSocket mmSocket;
private final InputStream mmInStream; private final InputStream mmInStream;
private final OutputStream mmOutStream; private final OutputStream mmOutStream;
private final IConsole mmIConsole;
public ConnectedThread(BluetoothSocket socket) { public ConnectedThread(BluetoothSocket socket) {
Log.d(TAG, "create ConnectedThread"); Log.d(TAG, "create ConnectedThread");
@ -341,56 +342,60 @@ public class BluetoothChatService {
mmInStream = tmpIn; mmInStream = tmpIn;
mmOutStream = tmpOut; mmOutStream = tmpOut;
mState = STATE_CONNECTED; mState = STATE_CONNECTED;
}
public void run() { mmIConsole = new IConsole(mmInStream, mmOutStream, new IConsole.DataListner() {
Log.i(TAG, "BEGIN mConnectedThread"); @Override
byte[] buffer = new byte[5]; public void onData(IConsole.Data data) {
int bytes; Log.i(TAG, "mConnectedThread: " + data.toString());
int i = 0; /* print */
}
// Keep listening to the InputStream while connected @Override
while (mState == STATE_CONNECTED && i < 100) { public void onError(Exception e) {
try { Log.e(TAG, "mConnectedThread Error: ", e);
try {
Thread.sleep(500); if (e instanceof IOException)
} catch (InterruptedException e) { connectionLost();
/* pass */; }
} }, new IConsole.DebugListner() {
i++; @Override
this.write(IConsole.PING); public void onRead(byte[] buffer) {
// Read from the InputStream if (buffer.length > 0) {
bytes = mmInStream.read(buffer); String hexbuf = IConsole.byteArrayToHex(Arrays.copyOfRange(buffer, 0, buffer.length)) + '\n';
if (bytes > 0) {
String hexbuf = IConsole.byteArrayToHex(Arrays.copyOfRange(buffer, 0, bytes)) + '\n';
// Send the obtained bytes to the UI Activity // Send the obtained bytes to the UI Activity
mHandler.obtainMessage(Constants.MESSAGE_READ, hexbuf.length(), -1, hexbuf.getBytes()) mHandler.obtainMessage(Constants.MESSAGE_READ, hexbuf.length(), -1, hexbuf.getBytes())
.sendToTarget(); .sendToTarget();
} }
} catch (IOException e) {
Log.e(TAG, "disconnected", e);
connectionLost();
break;
} }
@Override
public void onWrite(byte[] buffer) {
String hexbuf = IConsole.byteArrayToHex(buffer) + '\n';
// Share the sent message back to the UI Activity
mHandler.obtainMessage(Constants.MESSAGE_WRITE, -1, -1, hexbuf.getBytes())
.sendToTarget();
}
});
}
public void run() {
Log.i(TAG, "BEGIN mConnectedThread");
while (mState == STATE_CONNECTED) {
if (!mmIConsole.processIO())
break;
} }
} }
public boolean setLevel(int level) {
public void write(byte[] buffer) { return mmIConsole.setLevel(level);
try {
mmOutStream.write(buffer);
String hexbuf = IConsole.byteArrayToHex(buffer) + '\n';
// Share the sent message back to the UI Activity
mHandler.obtainMessage(Constants.MESSAGE_WRITE, -1, -1, hexbuf.getBytes())
.sendToTarget();
} catch (IOException e) {
Log.e(TAG, "Exception during write", e);
}
} }
public void cancel() { public void cancel() {
mmIConsole.stop();
try { try {
mmSocket.close(); mmSocket.close();
} catch (IOException e) { } catch (IOException e) {

147
Application/src/main/java/org/surfsite/iconsole/IConsole.java
View file

@ -1,42 +1,127 @@
package org.surfsite.iconsole; package org.surfsite.iconsole;
import java.io.InputStream;
import java.io.OutputStream;
/** /**
* Created by harald on 25.04.17. * Created by harald on 25.04.17.
*/ */
public class IConsole { public class IConsole {
public static final byte[] PING = { (byte) 0xf0, (byte) 0xa0, (byte) 0x01, (byte) 0x01, (byte) 0x92 }; public static final byte[] PING = {(byte) 0xf0, (byte) 0xa0, (byte) 0x01, (byte) 0x01, (byte) 0x92 };
/* public static final byte[] INIT_A0 = {(byte) 0xf0, (byte) 0xa0, 0x02, 0x02, (byte) 0x94};
INIT_A0 = struct.pack('BBBBB', 0xf0, 0xa0, 0x02, 0x02, 0x94) public static final byte[] PONG = {(byte) 0xf0, (byte) 0xb0, 0x01, 0x01, (byte) 0xa2};
PING = struct.pack('BBBBB', 0xf0, 0xa0, 0x01, 0x01, 0x92) public static final byte[] STATUS = {(byte) 0xf0, (byte) 0xa1, 0x01, 0x01, (byte) 0x93};
PONG = struct.pack('BBBBB', 0xf0, 0xb0, 0x01, 0x01, 0xa2) public static final byte[] INIT_A3 = {(byte) 0xf0, (byte) 0xa3, 0x01, 0x01, 0x01, (byte) 0x96};
STATUS = struct.pack('BBBBB', 0xf0, 0xa1, 0x01, 0x01, 0x93) public static final byte[] INIT_A4 = {(byte) 0xf0, (byte) 0xa4, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, (byte) 0xa0};
INIT_A3 = struct.pack('BBBBBB', 0xf0, 0xa3, 0x01, 0x01, 0x01, 0x96) public static final byte[] START = {(byte) 0xf0, (byte) 0xa5, 0x01, 0x01, 0x02, (byte) 0x99};
INIT_A4 = struct.pack('BBBBBBBBBBBBBBB', 0xf0, 0xa4, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xa0) public static final byte[] STOP = {(byte) 0xf0, (byte) 0xa5, 0x01, 0x01, 0x04, (byte) 0x9b};
START = struct.pack('BBBBBB', 0xf0, 0xa5, 0x01, 0x01, 0x02, 0x99) public static final byte[] READ = {(byte) 0xf0, (byte) 0xa2, 0x01, 0x01, (byte) 0x94};
STOP = struct.pack('BBBBBB', 0xf0, 0xa5, 0x01, 0x01, 0x04, 0x9b) public static final byte[] SETLEVEL = {(byte) 0xf0, (byte) 0xa6, 0x01, 0x01, 0x01, (byte)((0xf0+0xa6+3) & 0xFF)};
READ = struct.pack('BBBBB', 0xf0, 0xa2, 0x01, 0x01, 0x94)
*/
/* private enum State {
def __init__(self, got): BEGIN,
gota = struct.unpack('BBBBBBBBBBBBBBBBBBBBB', got) PING,
self.time_str = "%02d:%02d:%02d:%02d" % (gota[2]-1, gota[3]-1, gota[4]-1, gota[5]-1) A0,
self.speed = ((100*(gota[6]-1) + gota[7] -1) / 10.0) A1,
self.speed_str = "V: % 3.1f km/h" % self.speed A3,
self.rpm = ((100*(gota[8]-1) + gota[9] -1)) A4,
self.rpm_str = "% 3d RPM" % self.rpm START,
self.distance = ((100*(gota[10]-1) + gota[11] -1) / 10.0) STOP,
self.distance_str = "D: % 3.1f km" % self.distance READ,
self.calories = ((100*(gota[12]-1) + gota[13] -1)) SETLEVEL,
self.calories_str = "% 3d kcal" % self.calories }
self.hf = ((100*(gota[14]-1) + gota[15] -1))
self.hf_str = "HF % 3d" % self.hf private State mCurrentState;
self.power = ((100*(gota[16]-1) + gota[17] -1) / 10.0) private State mNextState;
self.power_str = "% 3.1f W" % self.power private int mSetLevel;
self.lvl = gota[18] -1 private final InputStream mInputStream;
self.lvl_str = "L: %d" % self.lvl private final OutputStream mOutputStream;
*/ private final DataListner mDataListner;
private final DebugListner mDebugListner;
public IConsole(InputStream inputStream, OutputStream outputStream, DataListner dataListner, DebugListner debugListner) {
this.mInputStream = inputStream;
this.mOutputStream = outputStream;
this.mDataListner = dataListner;
this.mDebugListner = debugListner;
this.mCurrentState = State.BEGIN;
this.mNextState = State.PING;
this.mSetLevel = 1;
}
public class Data {
long mTime; // in seconds
int mSpeed10;
int mRPM;
int mDistance10;
int mCalories;
int mHF;
int mPower10;
int mLevel;
public Data(long mTime, int mSpeed10, int mRPM, int mDistance10, int mCalories, int mHF, int mPower10, int mLevel) {
this.mTime = mTime;
this.mSpeed10 = mSpeed10;
this.mRPM = mRPM;
this.mDistance10 = mDistance10;
this.mCalories = mCalories;
this.mHF = mHF;
this.mPower10 = mPower10;
this.mLevel = mLevel;
}
public Data(byte[] bytes) {
this.mTime = (((bytes[2]-1) * 24 + bytes[3]-1) * 60 + bytes[4]-1) * 60 + bytes[5]-1 ;
this.mSpeed10 = 100 * (bytes[ 6] - 1) + bytes[ 7] - 1;
this.mRPM = 100 * (bytes[ 8] - 1) + bytes[ 9] - 1;
this.mDistance10 = 100 * (bytes[10] - 1) + bytes[11] - 1;
this.mCalories = 100 * (bytes[12] - 1) + bytes[13] - 1;
this.mHF = 100 * (bytes[14] - 1) + bytes[15] - 1;
this.mPower10 = 100 * (bytes[16] - 1) + bytes[17] - 1;
this.mLevel = bytes[18] -1;
}
}
public interface DataListner {
void onData(Data data);
void onError(Exception e);
}
public interface DebugListner {
void onRead(byte[] bytes);
void onWrite(byte[] bytes);
}
public boolean processIO() {
synchronized (this) {
Data data = new Data(0, 0, 0, 0, 0, 0, 0, 0);
if (null != mDebugListner) {
mDebugListner.onWrite(PING);
mDebugListner.onRead(PONG);
}
mDataListner.onData(data);
}
return true;
}
public boolean stop() {
return true;
}
public boolean setLevel(int level) {
synchronized (this) {
if (mCurrentState != State.READ)
return false;
this.mCurrentState = State.SETLEVEL;
this.mNextState = State.READ;
this.mSetLevel = level;
}
return true;
}
/* /*
def send_ack(packet, expect=None, plen=0): def send_ack(packet, expect=None, plen=0):