Skip to content

AA-271 #53

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
Sep 23, 2022
Merged

AA-271 #53

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
9e775ad
add option to disable/enable crc check
Sep 23, 2022
7a5b421
minor fix
Sep 23, 2022
6af0fc3
minor fix
Sep 23, 2022
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
21 changes: 14 additions & 7 deletions ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,20 @@ dependencies {

androidTestCompile 'com.android.support:support-annotations:25.3.1'
compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.72Beta', ext: 'aar')
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
// 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: 'ShimmerDriver', version:'0.9.138beta'){
// implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
// // 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: 'ShimmerDriver', version:'0.9.138beta'){
// // 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-79 v0.1'){
// excluding org.json which is provided by Android
exclude group: 'io.netty'
exclude group: 'com.google.protobuf'
Expand Down
65 changes: 62 additions & 3 deletions ...immerBasicExample/src/main/java/shimmerresearch/com/shimmerbasicexample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import android.os.Message;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
import android.widget.Toast;

import com.shimmerresearch.android.Shimmer;
Expand All @@ -21,23 +24,59 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Timer;
import java.util.TimerTask;
import java.util.List;

import static com.shimmerresearch.android.guiUtilities.ShimmerBluetoothDialog.EXTRA_DEVICE_ADDRESS;

public class MainActivity extends Activity {
public class MainActivity extends Activity implements AdapterView.OnItemSelectedListener {

private final static String LOG_TAG = "ShimmerBasicExample";
Shimmer shimmer;
Spinner spinner;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

shimmer = new Shimmer(mHandler);
spinner = (Spinner) findViewById(R.id.crcSpinner);
spinner.setEnabled(false);
// Spinner click listener
spinner.setOnItemSelectedListener(this);
List<String> categories = new ArrayList<String>();
categories.add("Disable crc");
categories.add("Enable 1 byte CRC");
categories.add("Enable 2 byte CRC");
// Creating adapter for spinner
ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, categories);
dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
// attaching data adapter to spinner
spinner.setAdapter(dataAdapter);
}

@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
if(spinner.isEnabled()){
switch(position) {
case 0:
shimmer.disableBtCommsCrc();
break;
case 1:
shimmer.enableBtCommsOneByteCrc();
break;
case 2:
shimmer.enableBtCommsTwoByteCrc();
break;
default:
}
}
}

public void onNothingSelected(AdapterView<?> parent) {
// Another interface callback
}

public void connectDevice(View v) {
Expand Down Expand Up @@ -107,16 +146,36 @@ public void handleMessage(Message msg) {

switch (state) {
case CONNECTED:
if(shimmer.getFirmwareVersionCode() >= 8){
if(!spinner.isEnabled()){
switch(shimmer.getBtCommsCrcModeIfFwSupported()) {
case OFF:
spinner.setSelection(0);
break;
case ONE_BYTE_CRC:
spinner.setSelection(1);
break;
case TWO_BYTE_CRC:
spinner.setSelection(2);
break;
default:
}
}
spinner.setEnabled(true);
}
break;
case CONNECTING:
break;
case STREAMING:
spinner.setEnabled(false);
break;
case STREAMING_AND_SDLOGGING:
break;
case SDLOGGING:
break;
case DISCONNECTED:
spinner.setEnabled(false);
spinner.setSelection(0);
break;
}
break;
Expand Down
5 changes: 4 additions & 1 deletion ShimmerAndroidInstrumentDriver/shimmerBasicExample/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
android:layout_height="wrap_content"
android:onClick="connectDevice"
android:text="Connect" />

<Spinner
android:id="@+id/crcSpinner"
android:layout_width="200dp"
android:layout_height="wrap_content" />
<Button
android:id="@+id/button6"
android:layout_width="200dp"
Expand Down