release 1.7.3

FOTA: flash top address configurable.
ingchips · Apr 19, 2023 · 13fbf0d · 13fbf0d
1 parent 5e2088d
commit 13fbf0d
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 6 deletions.
diff --git a/INGdemo/INGdemo/FOTA/OTA.cs b/INGdemo/INGdemo/FOTA/OTA.cs
@@ -195,9 +195,7 @@ public enum OTAStatus
         }
 
         int FLASH_BASE { get { return (int)CurrentFlash.BaseAddr; } }
-        int FLASH_SIZE { get { return (int)CurrentFlash.TotalSize; } }
         int FLASH_PAGE_SIZE { get { return (int)CurrentFlash.PageSize; } }
-        int FLASH_OTA_DATA_HIGH { get { return (int)CurrentFlash.BaseAddr + (int)CurrentFlash.TotalSize; } }
 
         const int OTA_UPDATE_FLAG = 0x5A5A5A5A;
         const int OTA_LOCK_FLAG = 0x5A5A5A5A;
@@ -245,11 +243,14 @@ public OTA(string url, IBleDriver driver)
             this.driver = driver;
             Bins = new List<OTABin>();
             KeyUtils = new KeyUtils();
+            EmptyFlashTop = 0;
         }
 
         public bool Available { get { return driver.Available; } }
         public OTAStatus Status { get => status; }
 
+        public uint EmptyFlashTop { get;  set; }
+
         public string UpdateInfo { get; set; }
 
         public string LocalVersion { get { return Local != null ? Local.ToString() : "n/a"; } }
@@ -340,6 +341,12 @@ async Task CheckZipPack(byte []bytes)
                 SetStatus(OTAStatus.UpToDate);
         }
 
+        public uint GetFlashTopAddress(int series)
+        {
+            var f = FlashInfos[series];
+            return f.BaseAddr + f.TotalSize;
+        }
+
         async public Task CheckUpdateLocal(int series, byte[] bytes)
         {
             Latest = null;
@@ -464,7 +471,7 @@ async Task DecodePackage(byte []bytes)
 
         protected virtual void MakeFlashProcedure()
         {
-            int addr = FLASH_OTA_DATA_HIGH;
+            int addr = (int)EmptyFlashTop;
             if (Bins.Count < 1)
                 return;
 

diff --git a/INGdemo/INGdemo/FOTA/Utils.cs b/INGdemo/INGdemo/FOTA/Utils.cs
@@ -325,5 +325,20 @@ public static string PrintHexTable(byte []v)
             }
             return string.Join("\n", r);
         }
+
+        public static uint ParseInt(string s)
+        {
+            UInt32 r = 0;
+            if (s.StartsWith("0x") || s.StartsWith("0X"))
+            {
+                var hex = s.Substring(2);
+                r = UInt32.Parse(hex, NumberStyles.HexNumber);
+            }
+            else
+            {
+                UInt32.TryParse(s, out r);
+            }
+            return r;
+        }
     }
 }
diff --git a/INGdemo/INGdemo/Models/OTAModel.cs b/INGdemo/INGdemo/Models/OTAModel.cs
@@ -14,6 +14,7 @@
 
 using INGota.FOTA;
 using INGdemo.Models;
+using System.Runtime.CompilerServices;
 
 namespace INGota.Models
 {
@@ -42,6 +43,7 @@ class ThermoFOTAViewer : ContentPage
         IBleDriver driver;
         WaitActivity Wait;
         Entry urlInput;
+        Entry topAddressInput;
         Picker seriesPicker;
 
         async void InitUI(IDevice ADevice, IReadOnlyList<IService> services)
@@ -56,6 +58,10 @@ async void InitUI(IDevice ADevice, IReadOnlyList<IService> services)
             server.Text = "FOTA Server";
             server.Style = Device.Styles.TitleStyle;
 
+            var labelTopAddr = new Label();
+            labelTopAddr.Text = "Flash Top Address";
+            labelTopAddr.Style = Device.Styles.TitleStyle;
+
             var secureInfo = new Label();
 
             secureInfo.Style = Device.Styles.CaptionStyle;
@@ -82,12 +88,15 @@ await DisplayAlert("Alert",
 
             urlInput = new Entry();
             urlInput.Text = FOTA_SERVER;
+            topAddressInput = new Entry();
+            topAddressInput.Text = "0";
 
             seriesPicker = new Picker { Title = "Select Chip Series:" };
             seriesPicker.Items.Add("ING9188xx/ING9187xx");
             seriesPicker.Items.Add("ING9168xx");
             seriesPicker.SelectedIndex = 0;
             seriesPicker.HorizontalOptions = LayoutOptions.FillAndExpand;
+            seriesPicker.SelectedIndexChanged += SeriesPicker_SelectedIndexChanged;
 
             var seriesCont = new StackLayout();
             seriesCont.Orientation = StackOrientation.Horizontal;
@@ -96,7 +105,9 @@ await DisplayAlert("Alert",
             seriesCont.HorizontalOptions = LayoutOptions.FillAndExpand;
 
             container.Margin = 10;
-            container.Children.Add(seriesCont); 
+            container.Children.Add(seriesCont);
+            container.Children.Add(labelTopAddr);
+            container.Children.Add(topAddressInput);
             container.Children.Add(server);            
             container.Children.Add(urlInput);
 
@@ -131,6 +142,18 @@ await DisplayAlert("Alert",
             Summary.GestureRecognizers.Add(tapGestureRecognizer);
             Summary_Tapped(null, null);
             Action.Clicked += Action_Clicked;
+
+            UpdateFlashTopAddress();
+        }
+
+        private void UpdateFlashTopAddress()
+        {
+            topAddressInput.Text = "0x" + ota.GetFlashTopAddress(seriesPicker.SelectedIndex).ToString("X8");
+        }
+
+        private void SeriesPicker_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateFlashTopAddress();
         }
 
         private async void Btn_Pressed(object sender, EventArgs e)
@@ -231,7 +254,7 @@ public ThermoFOTAViewer(IDevice ADevice, IReadOnlyList<IService> services)
             ota.StatusChanged += Ota_StatusChanged;
             ota.Progress += Ota_Progress;
 
-            InitUI(ADevice, services);     
+            InitUI(ADevice, services);   
         }
 
         private void Summary_Tapped(object sender, EventArgs e)
@@ -307,6 +330,7 @@ private async void Action_Clicked(object sender, EventArgs e)
                     {
                         BleDevice.UpdateConnectionInterval(ConnectionInterval.High);
                         int MtuSize = await BleDevice.RequestMtuAsync(250);
+                        ota.EmptyFlashTop = Utils.ParseInt(topAddressInput.Text);
                         r = await ota.Update(Math.Max(23, MtuSize - 4));
                     }
                     finally

diff --git a/INGdemo/INGdemo/Views/AboutPage.xaml b/INGdemo/INGdemo/Views/AboutPage.xaml
@@ -38,7 +38,7 @@
                             <FormattedString.Spans>
                                 <Span Text="ING BLE" FontAttributes="Bold" FontSize="22" />
                                 <Span Text=" " />
-                                <Span Text="1.7.2" ForegroundColor="{StaticResource LightTextColor}" />
+                                <Span Text="1.7.3" ForegroundColor="{StaticResource LightTextColor}" />
                             </FormattedString.Spans>
                         </FormattedString>
                     </Label.FormattedText>