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

fix Level setting

Browse source
This commit is contained in:
Harald Hoyer 2017-04-27 19:02:40 +02:00
parent 3f3280a7c0
commit 4bd5348601
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Application/src/main/java/org/surfsite/iconsole/BluetoothChatFragment.java
View file

@ -225,6 +225,7 @@ public class BluetoothChatFragment extends Fragment {
mStartButton.setOnClickListener(new View.OnClickListener() { mStartButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mLevel.setValue(1);
if (mChatService != null) if (mChatService != null)
mChatService.startIConsole(); mChatService.startIConsole();
} }
@ -233,6 +234,7 @@ public class BluetoothChatFragment extends Fragment {
mStopButton.setOnClickListener(new View.OnClickListener() { mStopButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mLevel.setValue(1);
if (mChatService != null) if (mChatService != null)
mChatService.stopIConsole(); mChatService.stopIConsole();
} }
@ -241,6 +243,7 @@ public class BluetoothChatFragment extends Fragment {
mDisconnectButton.setOnClickListener(new View.OnClickListener() { mDisconnectButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mLevel.setValue(1);
if (mChatService != null) if (mChatService != null)
mChatService.stopBT(); mChatService.stopBT();
} }
@ -250,11 +253,15 @@ public class BluetoothChatFragment extends Fragment {
mStopButton.setEnabled(false); mStopButton.setEnabled(false);
mDisconnectButton.setEnabled(false); mDisconnectButton.setEnabled(false);
mLevel.setEnabled(false); mLevel.setEnabled(false);
mLevel.setOnClickListener(new View.OnClickListener() { mLevel.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() {
@Override @Override
public void onClick(View v) { public void onValueChange(NumberPicker p, int oldval, int newval) {
if (mChatService != null) //Log.e(TAG, "setLevel");
mChatService.setLevel(mLevel.getValue()); if (mChatService != null) {
if (!mChatService.setLevel(newval))
Log.e(TAG, "setLevel failed");
}
} }
}); });
} }
@ -341,6 +348,7 @@ public class BluetoothChatFragment extends Fragment {
mStopButton.setEnabled(true); mStopButton.setEnabled(true);
mDisconnectButton.setEnabled(true); mDisconnectButton.setEnabled(true);
mLevel.setEnabled(true); mLevel.setEnabled(true);
mLevel.setValue(1);
break; break;
case BluetoothChatService.STATE_CONNECTING: case BluetoothChatService.STATE_CONNECTING:
setStatus(R.string.title_connecting); setStatus(R.string.title_connecting);
@ -363,14 +371,14 @@ public class BluetoothChatFragment extends Fragment {
if (!(msg.obj instanceof IConsole.Data)) if (!(msg.obj instanceof IConsole.Data))
return; return;
IConsole.Data data = (IConsole.Data) msg.obj; IConsole.Data data = (IConsole.Data) msg.obj;
mSpeedText.setText(String.format("Speed\n% 3.1f", data.mSpeed10 / 10.0)); mSpeedText.setText(String.format("% 3.1f", data.mSpeed10 / 10.0));
mPowerText.setText(String.format("Power\n% 3.1f", data.mPower10 / 10.0)); mPowerText.setText(String.format("% 3.1f", data.mPower10 / 10.0));
mRPMText.setText(String.format("RPM\n%d", data.mRPM)); mRPMText.setText(String.format("%d", data.mRPM));
mDistanceText.setText(String.format("Distance\n% 3.1f", data.mDistance10 / 10.0)); mDistanceText.setText(String.format("% 3.1f", data.mDistance10 / 10.0));
mCaloriesText.setText(String.format("Calories\n% 3.1f", data.mSpeed10 / 10.0)); mCaloriesText.setText(String.format("% 3d", data.mCalories));
mHFText.setText(String.format("Heart\n%d", data.mHF)); mHFText.setText(String.format("%d", data.mHF));
mTimeText.setText(String.format("Time:\n%s",data.getTimeStr())); mTimeText.setText(String.format("%s",data.getTimeStr()));
mLevel.setValue(data.mLevel); //mLevel.setValue(data.mLevel);
break; break;
case Constants.MESSAGE_WRITE: case Constants.MESSAGE_WRITE:
//byte[] writeBuf = (byte[]) msg.obj; //byte[] writeBuf = (byte[]) msg.obj;

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

@ -481,9 +481,7 @@ public class BluetoothChatService extends Service {
} }
public boolean setLevel(int level) { public boolean setLevel(int level) { return mmIConsole.setLevel(level); }
return mmIConsole.setLevel(level);
}
public boolean startIConsole() { return mmIConsole.start(); } public boolean startIConsole() { return mmIConsole.start(); }
public boolean stopIConsole() { return mmIConsole.stop(); } public boolean stopIConsole() { return mmIConsole.stop(); }

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

@ -144,6 +144,7 @@ class IConsole {
return false; return false;
this.mNextState = State.SETLEVEL; this.mNextState = State.SETLEVEL;
Log.d(TAG, String.format("Set Level to %d", level));
this.mSetLevel = level; this.mSetLevel = level;
} }
return true; return true;
@ -191,6 +192,7 @@ class IConsole {
byte[] packet = SETLEVEL.clone(); byte[] packet = SETLEVEL.clone();
packet[4] = (byte) (packet[4] + level); packet[4] = (byte) (packet[4] + level);
packet[5] = (byte) ((packet[5] + level) & 0xFF); packet[5] = (byte) ((packet[5] + level) & 0xFF);
//Log.d(TAG, "send_level");
return send(packet); return send(packet);
} }