Skip to content

DEV-425_update to read from device #240

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
jyong15 merged 2 commits into from
Aug 26, 2025
Merged

DEV-425_update to read from device #240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b2460e
Update ShimmerDevice.java
JongChern Aug 22, 2025
ead2830
update shimmer3 HW check
MAzalya Aug 25, 2025
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
35 changes: 32 additions & 3 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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;
Expand Down
Loading