Skip to content

Commit

Permalink
Only trim the incoming string once
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lauszus
Lauszus committed Feb 3, 2014
1 parent ce04ba8 commit 1b178a2
Showing 1 changed file with 29 additions and 25 deletions.
54 changes: 29 additions & 25 deletions src/com/tkjelectronics/balanduino/BluetoothChatService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,46 +403,50 @@ public void run() {
for (int i = 0; i < splitMessage.length; i++)
Log.i(TAG, "splitMessage[" + i + "]: " + splitMessage[i]);
}
if (splitMessage[0].trim().equals(BalanduinoActivity.responsePIDValues) && splitMessage.length == BalanduinoActivity.responsePIDValuesLength) {
BalanduinoActivity.pValue = splitMessage[1].trim();
BalanduinoActivity.iValue = splitMessage[2].trim();
BalanduinoActivity.dValue = splitMessage[3].trim();
BalanduinoActivity.targetAngleValue = splitMessage[4].trim();

for (int i = 0; i < splitMessage.length; i++)
splitMessage[i] = splitMessage[i].trim(); // Trim message

if (splitMessage[0].equals(BalanduinoActivity.responsePIDValues) && splitMessage.length == BalanduinoActivity.responsePIDValuesLength) {
BalanduinoActivity.pValue = splitMessage[1];
BalanduinoActivity.iValue = splitMessage[2];
BalanduinoActivity.dValue = splitMessage[3];
BalanduinoActivity.targetAngleValue = splitMessage[4];
BalanduinoActivity.newPIDValues = true;

mHandler.obtainMessage(BalanduinoActivity.MESSAGE_READ).sendToTarget(); // Send message back to the UI Activity
} else if (splitMessage[0].trim().equals(BalanduinoActivity.responseSettings) && splitMessage.length == BalanduinoActivity.responseSettingsLength) {
BalanduinoActivity.backToSpot = splitMessage[1].trim().equals("1");
BalanduinoActivity.maxAngle = Integer.parseInt(splitMessage[2].trim());
BalanduinoActivity.maxTurning = Integer.parseInt(splitMessage[3].trim());
} else if (splitMessage[0].trim().equals(BalanduinoActivity.responseInfo) && splitMessage.length == BalanduinoActivity.responseInfoLength) {
BalanduinoActivity.firmwareVersion = splitMessage[1].trim();
BalanduinoActivity.eepromVersion = splitMessage[2].trim();
BalanduinoActivity.mcu = splitMessage[3].trim();
} else if (splitMessage[0].equals(BalanduinoActivity.responseSettings) && splitMessage.length == BalanduinoActivity.responseSettingsLength) {
BalanduinoActivity.backToSpot = splitMessage[1].equals("1");
BalanduinoActivity.maxAngle = Integer.parseInt(splitMessage[2]);
BalanduinoActivity.maxTurning = Integer.parseInt(splitMessage[3]);
} else if (splitMessage[0].equals(BalanduinoActivity.responseInfo) && splitMessage.length == BalanduinoActivity.responseInfoLength) {
BalanduinoActivity.firmwareVersion = splitMessage[1];
BalanduinoActivity.eepromVersion = splitMessage[2];
BalanduinoActivity.mcu = splitMessage[3];
BalanduinoActivity.newInfo = true;

mHandler.obtainMessage(BalanduinoActivity.MESSAGE_READ).sendToTarget(); // Send message back to the UI Activity
} else if (splitMessage[0].trim().equals(BalanduinoActivity.responseStatus) && splitMessage.length == BalanduinoActivity.responseStatusLength) {
BalanduinoActivity.batteryLevel = splitMessage[1].trim();
BalanduinoActivity.runtime = Double.parseDouble(splitMessage[2].trim());
} else if (splitMessage[0].equals(BalanduinoActivity.responseStatus) && splitMessage.length == BalanduinoActivity.responseStatusLength) {
BalanduinoActivity.batteryLevel = splitMessage[1];
BalanduinoActivity.runtime = Double.parseDouble(splitMessage[2]);
BalanduinoActivity.newStatus = true;

mHandler.obtainMessage(BalanduinoActivity.MESSAGE_READ).sendToTarget(); // Send message back to the UI Activity
} else if (splitMessage[0].trim().equals(BalanduinoActivity.responseKalmanValues) && splitMessage.length == BalanduinoActivity.responseKalmanValuesLength) {
BalanduinoActivity.Qangle = splitMessage[1].trim();
BalanduinoActivity.Qbias = splitMessage[2].trim();
BalanduinoActivity.Rmeasure = splitMessage[3].trim();
} else if (splitMessage[0].equals(BalanduinoActivity.responseKalmanValues) && splitMessage.length == BalanduinoActivity.responseKalmanValuesLength) {
BalanduinoActivity.Qangle = splitMessage[1];
BalanduinoActivity.Qbias = splitMessage[2];
BalanduinoActivity.Rmeasure = splitMessage[3];
BalanduinoActivity.newKalmanValues = true;

mHandler.obtainMessage(BalanduinoActivity.MESSAGE_READ).sendToTarget(); // Send message back to the UI Activity
} else if (splitMessage[0].trim().equals(BalanduinoActivity.responseIMU) && splitMessage.length == BalanduinoActivity.responseIMULength) {
BalanduinoActivity.accValue = splitMessage[1].trim();
BalanduinoActivity.gyroValue = splitMessage[2].trim();
BalanduinoActivity.kalmanValue = splitMessage[3].trim();
} else if (splitMessage[0].equals(BalanduinoActivity.responseIMU) && splitMessage.length == BalanduinoActivity.responseIMULength) {
BalanduinoActivity.accValue = splitMessage[1];
BalanduinoActivity.gyroValue = splitMessage[2];
BalanduinoActivity.kalmanValue = splitMessage[3];
BalanduinoActivity.newIMUValues = true;

mHandler.obtainMessage(BalanduinoActivity.MESSAGE_READ).sendToTarget(); // Send message back to the UI Activity
} else if (splitMessage[0].trim().equals(BalanduinoActivity.responsePairConfirmation) && splitMessage.length == BalanduinoActivity.responsePairConfirmationLength) {
} else if (splitMessage[0].equals(BalanduinoActivity.responsePairConfirmation) && splitMessage.length == BalanduinoActivity.responsePairConfirmationLength) {
BalanduinoActivity.pairingWithDevice = true;

mHandler.obtainMessage(BalanduinoActivity.MESSAGE_READ).sendToTarget(); // Send message back to the UI Activity
Expand Down

0 comments on commit 1b178a2

Please sign in to comment.