diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index 9e1265b1..dfdceacb 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -207,8 +207,36 @@ public abstract class ShimmerDevice extends BasicProcessWithCallBack implements public transient CommsProtocolRadio mCommsProtocolRadio = null; public BT_STATE mBluetoothRadioState = BT_STATE.DISCONNECTED; public DOCK_STATE mDockState = DOCK_STATE.UNDOCKED; - + public BTRADIO_STATE mRadioState = BTRADIO_STATE.UNKNOWN; private boolean mUpdateOnlyWhenStateChanges=false; + public static int EXP_BOARD_MEMORY_LOCATION_FOR_BTRADIO_STATE = 2018; + public enum BTRADIO_STATE{ + + BT_CLASSIC_BLE_ENABLED("BT Classic and BLE Enabled"), + BT_CLASSIC_ENABLED("BT Classic Enabled"), + BLE_ENABLED("BLE Enabled"), + NONE_ENABLED("None Enabled"), + UNKNOWN("Unknown"); +// RECORDING("Recording"); + + private final String text; + + /** + * @param text + */ + private BTRADIO_STATE(final String text) { + this.text = text; + } + + /* (non-Javadoc) + * @see java.lang.Enum#toString() + */ + @Override + public String toString() { + return text; + } + + } //TODO: public enum DOCK_STATE{ @@ -2078,9 +2106,10 @@ public boolean isSupportedSdLogSync() { return false; } - public boolean isFWSupportedBtBleControl() { + public boolean isHWAndFWSupportedBtBleControl() { if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM - && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)){ + && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4) + && isShimmerGen3()){ return true; } return false;