Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import com.shimmerresearch.driver.ObjectCluster;
import com.shimmerresearch.driver.ShimmerDevice;
import com.shimmerresearch.driverUtilities.AssembleShimmerConfig;
import com.shimmerresearch.driverUtilities.HwDriverShimmerDeviceDetails;
import com.shimmerresearch.driverUtilities.ShimmerVerDetails;
import com.shimmerresearch.exceptions.ShimmerException;

Expand Down Expand Up @@ -90,7 +91,7 @@ public class MainActivity extends AppCompatActivity implements ConnectedShimmers
final static String LOG_TAG = "Shimmer";
final static String SERVICE_TAG = "ShimmerService";
final static int REQUEST_CONNECT_SHIMMER = 2;
public static APP_RELEASE_TYPE appReleaseType = APP_RELEASE_TYPE.INTERNAL;
public static APP_RELEASE_TYPE appReleaseType = APP_RELEASE_TYPE.PUBLIC;
public enum APP_RELEASE_TYPE{
INTERNAL,
PUBLIC,
Expand Down Expand Up @@ -651,8 +652,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (deviceName.contains(VerisenseDevice.VERISENSE_PREFIX)){

} else {
if(appReleaseType.equals(APP_RELEASE_TYPE.PUBLIC)){
preferredBtType = ShimmerBluetoothManagerAndroid.BT_TYPE.BT_CLASSIC;
if(appReleaseType.equals(APP_RELEASE_TYPE.PUBLIC)){ //only Shimmer 3R has BT connection type popup
if (deviceName.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.SHIMMER3R.toString())){
showBtTypeConnectionOption();
}else{
preferredBtType = ShimmerBluetoothManagerAndroid.BT_TYPE.BT_CLASSIC;
}
}else{
showBtTypeConnectionOption();
}
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.