Skip to content

JA-115 update inquiry response #179

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
JongChern merged 1 commit into from
Dec 5, 2024
Merged

JA-115 update inquiry response #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,11 @@ private void processResponseCommand(byte responseCommand) {
if(mShimmerVerObject.isShimmerGen2()) {
lengthSettings = 5;
idxLengthChannels = 3;
}else if(mShimmerVerObject.isShimmerGen3R()) {
lengthSettings = 11;
idxLengthChannels = 9;
}

// get Sampling rate, accel range, config setup byte0, num chans and buffer size
byte[] settings = readBytes(lengthSettings, responseCommand);
if(settings!=null){
Expand Down
42 changes: 41 additions & 1 deletion ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3593,7 +3593,7 @@ protected void interpretInqResponse(byte[] bufferInquiry){
mInquiryResponseBytes = new byte[5+mNChannels];
System.arraycopy(bufferInquiry, 0, mInquiryResponseBytes , 0, mInquiryResponseBytes.length);
}
else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R) {
else if (getHardwareVersion()==HW_ID.SHIMMER_3) {
if(bufferInquiry.length>=8){
mPacketSize = mTimeStampPacketByteSize+bufferInquiry[6]*2;
double samplingRate = convertSamplingRateBytesToFreq(bufferInquiry[0], bufferInquiry[1], getSamplingClockFreq());
Expand Down Expand Up @@ -3632,6 +3632,46 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
}
}
}
else if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
if(bufferInquiry.length>=11){
mPacketSize = mTimeStampPacketByteSize+bufferInquiry[12]*2;
double samplingRate = convertSamplingRateBytesToFreq(bufferInquiry[0], bufferInquiry[1], getSamplingClockFreq());
setSamplingRateShimmer(samplingRate);
// setSamplingRateShimmer((getSamplingClockFreq()/(double)((int)(bufferInquiry[0] & 0xFF) + ((int)(bufferInquiry[1] & 0xFF) << 8))));
mNChannels = bufferInquiry[9];
mBufferSize = bufferInquiry[10];
mConfigByte0 = ((long)(bufferInquiry[2] & 0xFF) +((long)(bufferInquiry[3] & 0xFF) << 8)+((long)(bufferInquiry[4] & 0xFF) << 16) +((long)(bufferInquiry[5] & 0xFF) << 24)
+((long)(bufferInquiry[6] & 0xFF) << 32)+((long)(bufferInquiry[7] & 0xFF) << 40)+((long)(bufferInquiry[8] & 0xFF) << 48) );
setDigitalAccelRange(((int)(mConfigByte0 & 0xC))>>2);
setGyroRange(((int)(mConfigByte0 & 196608))>>16);
setLSM303MagRange(((int)(mConfigByte0 & 14680064))>>21);
setLSM303DigitalAccelRate(((int)(mConfigByte0 & 0xF0))>>4);
setMPU9150GyroAccelRate(((int)(mConfigByte0 & 65280))>>8);
setMagRate(((int)(mConfigByte0 & 1835008))>>18);
setPressureResolution((((int)(mConfigByte0 >>28)) & 3));
setGSRRange((((int)(mConfigByte0 >>25)) & 7));
setInternalExpPower(((int)(mConfigByte0 >>24)) & 1);
mInquiryResponseBytes = new byte[11+mNChannels];
System.arraycopy(bufferInquiry, 0, mInquiryResponseBytes , 0, mInquiryResponseBytes.length);
if ((getLSM303DigitalAccelRate()==2 && getSamplingRateShimmer()>10)){
setLowPowerAccelWR(true);
}
checkLowPowerGyro();
checkLowPowerMag();

if(bufferInquiry.length>=(11+mNChannels)){
byte[] signalIdArray = new byte[mNChannels];
System.arraycopy(bufferInquiry, 11, signalIdArray, 0, mNChannels);
updateEnabledSensorsFromChannels(signalIdArray);
if(mUseInfoMemConfigMethod && getFirmwareVersionCode()>=6){
} else {
setEnabledAndDerivedSensorsAndUpdateMaps(mEnabledSensors, mDerivedSensors);
}
interpretDataPacketFormat(mNChannels,signalIdArray);
checkExgResolutionFromEnabledSensorsVar();
}
}
}
else if (getHardwareVersion()==HW_ID.SHIMMER_SR30) {
mPacketSize = mTimeStampPacketByteSize+bufferInquiry[2]*2;
setSamplingRateShimmer((double)1024/bufferInquiry[0]);
Expand Down