Skip to content

AA-254 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2021
Merged

AA-254 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81abe18
Add bin file directory text
Nov 2, 2021
212b631
Some update on the bin file directory text
Nov 2, 2021
d0324d3
change the implementation of bin file directory label
Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ dependencies {
compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
compile files('libs/AndroidBluetoothLibrary.jar')
compile files('libs/androidplot-core-0.5.0-release.jar')
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.7'){
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.8'){
// excluding org.json which is provided by Android
exclude group: 'io.netty'
exclude group: 'com.google.protobuf'
exclude group: 'org.apache.commons.math'
}
implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.7'){
implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.8'){
// excluding org.json which is provided by Android
exclude group: 'io.netty'
exclude group: 'com.google.protobuf'
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/com/shimmerresearch/android/guiUtilities/supportfragments/DataSyncFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class DataSyncFragment extends Fragment {
public static EditText editTextTrialName;
public static TextView TextViewPayloadIndex;
public static TextView TextViewSpeed;
public static TextView TextViewDirectory;

public DataSyncFragment() {
// Required empty public constructor
Expand Down Expand Up @@ -46,6 +47,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
editTextTrialName = (EditText) getView().findViewById(R.id.trialName);
TextViewPayloadIndex = (TextView) getView().findViewById(R.id.payloadIndex);
TextViewSpeed = (TextView) getView().findViewById(R.id.speed);
TextViewDirectory = (TextView) getView().findViewById(R.id.directory);

super.onActivityCreated(savedInstanceState);
}
Expand Down
2 changes: 0 additions & 2 deletions ...rc/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ public void onWriteSuccess(int current, int total, byte[] justWrite) {

@Override
public void onWriteFailure(BleException exception) {

System.out.println("Write Fail");
}
});
Expand All @@ -199,7 +198,6 @@ public String convertMacIDtoUUID(String MacID) {
}

public String getUuid() {
//"00000000-0000-0000-0000-E7EC37A0D234"
return convertMacIDtoUUID(this.mMac);
}
}
14 changes: 14 additions & 0 deletions ...Driver/ShimmerAndroidInstrumentDriver/src/main/res/layouts/fragments/layout/data_sync.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,20 @@
android:textSize="14dp"
android:inputType="text"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/directory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" "
android:textStyle="bold"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
4 changes: 2 additions & 2 deletions ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ android {

dependencies {
compile project(':ShimmerAndroidInstrumentDriver')
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.7'){
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.8'){
// excluding org.json which is provided by Android
exclude group: 'io.netty'
exclude group: 'com.google.protobuf'
exclude group: 'org.apache.commons.math'
}
implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.7'){
implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.8'){
// excluding org.json which is provided by Android
exclude group: 'io.netty'
exclude group: 'com.google.protobuf'
Expand Down
7 changes: 5 additions & 2 deletions ...rServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import com.shimmerresearch.driver.ShimmerDevice;
import com.shimmerresearch.exceptions.ShimmerException;
import com.shimmerresearch.driver.Configuration.COMMUNICATION_TYPE;
import com.shimmerresearch.verisense.VerisenseDevice;
import com.shimmerresearch.verisense.communication.SyncProgressDetails;
import com.shimmerresearch.android.VerisenseDeviceAndroid;

Expand Down Expand Up @@ -343,7 +342,6 @@ public int getItemPosition(Object object) {
return PagerAdapter.POSITION_NONE;
}
}

private Handler mHandler = new Handler() {
public void handleMessage(Message msg) {
if(msg.what == ShimmerBluetooth.MSG_IDENTIFIER_STATE_CHANGE) {
Expand Down Expand Up @@ -388,6 +386,11 @@ public void handleMessage(Message msg) {
case SDLOGGING:
connectedShimmersListFragment.buildShimmersConnectedListView(mService.getListOfConnectedDevices(), getApplicationContext());
break;
case STREAMING_LOGGED_DATA:
Toast.makeText(getApplicationContext(), "Data Sync: " + shimmerName + " " + macAddress, Toast.LENGTH_SHORT).show();
VerisenseDeviceAndroid mDevice3 = (VerisenseDeviceAndroid)mService.getShimmer(selectedDeviceAddress);
DataSyncFragment.TextViewDirectory.setText("Directory : " + mDevice3.getDataFilePath());
break;
case DISCONNECTED:
Toast.makeText(getApplicationContext(), "Device disconnected: " + shimmerName + " " + macAddress, Toast.LENGTH_SHORT).show();
connectedShimmersListFragment.buildShimmersConnectedListView(mService.getListOfConnectedDevices(), getApplicationContext()); //to be safe lets rebuild this
Expand Down