Skip to content

Commit 64ae569

Browse files
committed
remove time sync for this release. please do not merge this with MASTER
1 parent 64594ac commit 64ae569

File tree

3 files changed

+2
-48
lines changed

3 files changed

+2
-48
lines changed

ShimmerCapture/ShimmerBluetooth.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public abstract class ShimmerBluetooth
217217
protected List<double> GyroZRawList = new List<double>();
218218

219219
protected GradDes3DOrientation OrientationAlgo;
220-
protected TimeSync TimeSync;
220+
221221
protected int BufferSyncSizeInSeconds = 15;
222222
private static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
223223

@@ -984,7 +984,6 @@ public void ReadData()
984984
ADCRawSamplingRateValue = ReadByte();
985985
SamplingRate = (double)1024 / ADCRawSamplingRateValue;
986986
}
987-
TimeSync = new TimeSync((int)SamplingRate * BufferSyncSizeInSeconds);
988987

989988
break;
990989
case (byte)PacketTypeShimmer2.ACCEL_RANGE_RESPONSE:
@@ -2380,8 +2379,6 @@ protected ObjectCluster BuildMsg(List<byte> packet)
23802379
double calibratedTS = CalibrateTimeStamp(newPacket[iTimeStamp]);
23812380
objectCluster.Add("Timestamp", "CAL", "mSecs", calibratedTS);
23822381
double time = (DateTime.UtcNow - UnixEpoch).TotalMilliseconds;
2383-
double timeSyncValue = TimeSync.CalculateTimeSync(calibratedTS,time);
2384-
objectCluster.Add("TimestampSync", "CAL", "mSecs", timeSyncValue);
23852382

23862383

23872384
double[] accelerometer = new double[3];
@@ -4245,7 +4242,7 @@ protected void SetCompatibilityCode()
42454242
public void SetState(int state)
42464243
{
42474244
if (ShimmerState == SHIMMER_STATE_CONNECTED) {
4248-
TimeSync = new TimeSync((int)SamplingRate * BufferSyncSizeInSeconds);
4245+
42494246
}
42504247

42514248
Boolean stateChanging=false;

ShimmerCapture/ShimmerCapture.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
</Reference>
113113
</ItemGroup>
114114
<ItemGroup>
115-
<Compile Include="TimeSync.cs" />
116115
<Compile Include="Filter.cs" />
117116
<Compile Include="FormAbout.cs">
118117
<SubType>Form</SubType>

ShimmerCapture/TimeSync.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)