From c7c949bd00ca4dd53f121eafd4b0b0adf0453687 Mon Sep 17 00:00:00 2001
From: weiwentan23 <weiwentan@shimmersensing.com>
Date: Wed, 3 Aug 2022 15:27:40 +0800
Subject: [PATCH 1/2] add step count option

---
 .../BLE.Client/Pages/DeviceListPage.xaml      |  4 ++
 .../ViewModels/DeviceListViewModel.cs         | 24 ++++++++++++
 .../ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs    | 39 +++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml b/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml
index ba6ce9bb..69bc0d20 100644
--- a/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml
+++ b/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml
@@ -610,6 +610,10 @@
                             <Label Text="SensorGyro : " WidthRequest="200"/>
                             <CheckBox IsChecked="{Binding SensorGyro}" />
                         </StackLayout>
+                        <StackLayout Orientation="Horizontal">
+                            <Label Text="Step Count : " WidthRequest="200"/>
+                            <CheckBox IsChecked="{Binding StepCount}" />
+                        </StackLayout>
                         <StackLayout Orientation="Horizontal">
                             <Label Text="Sampling Rate : " WidthRequest="200"/>
                             <Picker ItemsSource="{Binding Accel2GyroRates}"
diff --git a/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs b/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
index 6013230d..04ee715b 100644
--- a/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
+++ b/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
@@ -327,6 +327,21 @@ public bool SensorGyro
             }
         }
 
+        bool _StepCountEnabled;
+        public bool StepCount
+        {
+            get => _StepCountEnabled;
+
+            set
+            {
+                if (_StepCountEnabled == value)
+                    return;
+
+                _StepCountEnabled = value;
+                RaisePropertyChanged();
+            }
+        }
+
         //bool _GyroHighPerformanceEnabled;
         //public bool SensorGyroHighPerformance
         //{
@@ -2384,6 +2399,7 @@ private void ShimmerDevice_BLEEvent(object sender, ShimmerBLEEventData e)
                     SensorAccel = ((SensorLIS2DW12)VerisenseBLEDevice.GetSensor(SensorLIS2DW12.SensorName)).IsAccelEnabled();
                     SensorAccel2 = ((SensorLSM6DS3)VerisenseBLEDevice.GetSensor(SensorLSM6DS3.SensorName)).IsAccelEnabled();
                     SensorGyro = ((SensorLSM6DS3)VerisenseBLEDevice.GetSensor(SensorLSM6DS3.SensorName)).IsGyroEnabled();
+                    StepCount = ((SensorLSM6DS3)VerisenseBLEDevice.GetSensor(SensorLSM6DS3.SensorName)).IsStepCountEnabled();
                     if (((shimmer.Sensors.SensorGSR)VerisenseBLEDevice.GetSensor(shimmer.Sensors.SensorGSR.SensorName)).GetOversamplingRate() != null)
                     {
                         SelectedGSROversamplingRate = ((shimmer.Sensors.SensorGSR)VerisenseBLEDevice.GetSensor(shimmer.Sensors.SensorGSR.SensorName)).GetOversamplingRate().GetDisplayName();
@@ -2825,6 +2841,14 @@ protected async void ConfigureSensor()
             {
                 ((SensorLSM6DS3)clone.GetSensor(SensorLSM6DS3.SensorName)).SetGyroEnabled(false);
             }
+            if (StepCount)
+            {
+                ((SensorLSM6DS3)clone.GetSensor(SensorLSM6DS3.SensorName)).SetStepCountEnabled(true);
+            }
+            else
+            {
+                ((SensorLSM6DS3)clone.GetSensor(SensorLSM6DS3.SensorName)).SetStepCountEnabled(false);
+            }
             ((SensorLSM6DS3)clone.GetSensor(SensorLSM6DS3.SensorName)).SetAccelRange(a2range);
             ((SensorLSM6DS3)clone.GetSensor(SensorLSM6DS3.SensorName)).SetSamplingRate(a2gyrorate);
             ((SensorLSM6DS3)clone.GetSensor(SensorLSM6DS3.SensorName)).SetGyroRange(grange);
diff --git a/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs b/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs
index 8be981ee..44dcfb9f 100644
--- a/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs
+++ b/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs
@@ -24,6 +24,8 @@ public SensorLSM6DS3()
 		//GEN_CFG_0
 		protected bool Accel2_Enabled = false;
 		protected bool Gyro_Enabled = false;
+		//GEN_CFG_2
+		protected bool StepCountEnabled;
 		//GYRO_ACCEL2_CFG_0
 		protected SensorSetting FIFOThresholdSetting = Sensor.UnknownSetting;
 		//GYRO_ACCEL2_CFG_1
@@ -268,6 +270,7 @@ public void SetAccelEnabled(bool enable)
         {
 			Accel2_Enabled = enable;
         }
+
 		/// <summary>
 		/// Turns on/off data collection from the gyroscope
 		/// </summary>
@@ -276,6 +279,24 @@ public void SetGyroEnabled(bool enable)
         {
 			Gyro_Enabled = enable;
         }
+
+		/// <summary>
+		/// Returns true if step count is enabled
+		/// </summary>
+		public bool IsStepCountEnabled()
+		{
+			return StepCountEnabled;
+		}
+
+		/// <summary>
+		/// Enable or disable step count
+		/// </summary>
+		/// <param name="enabled"></param>
+		public void SetStepCountEnabled(bool enabled)
+		{
+			StepCountEnabled = enabled;
+		}
+
 		/// <summary>
 		/// Returns true if the data collection from the secondary accelerometer is enabled
 		/// </summary>
@@ -284,6 +305,7 @@ public bool IsAccelEnabled()
         {
 			return Accel2_Enabled;
         }
+
 		/// <summary>
 		/// Returns true if the data collection from the gyroscope is enabled
 		/// </summary>
@@ -660,6 +682,15 @@ public override byte[] GenerateOperationConfig(byte[] operationalConfigBytes)
 				operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_0] = (byte)(operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_0] & 0b11011111);
 			}
 
