Showing the FW and HW revision on the info page

COM8 · Feb 10, 2019 · fe72ade · fe72ade
1 parent a2f2d6d
commit fe72ade
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 7 deletions.
diff --git a/Onewheel/Pages/InfoPage.xaml b/Onewheel/Pages/InfoPage.xaml
@@ -50,6 +50,18 @@
                 <TextBlock x:Name="deviceId_tbx"
                            TextWrapping="Wrap"/>
 
+                <TextBlock Margin="0,10,0,0"
+                           FontSize="20"
+                           Text="Firmware revision:"/>
+                <TextBlock x:Name="firmware_tbx"
+                           TextWrapping="Wrap"/>
+
+                <TextBlock Margin="0,10,0,0"
+                           FontSize="20"
+                           Text="Hardware revision:"/>
+                <TextBlock x:Name="hardware_tbx"
+                           TextWrapping="Wrap"/>
+
                 <TextBlock Margin="0,10,0,0"
                            FontSize="20"
                            Text="Battery:"/>

diff --git a/Onewheel/Pages/InfoPage.xaml.cs b/Onewheel/Pages/InfoPage.xaml.cs
@@ -1,6 +1,7 @@
 using Onewheel_UI_Context.Classes;
 using OnewheelBluetooth.Classes;
-using System;
+using Shared.Classes;
+using System.Threading.Tasks;
 using Windows.Devices.Bluetooth;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -95,10 +96,22 @@ private void ShowBoard()
             }
         }
 
-        private void ShowCellVoltages()
+        private async Task ShowCellVoltagesAsync()
         {
             byte[] data = OnewheelConnectionHelper.INSTANCE.CACHE.GetBytes(OnewheelCharacteristicsCache.CHARACTERISTIC_BATTERY_CELL_VOLTAGES);
-            Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () => batteryCellVoltages_bcvc.SetVoltages(data)).AsTask();
+            await SharedUtils.CallDispatcherAsync(() => batteryCellVoltages_bcvc.SetVoltages(data));
+        }
+
+        private async Task ShowHardwareRevisionAsync()
+        {
+            uint hw = OnewheelConnectionHelper.INSTANCE.CACHE.GetUint(OnewheelCharacteristicsCache.CHARACTERISTIC_HARDWARE_REVISION);
+            await SharedUtils.CallDispatcherAsync(() => hardware_tbx.Text = hw.ToString());
+        }
+
+        private async Task ShowFirmwareRevisionAsync()
+        {
+            uint fw = OnewheelConnectionHelper.INSTANCE.CACHE.GetUint(OnewheelCharacteristicsCache.CHARACTERISTIC_FIRMWARE_REVISION);
+            await SharedUtils.CallDispatcherAsync(() => firmware_tbx.Text = fw.ToString());
         }
 
         #endregion
@@ -109,22 +122,36 @@ private void ShowCellVoltages()
         #endregion
         //--------------------------------------------------------Events:---------------------------------------------------------------------\\
         #region --Events--
-        private void Page_Loaded(object sender, RoutedEventArgs e)
+        private async void Page_Loaded(object sender, RoutedEventArgs e)
         {
             OnewheelConnectionHelper.INSTANCE.OnewheelChanged += INSTANCE_OnewheelChanged;
             OnewheelConnectionHelper.INSTANCE.CACHE.CharacteristicChanged += CACHE_CharacteristicChanged;
             SetBoard(OnewheelConnectionHelper.INSTANCE.GetOnewheel());
 
             // Battery:
-            ShowCellVoltages();
+            await ShowCellVoltagesAsync();
+            // Firmware:
+            await ShowFirmwareRevisionAsync();
+            // Hardware:
+            await ShowHardwareRevisionAsync();
         }
 
-        private void CACHE_CharacteristicChanged(OnewheelCharacteristicsCache sender, OnewheelBluetooth.Classes.Events.CharacteristicChangedEventArgs args)
+        private async void CACHE_CharacteristicChanged(OnewheelCharacteristicsCache sender, OnewheelBluetooth.Classes.Events.CharacteristicChangedEventArgs args)
         {
             // Battery:
             if (args.UUID.Equals(OnewheelCharacteristicsCache.CHARACTERISTIC_BATTERY_CELL_VOLTAGES))
             {
-                ShowCellVoltages();
+                await ShowCellVoltagesAsync();
+            }
+            // Firmware:
+            else if (args.UUID.Equals(OnewheelCharacteristicsCache.CHARACTERISTIC_FIRMWARE_REVISION))
+            {
+                await ShowFirmwareRevisionAsync();
+            }
+            // Hardware:
+            else if (args.UUID.Equals(OnewheelCharacteristicsCache.CHARACTERISTIC_HARDWARE_REVISION))
+            {
+                await ShowHardwareRevisionAsync();
             }
         }