Merge pull request #154 from ShimmerEngineering/DEV-81

DEV-81

Author: ShimmerEngineering

Shimmer32FeetAPI/ShimmerSDBT32Feet.cs

@@ -890,7 +890,7 @@ public void SdConfigWrite()
             file.WriteLine("gs_range=" + GetGSRRange());
             file.WriteLine("exp_power=" + (GetExpPower() ? 1 : 0));
             file.WriteLine("gyro_range=" + GetGyroRange());
-            file.WriteLine("gyro_samplingrate=" + GetMpu9150SamplingRate());
+            file.WriteLine("gyro_samplingrate=" + GetGyroSamplingRate());
             file.WriteLine("acc_range=" + GetAccelRange());
             file.WriteLine("acc_lpm=" + GetAccelLPBit());
             file.WriteLine("acc_hrm=" + GetAccelHRBit());

ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs

@@ -129,7 +129,7 @@ public abstract class ShimmerBluetooth : ShimmerDevice
         protected int MagGain;
         protected int LNAccelRange;
         protected int AccelSamplingRate;
-        protected int Mpu9150SamplingRate;
+        protected int GyroSamplingRate;
         protected int AltAccelSamplingRate;
         protected int AltMagSamplingRate;
         protected long ConfigSetupByte0; // for Shimmer2
@@ -2239,7 +2239,7 @@ public void InterpretInquiryResponseShimmer3R(List<byte> packet)
                 GyroRange = (int)((ConfigSetupByte0 >> 16) & 0x03);
                 MagGain = (int)((ConfigSetupByte0 >> 21) & 0x07);
                 AccelSamplingRate = (int)((ConfigSetupByte0 >> 4) & 0xF);
-                Mpu9150SamplingRate = (int)((ConfigSetupByte0 >> 8) & 0xFF);
+                GyroSamplingRate = (int)((ConfigSetupByte0 >> 8) & 0xFF);
                 magSamplingRate = (int)((ConfigSetupByte0 >> 18) & 0x07);
                 PressureResolution = (int)((ConfigSetupByte0 >> 28) & 0x03);
                 GSRRange = (int)((ConfigSetupByte0 >> 25) & 0x07);
@@ -2275,10 +2275,14 @@ public void InterpretInquiryResponseShimmer3R(List<byte> packet)
                     {
                         LowPowerAccelEnabled = true;
                     }
-                   
-                }
-
+                    
+                    if (GyroSamplingRate == 0x01)
+                    {
+                        LowPowerGyroEnabled = true;
+                    }
 
+                }
+				
                 NumberofChannels = (int)packet[6 + 3];
                 BufferSize = (int)packet[7 + 3];
                 ListofSensorChannels.Clear();
@@ -2308,7 +2312,7 @@ public void InterpretInquiryResponseShimmer3(List<byte> packet)
                 GyroRange = (int)((ConfigSetupByte0 >> 16) & 0x03);
                 MagGain = (int)((ConfigSetupByte0 >> 21) & 0x07);
                 AccelSamplingRate = (int)((ConfigSetupByte0 >> 4) & 0xF);
-                Mpu9150SamplingRate = (int)((ConfigSetupByte0 >> 8) & 0xFF);
+                GyroSamplingRate = (int)((ConfigSetupByte0 >> 8) & 0xFF);
                 magSamplingRate = (int)((ConfigSetupByte0 >> 18) & 0x07);
                 PressureResolution = (int)((ConfigSetupByte0 >> 28) & 0x03);
                 GSRRange = (int)((ConfigSetupByte0 >> 25) & 0x07);
@@ -2327,13 +2331,12 @@ public void InterpretInquiryResponseShimmer3(List<byte> packet)
                         LowPowerAccelEnabled = true;
                     }
 
-                    if ((Mpu9150SamplingRate == 0xFF && ADCRawSamplingRateValue < 3200))
+                    if ((GyroSamplingRate == 0xFF && ADCRawSamplingRateValue < 3200))
                     {
                         LowPowerGyroEnabled = true;
                     }
                 }
 
-
                 NumberofChannels = (int)packet[6];
                 BufferSize = (int)packet[7];
                 ListofSensorChannels.Clear();
@@ -5392,9 +5395,9 @@ public int GetMpu9150AccelRange()
         {
             return Mpu9150AccelRange;
         }
-        public int GetMpu9150SamplingRate()
+        public int GetGyroSamplingRate()
         {
-            return Mpu9150SamplingRate;
+            return GyroSamplingRate;
         }
 
         public int GetAccelRange()
@@ -6354,7 +6357,7 @@ protected void WriteGyroSamplingRate(int rate)
         {
             if (HardwareVersion == (int)ShimmerVersion.SHIMMER3 || HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
             {
-                Mpu9150SamplingRate = rate;
+                GyroSamplingRate = rate;
                 mTempIntValue = rate;
                 WriteBytes(new byte[2] { (byte)PacketTypeShimmer3.SET_MPU9150_SAMPLING_RATE_COMMAND, (byte)rate }, 0, 2);
                 System.Threading.Thread.Sleep(200);

ShimmerAPI/ShimmerAPI/ShimmerLogAndStream.cs

@@ -1207,7 +1207,7 @@ public void SdConfigWrite()
             file.WriteLine("gs_range=" + GetGSRRange());
             file.WriteLine("exp_power=" + (GetExpPower() ? 1 : 0));
             file.WriteLine("gyro_range=" + GetGyroRange());
-            file.WriteLine("gyro_samplingrate=" + GetMpu9150SamplingRate());
+            file.WriteLine("gyro_samplingrate=" + GetGyroSamplingRate());
             file.WriteLine("acc_range=" + GetAccelRange());
             file.WriteLine("acc_lpm=" + GetAccelLPBit());
             file.WriteLine("acc_hrm=" + GetAccelHRBit());

ShimmerAPI/ShimmerAPI/ShimmerSDBT.cs

@@ -976,7 +976,7 @@ public void SdConfigWrite()
             file.WriteLine("gs_range=" + GetGSRRange());
             file.WriteLine("exp_power=" + (GetExpPower() ? 1 : 0));
             file.WriteLine("gyro_range=" + GetGyroRange());
-            file.WriteLine("gyro_samplingrate=" + GetMpu9150SamplingRate());
+            file.WriteLine("gyro_samplingrate=" + GetGyroSamplingRate());
             file.WriteLine("acc_range=" + GetAccelRange());
             file.WriteLine("acc_lpm=" + GetAccelLPBit());
             file.WriteLine("acc_hrm=" + GetAccelHRBit());