From 7b9a5bdca8d5c53ed79a4f51c21dac175a59731c Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 10:45:19 +0900
Subject: [PATCH 01/22] Create Layout of SpiFragment
---
.../src/main/res/layout/fragment_spi.xml | 90 +++++++++++++++++++
.../src/main/res/values/values.xml | 8 ++
2 files changed, 98 insertions(+)
create mode 100644 samples/test_all_functions/src/main/res/layout/fragment_spi.xml
diff --git a/samples/test_all_functions/src/main/res/layout/fragment_spi.xml b/samples/test_all_functions/src/main/res/layout/fragment_spi.xml
new file mode 100644
index 0000000..c986bc3
--- /dev/null
+++ b/samples/test_all_functions/src/main/res/layout/fragment_spi.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/test_all_functions/src/main/res/values/values.xml b/samples/test_all_functions/src/main/res/values/values.xml
index bc4b74e..e05bd5b 100644
--- a/samples/test_all_functions/src/main/res/values/values.xml
+++ b/samples/test_all_functions/src/main/res/values/values.xml
@@ -12,5 +12,13 @@
- 100kHz
- 400kHz
+
+ - 200K
+ - 500K
+ - 1M
+ - 2M
+ - 3M
+ - 6M
+
#ccffffff
From a414a144e7c3b73064a11d1c603ac51615465b82 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 12:31:52 +0900
Subject: [PATCH 02/22] add spiLabelToValue to Utils
---
.../konashi/test_all_functions/Utils.java | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/Utils.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/Utils.java
index 262ceb6..b913bb8 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/Utils.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/Utils.java
@@ -80,4 +80,26 @@ public TableRow build() {
return tableRow;
}
}
+
+ public static int spiLabelToValue(String spiLabel) {
+ if (spiLabel.equals("200K")) {
+ return Konashi.SPI_SPEED_200K;
+ }
+ if (spiLabel.equals("500K")) {
+ return Konashi.SPI_SPEED_500K;
+ }
+ if (spiLabel.equals("1M")) {
+ return Konashi.SPI_SPEED_1M;
+ }
+ if (spiLabel.equals("2M")) {
+ return Konashi.SPI_SPEED_2M;
+ }
+ if (spiLabel.equals("3M")) {
+ return Konashi.SPI_SPEED_3M;
+ }
+ if (spiLabel.equals("6M")) {
+ return Konashi.SPI_SPEED_6M;
+ }
+ return 0;
+ }
}
From e35d18434f43a8c1cbfde870462aa4475b128338 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 13:19:23 +0900
Subject: [PATCH 03/22] Add Navigation Drawer item
---
.../java/com/uxxu/konashi/test_all_functions/MainActivity.java | 3 +++
.../konashi/test_all_functions/NavigationDrawerFragment.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/MainActivity.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/MainActivity.java
index dfea324..eef7f9b 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/MainActivity.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/MainActivity.java
@@ -124,6 +124,9 @@ public void onNavigationDrawerItemSelected(int position) {
case 4:
fragment = new CommunicationFragment();
break;
+ case 5:
+ fragment = new SpiFragment();
+ break;
}
if (fragment != null) {
getFragmentManager()
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/NavigationDrawerFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/NavigationDrawerFragment.java
index 2c4e395..a500bd2 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/NavigationDrawerFragment.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/NavigationDrawerFragment.java
@@ -102,7 +102,8 @@ public void onItemClick(AdapterView parent, View view, int position, long id)
PioFragment.TITLE,
PwmFragment.TITLE,
AioFragment.TITLE,
- CommunicationFragment.TITLE
+ CommunicationFragment.TITLE,
+ SpiFragment.TITLE
}));
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
return mDrawerListView;
From f1462a8c6e04eb5860eb6e0ffe82144c2036e742 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 13:19:49 +0900
Subject: [PATCH 04/22] Implemented SpiFragment
---
.../test_all_functions/SpiFragment.java | 193 ++++++++++++++++++
1 file changed, 193 insertions(+)
create mode 100644 samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
new file mode 100644
index 0000000..c780474
--- /dev/null
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
@@ -0,0 +1,193 @@
+package com.uxxu.konashi.test_all_functions;
+
+import android.app.Fragment;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.Switch;
+import android.widget.Toast;
+
+import com.uxxu.konashi.lib.Konashi;
+import com.uxxu.konashi.lib.KonashiListener;
+import com.uxxu.konashi.lib.KonashiManager;
+
+import org.jdeferred.DoneCallback;
+import org.jdeferred.DonePipe;
+import org.jdeferred.FailCallback;
+import org.jdeferred.Promise;
+
+import info.izumin.android.bletia.BletiaException;
+
+/**
+ * Created by kiryu on 7/27/15.
+ */
+public final class SpiFragment extends Fragment {
+ public static final String TITLE = "SPI";
+
+ private KonashiManager mKonashiManager;
+
+ private Switch mSpiSwitch;
+ private Spinner mSpiBaudrateSpinner;
+ private EditText mSpiDataEditText;
+ private Button mSpiDataSendButton;
+ private EditText mSpiResultEditText;
+ private Button mSpiResultClearButton;
+
+ private byte[] mValue;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ getActivity().setTitle(TITLE);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.fragment_spi, container, false);
+
+ initSpiViews(view);
+
+ return view;
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ mKonashiManager = Konashi.getManager();
+ mKonashiManager.addListener(mKonashiListener);
+ }
+
+ @Override
+ public void onDestroy() {
+ mKonashiManager.removeListener(mKonashiListener);
+ super.onDestroy();
+ }
+
+ private void initSpiViews(final View parent) {
+ mSpiBaudrateSpinner = (Spinner) parent.findViewById(R.id.spiBaudrateSpinner);
+ mSpiBaudrateSpinner.setSelection(1);
+ mSpiBaudrateSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView adapterView, View view, int i, long l) {
+ resetSpi();
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView adapterView) {
+ }
+ });
+
+ mSpiSwitch = (Switch) parent.findViewById(R.id.spiSwitch);
+ mSpiSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+ resetSpi();
+ }
+ });
+
+ mSpiDataEditText = (EditText) parent.findViewById(R.id.spiDataEditText);
+
+ mSpiDataSendButton = (Button) parent.findViewById(R.id.spiDataSendButton);
+ mSpiDataSendButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ mKonashiManager.uartWrite(mSpiDataEditText.getText().toString().getBytes())
+ .then(new DoneCallback() {
+ @Override
+ public void onDone(BluetoothGattCharacteristic result) {
+ }
+ })
+ .fail(new FailCallback() {
+ @Override
+ public void onFail(BletiaException result) {
+ Toast.makeText(getActivity(), result.getMessage(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+ });
+
+ mSpiResultEditText = (EditText) parent.findViewById(R.id.spiResultEditText);
+
+ mSpiResultClearButton = (Button) parent.findViewById(R.id.spiResultClearButton);
+ mSpiResultClearButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ mSpiResultEditText.setText("");
+ }
+ });
+ setEnableSpiViews(false);
+ }
+
+ private void resetSpi() {
+ if (!mKonashiManager.isReady()) {
+ return;
+ }
+ if (mSpiSwitch.isChecked()) {
+ int i = mSpiBaudrateSpinner.getSelectedItemPosition();
+ String[] labels = getResources().getStringArray(R.array.uart_baudrates_labels);
+ String label = labels[i];
+ int baudrate = Utils.spiLabelToValue(label);
+ mKonashiManager.spiConfig(Konashi.SPI_MODE_ENABLE_CPOL0_CPHA0,
+ Konashi.SPI_BIT_ORDER_LITTLE_ENDIAN, baudrate)
+ .then(new DonePipe() {
+ @Override
+ public Promise pipeDone(BluetoothGattCharacteristic result) {
+ return mKonashiManager.pinMode(Konashi.PIO2, Konashi.OUTPUT);
+ }
+ })
+ .then(new DonePipe() {
+ @Override
+ public Promise pipeDone(BluetoothGattCharacteristic result) {
+ setEnableSpiViews(true);
+ return mKonashiManager.digitalWrite(Konashi.PIO2, Konashi.HIGH);
+ }
+ })
+ .fail(new FailCallback() {
+ @Override
+ public void onFail(BletiaException result) {
+ Toast.makeText(getActivity(), result.getMessage(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ } else {
+ mKonashiManager.spiConfig(Konashi.SPI_MODE_DISABLE, Konashi.SPI_BIT_ORDER_LITTLE_ENDIAN, Konashi.SPI_SPEED_1M)
+ .then(new DoneCallback() {
+ @Override
+ public void onDone(BluetoothGattCharacteristic result) {
+ setEnableSpiViews(false);
+ }
+ });
+ }
+ }
+
+
+ private void setEnableSpiViews(boolean enable) {
+ mSpiBaudrateSpinner.setEnabled(enable);
+ mSpiDataEditText.setEnabled(enable);
+ mSpiDataSendButton.setEnabled(enable);
+ }
+
+ private final KonashiListener mKonashiListener = new KonashiListener() {
+ @Override public void onConnect(KonashiManager manager) {}
+ @Override public void onDisconnect(KonashiManager manager) {}
+ @Override public void onError(KonashiManager manager, BletiaException e) {}
+ @Override public void onUpdatePioOutput(KonashiManager manager, int value) {}
+ @Override public void onUpdateUartRx(KonashiManager manager, byte[] value) {}
+
+ @Override
+ public void onUpdateSpiMiso(KonashiManager manager, byte[] value) {
+ mValue = value;
+ mSpiResultEditText.append(new String(mValue));
+ }
+
+ @Override public void onUpdateBatteryLevel(KonashiManager manager, int level) {}
+ };
+}
From 9b8dd343a8a8ba8f12618c7ca2c1e4d6eca66909 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 13:29:48 +0900
Subject: [PATCH 05/22] Fix uartWrite to spiWrite
---
.../java/com/uxxu/konashi/test_all_functions/SpiFragment.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
index c780474..df80177 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
@@ -27,7 +27,7 @@
import info.izumin.android.bletia.BletiaException;
/**
- * Created by kiryu on 7/27/15.
+ * Created by e10dokup on 12/16/15
*/
public final class SpiFragment extends Fragment {
public static final String TITLE = "SPI";
@@ -100,7 +100,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
mSpiDataSendButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mKonashiManager.uartWrite(mSpiDataEditText.getText().toString().getBytes())
+ mKonashiManager.spiWrite(mSpiDataEditText.getText().toString().getBytes())
.then(new DoneCallback() {
@Override
public void onDone(BluetoothGattCharacteristic result) {
From 0e9312973ac5d7f7421ca551579e1b395e2554d3 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 13:32:25 +0900
Subject: [PATCH 06/22] Adapt send method to SpiSample
---
.../test_all_functions/SpiFragment.java | 27 ++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
index df80177..fda8513 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
@@ -24,6 +24,8 @@
import org.jdeferred.FailCallback;
import org.jdeferred.Promise;
+import java.util.Arrays;
+
import info.izumin.android.bletia.BletiaException;
/**
@@ -100,10 +102,33 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
mSpiDataSendButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mKonashiManager.spiWrite(mSpiDataEditText.getText().toString().getBytes())
+ mKonashiManager.digitalWrite(Konashi.PIO2, Konashi.LOW)
+ .then(new DonePipe() {
+ @Override
+ public Promise pipeDone(BluetoothGattCharacteristic result) {
+ return mKonashiManager.spiWrite(mSpiDataEditText.getText().toString().getBytes());
+ }
+ })
+ .then(new DonePipe() {
+ @Override
+ public Promise pipeDone(BluetoothGattCharacteristic result) {
+ return mKonashiManager.digitalWrite(Konashi.PIO2, Konashi.HIGH);
+ }
+ })
+ .then(new DonePipe() {
+ @Override
+ public Promise pipeDone(BluetoothGattCharacteristic result) {
+ return mKonashiManager.spiRead();
+ }
+ })
.then(new DoneCallback() {
@Override
public void onDone(BluetoothGattCharacteristic result) {
+ byte data[] = new byte[result.getValue().length];
+ for (int i = 0; i < result.getValue().length; i++) {
+ data[i] = (byte) ((result.getValue()[i] & 0xff) );
+ }
+ mSpiResultEditText.setText(Arrays.toString(data));
}
})
.fail(new FailCallback() {
From 134e12115b925f175e66a0c07ea1f0eb54aea220 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 13:43:19 +0900
Subject: [PATCH 07/22] Fix name spiBaudrate to spiSpeed
---
.../test_all_functions/SpiFragment.java | 18 +++++++++---------
.../src/main/res/layout/fragment_spi.xml | 4 ++--
.../src/main/res/values/values.xml | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
index fda8513..233e220 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
@@ -37,7 +37,7 @@ public final class SpiFragment extends Fragment {
private KonashiManager mKonashiManager;
private Switch mSpiSwitch;
- private Spinner mSpiBaudrateSpinner;
+ private Spinner mSpiSpeedSpinner;
private EditText mSpiDataEditText;
private Button mSpiDataSendButton;
private EditText mSpiResultEditText;
@@ -75,9 +75,9 @@ public void onDestroy() {
}
private void initSpiViews(final View parent) {
- mSpiBaudrateSpinner = (Spinner) parent.findViewById(R.id.spiBaudrateSpinner);
- mSpiBaudrateSpinner.setSelection(1);
- mSpiBaudrateSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ mSpiSpeedSpinner = (Spinner) parent.findViewById(R.id.spiSpeedSpinner);
+ mSpiSpeedSpinner.setSelection(1);
+ mSpiSpeedSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView adapterView, View view, int i, long l) {
resetSpi();
@@ -157,12 +157,12 @@ private void resetSpi() {
return;
}
if (mSpiSwitch.isChecked()) {
- int i = mSpiBaudrateSpinner.getSelectedItemPosition();
- String[] labels = getResources().getStringArray(R.array.uart_baudrates_labels);
+ int i = mSpiSpeedSpinner.getSelectedItemPosition();
+ String[] labels = getResources().getStringArray(R.array.spi_speeds_labels);
String label = labels[i];
- int baudrate = Utils.spiLabelToValue(label);
+ int speed = Utils.spiLabelToValue(label);
mKonashiManager.spiConfig(Konashi.SPI_MODE_ENABLE_CPOL0_CPHA0,
- Konashi.SPI_BIT_ORDER_LITTLE_ENDIAN, baudrate)
+ Konashi.SPI_BIT_ORDER_LITTLE_ENDIAN, speed)
.then(new DonePipe() {
@Override
public Promise pipeDone(BluetoothGattCharacteristic result) {
@@ -195,7 +195,7 @@ public void onDone(BluetoothGattCharacteristic result) {
private void setEnableSpiViews(boolean enable) {
- mSpiBaudrateSpinner.setEnabled(enable);
+ mSpiSpeedSpinner.setEnabled(enable);
mSpiDataEditText.setEnabled(enable);
mSpiDataSendButton.setEnabled(enable);
}
diff --git a/samples/test_all_functions/src/main/res/layout/fragment_spi.xml b/samples/test_all_functions/src/main/res/layout/fragment_spi.xml
index c986bc3..a96681a 100644
--- a/samples/test_all_functions/src/main/res/layout/fragment_spi.xml
+++ b/samples/test_all_functions/src/main/res/layout/fragment_spi.xml
@@ -24,11 +24,11 @@
android:textStyle="bold"/>
100kHz
- 400kHz
-
+
- 200K
- 500K
- 1M
From 64a94ab67aa29a3a1060bbf23bbcf2206b6f4c59 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Wed, 16 Dec 2015 21:03:47 +0900
Subject: [PATCH 08/22] Choice spispeed spinner first
---
.../java/com/uxxu/konashi/test_all_functions/SpiFragment.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
index 233e220..2625a42 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
@@ -157,6 +157,7 @@ private void resetSpi() {
return;
}
if (mSpiSwitch.isChecked()) {
+ mSpiSpeedSpinner.setSelection(1);
int i = mSpiSpeedSpinner.getSelectedItemPosition();
String[] labels = getResources().getStringArray(R.array.spi_speeds_labels);
String label = labels[i];
From bcf54ab8f0e0bac038b4145632f1e8cdb7ccdcf1 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Thu, 17 Dec 2015 19:57:34 +0900
Subject: [PATCH 09/22] Change onUpdateSpiMiso's value to spiRead's result
---
.../java/com/uxxu/konashi/lib/EventEmitter.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
index 9f89dbb..7af4575 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
@@ -1,8 +1,11 @@
package com.uxxu.konashi.lib;
+import android.bluetooth.BluetoothGattCharacteristic;
import android.os.Handler;
import android.os.Looper;
+import org.jdeferred.DoneCallback;
+
import java.util.ArrayList;
import info.izumin.android.bletia.BletiaException;
@@ -72,10 +75,22 @@ public void run() {
public void emitUpdateSpiMiso(final KonashiManager manager, final byte[] value) {
mHandler.post(new Runnable() {
+ private byte mData[];
+ private KonashiListener mKonashiListener;
@Override
public void run() {
for (KonashiListener listener : self) {
- listener.onUpdateSpiMiso(manager, value);
+ mKonashiListener = listener;
+ manager.spiRead().then(new DoneCallback() {
+ @Override
+ public void onDone(BluetoothGattCharacteristic result) {
+ mData = new byte[result.getValue().length];
+ for (int i = 0; i < result.getValue().length; i++) {
+ mData[i] = (byte) ((result.getValue()[i] & 0xff));
+ mKonashiListener.onUpdateSpiMiso(manager, mData);
+ }
+ }
+ });
}
}
});
From 8ea6e8b53761634e76c9a648aacd68d7155ce58c Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Thu, 17 Dec 2015 20:02:33 +0900
Subject: [PATCH 10/22] Update SpiSample's MainActivity to get result at
onSpiMisoUpdate
---
.../konashi/sample/spisample/MainActivity.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java b/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java
index 247b512..8aeb614 100644
--- a/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java
+++ b/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java
@@ -102,22 +102,6 @@ public Promise pipeDone(Blue
return mKonashiManager.digitalWrite(Konashi.PIO2, Konashi.HIGH);
}
})
- .then(new DonePipe() {
- @Override
- public Promise pipeDone(BluetoothGattCharacteristic result) {
- return mKonashiManager.spiRead();
- }
- })
- .then(new DoneCallback() {
- @Override
- public void onDone(BluetoothGattCharacteristic result) {
- byte data[] = new byte[result.getValue().length];
- for (int i = 0; i < result.getValue().length; i++) {
- data[i] = (byte) ((result.getValue()[i] & 0xff) );
- }
- mResultText.setText(Arrays.toString(data));
- }
- })
.fail(new FailCallback() {
@Override
public void onFail(BletiaException result) {
@@ -175,6 +159,7 @@ public void onUpdateUartRx(KonashiManager manager, byte[] value) {
@Override
public void onUpdateSpiMiso(KonashiManager manager, byte[] value) {
Log.d("onUpdateSpiMiso()", Arrays.toString(value));
+ mResultText.setText(Arrays.toString(value));
}
@Override
From c3cfc3c6887d00f3d143dcb6363088bd4d8796d9 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Thu, 17 Dec 2015 22:03:16 +0900
Subject: [PATCH 11/22] Move spi Runnable to Outer Class
---
.../com/uxxu/konashi/lib/EventEmitter.java | 50 +++++++++++--------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
index 7af4575..f262def 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
@@ -74,26 +74,7 @@ public void run() {
}
public void emitUpdateSpiMiso(final KonashiManager manager, final byte[] value) {
- mHandler.post(new Runnable() {
- private byte mData[];
- private KonashiListener mKonashiListener;
- @Override
- public void run() {
- for (KonashiListener listener : self) {
- mKonashiListener = listener;
- manager.spiRead().then(new DoneCallback() {
- @Override
- public void onDone(BluetoothGattCharacteristic result) {
- mData = new byte[result.getValue().length];
- for (int i = 0; i < result.getValue().length; i++) {
- mData[i] = (byte) ((result.getValue()[i] & 0xff));
- mKonashiListener.onUpdateSpiMiso(manager, mData);
- }
- }
- });
- }
- }
- });
+ mHandler.post(new UpdateSpiMisoRunnable(self, manager));
}
public void emitUpdateBatteryLevel(final KonashiManager manager, final int level) {
@@ -107,3 +88,32 @@ public void run() {
});
}
}
+
+class UpdateSpiMisoRunnable implements Runnable {
+
+ private EventEmitter mEventEmitter;
+ private KonashiManager mKonashiManager;
+ private KonashiListener mKonashiListener;
+
+ public UpdateSpiMisoRunnable(EventEmitter eventEmitter, KonashiManager konashiManager) {
+ mEventEmitter = eventEmitter;
+ mKonashiManager = konashiManager;
+ }
+
+ @Override
+ public void run() {
+ for (KonashiListener listener : mEventEmitter) {
+ mKonashiListener = listener;
+ mKonashiManager.spiRead().then(new DoneCallback() {
+ @Override
+ public void onDone(BluetoothGattCharacteristic result) {
+ byte mData[] = new byte[result.getValue().length];
+ for (int i = 0; i < result.getValue().length; i++) {
+ mData[i] = (byte) ((result.getValue()[i] & 0xff));
+ mKonashiListener.onUpdateSpiMiso(mKonashiManager, mData);
+ }
+ }
+ });
+ }
+ }
+}
From 599dd1891af9948b1a2cbab6896edf00ba8c7a73 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Mon, 21 Dec 2015 20:10:38 +0900
Subject: [PATCH 12/22] Move spiRead before emitUpdateMiso
---
.../com/uxxu/konashi/lib/CallbackHandler.java | 17 +++++++-
.../com/uxxu/konashi/lib/EventEmitter.java | 40 +++++--------------
2 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
index ce1b9d4..560d261 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
@@ -8,6 +8,8 @@
import com.uxxu.konashi.lib.util.KonashiUtils;
import com.uxxu.konashi.lib.util.UartUtils;
+import org.jdeferred.DoneCallback;
+
import java.util.UUID;
import info.izumin.android.bletia.Bletia;
@@ -69,9 +71,22 @@ public void onCharacteristicChanged(Bletia bletia, BluetoothGattCharacteristic c
mDispatcherContainer.getUartDispatcher().onDone(characteristic);
mEmitter.emitUpdateUartRx(mManager, UartUtils.removeLengthByte(characteristic.getValue()));
} else if (KonashiUUID.SPI_NOTIFICATION_UUID.equals(uuid)) {
- mEmitter.emitUpdateSpiMiso(mManager, characteristic.getValue());
+ mManager.spiRead().then(mSpiReadDoneCallback);
} else if (KonashiUUID.HARDWARE_LOW_BAT_NOTIFICATION_UUID.equals(uuid)) {
mEmitter.emitUpdateBatteryLevel(mManager, KonashiUtils.getBatteryLevel(characteristic));
}
}
+
+ private DoneCallback mSpiReadDoneCallback = new DoneCallback() {
+ @Override
+ public void onDone(BluetoothGattCharacteristic result) {
+ byte mData[] = new byte[result.getValue().length];
+ for(int i = 0; i< result.getValue().length; i++) {
+ mData[i] = (byte)((result.getValue()[i] & 0xff));
+ mEmitter.emitUpdateSpiMiso(mManager, mData);
+ }
+ }
+ };
}
+
+
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
index f262def..02c84dc 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
@@ -74,7 +74,14 @@ public void run() {
}
public void emitUpdateSpiMiso(final KonashiManager manager, final byte[] value) {
- mHandler.post(new UpdateSpiMisoRunnable(self, manager));
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ for (KonashiListener listener : self) {
+ listener.onUpdateSpiMiso(manager, value);
+ }
+ }
+ });
}
public void emitUpdateBatteryLevel(final KonashiManager manager, final int level) {
@@ -87,33 +94,4 @@ public void run() {
}
});
}
-}
-
-class UpdateSpiMisoRunnable implements Runnable {
-
- private EventEmitter mEventEmitter;
- private KonashiManager mKonashiManager;
- private KonashiListener mKonashiListener;
-
- public UpdateSpiMisoRunnable(EventEmitter eventEmitter, KonashiManager konashiManager) {
- mEventEmitter = eventEmitter;
- mKonashiManager = konashiManager;
- }
-
- @Override
- public void run() {
- for (KonashiListener listener : mEventEmitter) {
- mKonashiListener = listener;
- mKonashiManager.spiRead().then(new DoneCallback() {
- @Override
- public void onDone(BluetoothGattCharacteristic result) {
- byte mData[] = new byte[result.getValue().length];
- for (int i = 0; i < result.getValue().length; i++) {
- mData[i] = (byte) ((result.getValue()[i] & 0xff));
- mKonashiListener.onUpdateSpiMiso(mKonashiManager, mData);
- }
- }
- });
- }
- }
-}
+}
\ No newline at end of file
From 9dd59552abfc27f06f250bc0ba809a323fadcf1e Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Mon, 21 Dec 2015 20:24:02 +0900
Subject: [PATCH 13/22] Move emitUpdateSpiMiso timing
---
.../src/main/java/com/uxxu/konashi/lib/CallbackHandler.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
index 560d261..4e7a90a 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
@@ -80,11 +80,11 @@ public void onCharacteristicChanged(Bletia bletia, BluetoothGattCharacteristic c
private DoneCallback mSpiReadDoneCallback = new DoneCallback() {
@Override
public void onDone(BluetoothGattCharacteristic result) {
- byte mData[] = new byte[result.getValue().length];
+ byte data[] = new byte[result.getValue().length];
for(int i = 0; i< result.getValue().length; i++) {
- mData[i] = (byte)((result.getValue()[i] & 0xff));
- mEmitter.emitUpdateSpiMiso(mManager, mData);
+ data[i] = (byte)((result.getValue()[i] & 0xff));
}
+ mEmitter.emitUpdateSpiMiso(mManager, data);
}
};
}
From 4d9500f7245639196c5538740a6152907d85d0b9 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Mon, 21 Dec 2015 21:28:27 +0900
Subject: [PATCH 14/22] Create getDataFromValue at SpiUtils
---
.../com/uxxu/konashi/lib/CallbackHandler.java | 18 +++++++-----------
.../com/uxxu/konashi/lib/util/SpiUtils.java | 11 +++++++++++
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
index 4e7a90a..184fb87 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
@@ -6,6 +6,7 @@
import com.uxxu.konashi.lib.dispatcher.DispatcherContainer;
import com.uxxu.konashi.lib.util.KonashiUtils;
+import com.uxxu.konashi.lib.util.SpiUtils;
import com.uxxu.konashi.lib.util.UartUtils;
import org.jdeferred.DoneCallback;
@@ -71,22 +72,17 @@ public void onCharacteristicChanged(Bletia bletia, BluetoothGattCharacteristic c
mDispatcherContainer.getUartDispatcher().onDone(characteristic);
mEmitter.emitUpdateUartRx(mManager, UartUtils.removeLengthByte(characteristic.getValue()));
} else if (KonashiUUID.SPI_NOTIFICATION_UUID.equals(uuid)) {
- mManager.spiRead().then(mSpiReadDoneCallback);
+ mManager.spiRead().then(new DoneCallback() {
+ @Override
+ public void onDone(BluetoothGattCharacteristic result) {
+ mEmitter.emitUpdateSpiMiso(mManager, SpiUtils.getDataFromValue(result.getValue()));
+ }
+ });
} else if (KonashiUUID.HARDWARE_LOW_BAT_NOTIFICATION_UUID.equals(uuid)) {
mEmitter.emitUpdateBatteryLevel(mManager, KonashiUtils.getBatteryLevel(characteristic));
}
}
- private DoneCallback mSpiReadDoneCallback = new DoneCallback() {
- @Override
- public void onDone(BluetoothGattCharacteristic result) {
- byte data[] = new byte[result.getValue().length];
- for(int i = 0; i< result.getValue().length; i++) {
- data[i] = (byte)((result.getValue()[i] & 0xff));
- }
- mEmitter.emitUpdateSpiMiso(mManager, data);
- }
- };
}
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
index e18f5c0..1fccc2f 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
@@ -1,5 +1,7 @@
package com.uxxu.konashi.lib.util;
+import android.bluetooth.BluetoothGattCharacteristic;
+
import com.uxxu.konashi.lib.Konashi;
/**
@@ -42,4 +44,13 @@ public static boolean isTooLongData(int length) {
public static boolean isTooShortData(int length) {
return length <= 0;
}
+
+ public static byte[] getDataFromValue(byte[] value) {
+ byte data[] = new byte[value.length];
+ for(int i = 0; i< value.length; i++) {
+ data[i] = (byte)((value[i] & 0xff));
+ }
+
+ return data;
+ }
}
\ No newline at end of file
From 7778d419a4fabb5d2627e601f51b4735a35ca714 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Mon, 21 Dec 2015 21:36:45 +0900
Subject: [PATCH 15/22] Change Argument from byte[] to BGCharacteristic and
change method name
---
.../main/java/com/uxxu/konashi/lib/CallbackHandler.java | 2 +-
.../src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
index 184fb87..aa7fdcc 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
@@ -75,7 +75,7 @@ public void onCharacteristicChanged(Bletia bletia, BluetoothGattCharacteristic c
mManager.spiRead().then(new DoneCallback() {
@Override
public void onDone(BluetoothGattCharacteristic result) {
- mEmitter.emitUpdateSpiMiso(mManager, SpiUtils.getDataFromValue(result.getValue()));
+ mEmitter.emitUpdateSpiMiso(mManager, SpiUtils.getDataFromResult(result));
}
});
} else if (KonashiUUID.HARDWARE_LOW_BAT_NOTIFICATION_UUID.equals(uuid)) {
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
index 1fccc2f..fc0f617 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
@@ -45,10 +45,10 @@ public static boolean isTooShortData(int length) {
return length <= 0;
}
- public static byte[] getDataFromValue(byte[] value) {
- byte data[] = new byte[value.length];
- for(int i = 0; i< value.length; i++) {
- data[i] = (byte)((value[i] & 0xff));
+ public static byte[] getDataFromResult(BluetoothGattCharacteristic result) {
+ byte data[] = new byte[result.getValue().length];
+ for(int i = 0; i< result.getValue().length; i++) {
+ data[i] = (byte)((result.getValue()[i] & 0xff));
}
return data;
From 97141b389b6db78eda734eebbb3d9ff69b1ce973 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Tue, 22 Dec 2015 15:23:23 +0900
Subject: [PATCH 16/22] Change getDataFromResult argument from BGCharacteristic
to byte[]
---
.../main/java/com/uxxu/konashi/lib/CallbackHandler.java | 2 +-
.../src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
index aa7fdcc..c5dabf0 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
@@ -75,7 +75,7 @@ public void onCharacteristicChanged(Bletia bletia, BluetoothGattCharacteristic c
mManager.spiRead().then(new DoneCallback() {
@Override
public void onDone(BluetoothGattCharacteristic result) {
- mEmitter.emitUpdateSpiMiso(mManager, SpiUtils.getDataFromResult(result));
+ mEmitter.emitUpdateSpiMiso(mManager, SpiUtils.getDataFromResult(result.getValue()));
}
});
} else if (KonashiUUID.HARDWARE_LOW_BAT_NOTIFICATION_UUID.equals(uuid)) {
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
index fc0f617..59ed1c4 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/util/SpiUtils.java
@@ -45,10 +45,10 @@ public static boolean isTooShortData(int length) {
return length <= 0;
}
- public static byte[] getDataFromResult(BluetoothGattCharacteristic result) {
- byte data[] = new byte[result.getValue().length];
- for(int i = 0; i< result.getValue().length; i++) {
- data[i] = (byte)((result.getValue()[i] & 0xff));
+ public static byte[] getDataFromResult(byte[] result) {
+ byte data[] = new byte[result.length];
+ for(int i = 0; i< result.length; i++) {
+ data[i] = (byte)((result[i] & 0xff));
}
return data;
From 00709dbbac760a719b10e345a7a7200b30b0bc83 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Tue, 22 Dec 2015 15:28:20 +0900
Subject: [PATCH 17/22] add Test of getDataFromResult
---
.../com/uxxu/konashi/lib/util/SpiUtilsSpec.groovy | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/konashi-android-sdk/src/test/groovy/com/uxxu/konashi/lib/util/SpiUtilsSpec.groovy b/konashi-android-sdk/src/test/groovy/com/uxxu/konashi/lib/util/SpiUtilsSpec.groovy
index b662f26..3f1cc6c 100644
--- a/konashi-android-sdk/src/test/groovy/com/uxxu/konashi/lib/util/SpiUtilsSpec.groovy
+++ b/konashi-android-sdk/src/test/groovy/com/uxxu/konashi/lib/util/SpiUtilsSpec.groovy
@@ -100,4 +100,15 @@ class SpiUtilsSpec extends Specification {
[0] as byte[] | [] as byte[]
[4, 0x74, 0x65, 0x73, 0x74] as byte[] | [0x74, 0x65, 0x73, 0x74] as byte[]
}
+
+ def ".getDataFromResult()"() {
+
+ expect:
+ SpiUtils.getDataFromResult(data) == result
+
+ where:
+ data | result
+ [] as byte[] | [] as byte[]
+ [0x74, 0x65, 0x73, 0x74] as byte[] | [0x74, 0x65, 0x73, 0x74] as byte[]
+ }
}
From 525cb8fc6892bd410d97f91003c6618c84f4d2e7 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Tue, 22 Dec 2015 15:34:45 +0900
Subject: [PATCH 18/22] Remove unuse import
---
.../src/main/java/com/uxxu/konashi/lib/EventEmitter.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
index 02c84dc..156c41b 100644
--- a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
+++ b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/EventEmitter.java
@@ -1,11 +1,8 @@
package com.uxxu.konashi.lib;
-import android.bluetooth.BluetoothGattCharacteristic;
import android.os.Handler;
import android.os.Looper;
-import org.jdeferred.DoneCallback;
-
import java.util.ArrayList;
import info.izumin.android.bletia.BletiaException;
From 28b6338b62d3111a2f234d3e1a7cd973f911caa0 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Tue, 22 Dec 2015 15:35:14 +0900
Subject: [PATCH 19/22] Remove unnecessary Log
---
.../java/com/uxxu/konashi/sample/spisample/MainActivity.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java b/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java
index 8aeb614..4217c0f 100644
--- a/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java
+++ b/samples/spi-sample/src/main/java/com/uxxu/konashi/sample/spisample/MainActivity.java
@@ -158,7 +158,6 @@ public void onUpdateUartRx(KonashiManager manager, byte[] value) {
@Override
public void onUpdateSpiMiso(KonashiManager manager, byte[] value) {
- Log.d("onUpdateSpiMiso()", Arrays.toString(value));
mResultText.setText(Arrays.toString(value));
}
From 9a4987cd2378215e23bc940055d19d7d9bd8d875 Mon Sep 17 00:00:00 2001
From: izumin5210
Date: Tue, 22 Dec 2015 20:27:20 +0900
Subject: [PATCH 20/22] Bump up version on readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0b7de7a..6ccf6a6 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
```groovy
dependencies {
- compile 'com.uxxu.konashi:konashi-android-sdk:1.0.1'
+ compile 'com.uxxu.konashi:konashi-android-sdk:1.1.0'
}
```
From dd9cb749232723601b820cd81d1625886a5cfff8 Mon Sep 17 00:00:00 2001
From: izumin5210
Date: Tue, 22 Dec 2015 20:27:52 +0900
Subject: [PATCH 21/22] Bump version to 1.1.0
---
konashi-android-sdk/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/konashi-android-sdk/build.gradle b/konashi-android-sdk/build.gradle
index 2661d81..200c6b8 100644
--- a/konashi-android-sdk/build.gradle
+++ b/konashi-android-sdk/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
apply plugin: 'groovyx.grooid.groovy-android'
def versionMajor = 1
-def versionMinor = 0
-def versionPatch = 1
+def versionMinor = 1
+def versionPatch = 0
def versionBuild = 0
def sdkVersionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
From e74a1ab68127e819064cf94f74bf463137392796 Mon Sep 17 00:00:00 2001
From: Yoshihiro WADA <1365196t@stu.kobe-u.ac.jp>
Date: Thu, 24 Dec 2015 14:43:06 +0900
Subject: [PATCH 22/22] Delete unnecessary setSelection
---
.../java/com/uxxu/konashi/test_all_functions/SpiFragment.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
index 2625a42..233e220 100644
--- a/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
+++ b/samples/test_all_functions/src/main/java/com/uxxu/konashi/test_all_functions/SpiFragment.java
@@ -157,7 +157,6 @@ private void resetSpi() {
return;
}
if (mSpiSwitch.isChecked()) {
- mSpiSpeedSpinner.setSelection(1);
int i = mSpiSpeedSpinner.getSelectedItemPosition();
String[] labels = getResources().getStringArray(R.array.spi_speeds_labels);
String label = labels[i];