Skip to content

Commit 9e495e6

Browse files
committed
DEV-574 #time 5m ability to disable contiguous time stamp check
1 parent eb801c3 commit 9e495e6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public class BTStream {
494494
public static final int MAX_NUMBER_OF_SIGNALS = 77;//50; //used to be 11 but now 13 because of the SR30 + 8 for 3d orientation
495495
public static final int MAX_INQUIRY_PACKET_SIZE = 47;
496496

497-
public static final int CONTIGUOUS_TIMESTAMP_TICKS_LIMIT = (10*32768); // 10 seconds worth of ticks
497+
public static final int CONTIGUOUS_TIMESTAMP_TICKS_LIMIT = (10*32768); // 10 seconds worth of ticks. Set to 0 to disable the feature
498498

499499
public enum TEST_MODE {
500500
MAIN_TEST((byte)0, "Main Test"),
@@ -934,7 +934,7 @@ public ObjectCluster buildMsg(byte[] newPacket, COMMUNICATION_TYPE fwType, boole
934934
* check help to make sure the time stamp ticks are contiguous before parsing the
935935
* packet.
936936
*/
937-
if (fwType == COMMUNICATION_TYPE.BLUETOOTH)
937+
if (fwType == COMMUNICATION_TYPE.BLUETOOTH && CONTIGUOUS_TIMESTAMP_TICKS_LIMIT != 0)
938938
{
939939
double shimmerTimestampTicks = (double)newPacketInt[getSignalIndex(Configuration.Shimmer3.ObjectClusterSensorName.TIMESTAMP)];
940940
if(mLastReceivedTimeStampTicks!=0 && Math.abs(shimmerTimestampTicks - mLastReceivedTimeStampTicks) > CONTIGUOUS_TIMESTAMP_TICKS_LIMIT) {

0 commit comments

Comments
 (0)