+			if (StepCountEnabled)
+			{
+				operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_2] = (byte)(operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_2] | 0b00100000);
+			}
+			else
+			{
+				operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_2] = (byte)(operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_2] & 0b11011111);
+			}
+
 			//temp
 			operationalConfigBytes[(int)ConfigurationBytesIndexName.GYRO_ACCEL2_CFG_5] = (byte)((operationalConfigBytes[(int)ConfigurationBytesIndexName.GYRO_ACCEL2_CFG_5] & 0b0001111) | (SamplingRateSetting.GetConfigurationValue() << 4));
 			operationalConfigBytes[(int)ConfigurationBytesIndexName.GYRO_ACCEL2_CFG_5] = (byte)((operationalConfigBytes[(int)ConfigurationBytesIndexName.GYRO_ACCEL2_CFG_5] & 0b11110011) | (GyroRangeSetting.GetConfigurationValue() << 2));
@@ -902,6 +933,14 @@ public override void InitializeUsingOperationConfig(byte[] operationalConfigByte
 			{
 				Gyro_Enabled = false;
 			}
+			if ((operationalConfigBytes[(int)ConfigurationBytesIndexName.GEN_CFG_2] & 0b00100000) > 5)
+			{
+				StepCountEnabled = true;
+			}
+			else
+			{
+				StepCountEnabled = false;
+			}
 			if (((operationalConfigBytes[(int)ConfigurationBytesIndexName.GYRO_ACCEL2_CFG_1] >> 7) & 0b00000001) == 1)
 			{
 				StepCounterAndTimestampEnabled = true;

From 39eeb5c69d252357cbd0783b38a1957417350323 Mon Sep 17 00:00:00 2001
From: weiwentan23 <weiwentan@shimmersensing.com>
Date: Wed, 3 Aug 2022 16:20:55 +0800
Subject: [PATCH 2/2] and condition for enable step count

---
 .../ViewModels/DeviceListViewModel.cs          | 18 ++++++++++++++++++
 .../ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs     |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs b/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
index 04ee715b..57075ee8 100644
--- a/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
+++ b/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
@@ -307,6 +307,12 @@ public bool SensorAccel2
                 if (_Accel2Enabled == value)
                     return;
 
+                if (_Accel2Enabled && _StepCountEnabled)
+                {
+                    RaisePropertyChanged();
+                    return;
+                }
+
                 _Accel2Enabled = value;
                 RaisePropertyChanged();
             }
@@ -322,6 +328,12 @@ public bool SensorGyro
                 if (_GyroEnabled == value)
                     return;
 
+                if(_GyroEnabled && _StepCountEnabled)
+                {
+                    RaisePropertyChanged();
+                    return;
+                }
+
                 _GyroEnabled = value;
                 RaisePropertyChanged();
             }
@@ -337,6 +349,12 @@ public bool StepCount
                 if (_StepCountEnabled == value)
                     return;
 
+                if (!_Accel2Enabled || !_GyroEnabled)
+                {
+                    RaisePropertyChanged();
+                    return;
+                }
+
                 _StepCountEnabled = value;
                 RaisePropertyChanged();
             }
diff --git a/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs b/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs
index 44dcfb9f..3eab4c85 100644
--- a/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs
+++ b/ShimmerBLE/ShimmerBLEAPI/Sensors/SensorLSM6DS3.cs
@@ -294,6 +294,10 @@ public bool IsStepCountEnabled()
 		/// <param name="enabled"></param>
 		public void SetStepCountEnabled(bool enabled)
 		{
+			if(enabled && (!Accel2_Enabled || !Gyro_Enabled))
+            {
+				throw new Exception("Unable to enable step count when Accel2 or Gyro is not enabled. ");
+			}
 			StepCountEnabled = enabled;
 		}