Merge pull request #155 from ShimmerEngineering/DEV-43_2

ShimmerEngineering · web-flow · commit a25c40ba9f37 · 2025-01-22T08:23:14.000Z
DEV-43
diff --git a/ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs b/ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs
@@ -1617,7 +1617,7 @@ public void ReadData()
                                         bufferbyte[p] = (byte)ReadByte();
 
                                     }
-                                    RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_MAG_CALIBRATION_RESPONSE);
+                                    RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_ACCEL_CALIBRATION_RESPONSE);
 
                                     //Retrieve High G Accel Cal Paramters if Shimmer 3
                                     bufferbyte = new byte[21];
@@ -1626,7 +1626,8 @@ public void ReadData()
                                         bufferbyte[p] = (byte)ReadByte();
 
                                     }
-                                    RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_ACCEL_CALIBRATION_RESPONSE);
+                                    RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_MAG_CALIBRATION_RESPONSE);
+
                                 }
 
                                 break;
@@ -2551,6 +2552,7 @@ protected void RetrieveKinematicCalibrationParametersFromPacket(byte[] bufferCal
                 OffsetVectorAltAccel = offsetVector;
                 SensitivityMatrixAltAccel = sensitivityMatrix;
                 DefaultHighGAccelParams = false;
+                
             }
             else if (packetType == (byte)PacketTypeShimmer3.ALT_ACCEL_CALIBRATION_RESPONSE && (sensitivityMatrix[0, 0] == -1 || UtilCalibration.AllElementsAre(sensitivityMatrix, 0))
                 && HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)

Original file line number	Diff line number	Diff line change
`@@ -1617,7 +1617,7 @@ public void ReadData()`
`1617`	`1617`	`bufferbyte[p] = (byte)ReadByte();`
`1618`	`1618`
`1619`	`1619`	`}`
`1620`		`- RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_MAG_CALIBRATION_RESPONSE);`
	`1620`	`+ RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_ACCEL_CALIBRATION_RESPONSE);`
`1621`	`1621`
`1622`	`1622`	`//Retrieve High G Accel Cal Paramters if Shimmer 3`
`1623`	`1623`	`bufferbyte = new byte[21];`
`@@ -1626,7 +1626,8 @@ public void ReadData()`
`1626`	`1626`	`bufferbyte[p] = (byte)ReadByte();`
`1627`	`1627`
`1628`	`1628`	`}`
`1629`		`- RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_ACCEL_CALIBRATION_RESPONSE);`
	`1629`	`+ RetrieveKinematicCalibrationParametersFromPacket(bufferbyte, (byte)PacketTypeShimmer3.ALT_MAG_CALIBRATION_RESPONSE);`
	`1630`	`+`
`1630`	`1631`	`}`
`1631`	`1632`
`1632`	`1633`	`break;`
`@@ -2551,6 +2552,7 @@ protected void RetrieveKinematicCalibrationParametersFromPacket(byte[] bufferCal`
`2551`	`2552`	`OffsetVectorAltAccel = offsetVector;`
`2552`	`2553`	`SensitivityMatrixAltAccel = sensitivityMatrix;`
`2553`	`2554`	`DefaultHighGAccelParams = false;`
	`2555`	`+`
`2554`	`2556`	`}`
`2555`	`2557`	`else if (packetType == (byte)PacketTypeShimmer3.ALT_ACCEL_CALIBRATION_RESPONSE && (sensitivityMatrix[0, 0] == -1 \|\| UtilCalibration.AllElementsAre(sensitivityMatrix, 0))`
`2556`	`2558`	`&& HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)`