Merge pull request #158 from OpenIPC/dev

mikecarr · web-flow · commit 2668d32b108e · 2026-03-08T10:17:40.000-07:00
This PR merges the latest dev branch changes into master
diff --git a/.github/workflows/gen-test-coverage-report.yml b/.github/workflows/gen-test-coverage-report.yml
@@ -6,12 +6,6 @@ concurrency:
 
 on:
   workflow_dispatch:
-  push:
-    branches: ["master"]
-  pull_request:
-    branches: ["master"]
-  release:
-    types: [published]
 
 jobs:
   coverage:
@@ -38,11 +32,14 @@ jobs:
         run: dotnet workload restore
 
       - name: Restore dependencies
-        run: dotnet restore Companion.Desktop/Companion.Desktop.csproj
+        run: dotnet restore
 
       - name: Build project
         run: dotnet build Companion.Desktop/Companion.Desktop.csproj --configuration Release --no-restore
 
+      - name: Build tests
+        run: dotnet build Companion.Tests/Companion.Tests.csproj --configuration Release --no-restore
+
       - name: Run tests with coverage
         run: dotnet test Companion.Tests/Companion.Tests.csproj --configuration Release --no-build --verbosity normal --logger "trx" --collect:"XPlat Code Coverage"
 
@@ -62,7 +59,7 @@ jobs:
         with:
           name: coverage
           path: ${{ github.workspace }}/Cobertura.xml
-          retention-days: 3
+          retention-days: 1
 
       - name: Publish Code Coverage Report
         uses: irongut/CodeCoverageSummary@v1.3.0
@@ -90,7 +87,7 @@ jobs:
         with:
           name: test-results
           path: ${{ github.workspace }}/**/TestResults/**/*
-          retention-days: 3
+          retention-days: 1
 
       - name: Publish Test Results
         if: always()
@@ -106,10 +103,3 @@ jobs:
           find "${{ github.workspace }}" -type f -name "*.trx" -delete || true
           find "${{ github.workspace }}" -type f -name "*.cobertura.xml" -delete || true
           rm -f "${{ github.workspace }}/Cobertura.xml" "${{ github.workspace }}/code-coverage-results.md" || true
-
-      - name: Prune Old Artifacts
-        if: always() && github.event_name != 'pull_request'
-        uses: c-hive/gha-remove-artifacts@v1
-        with:
-          age: '1 day'
-          skip-recent: 2
diff --git a/Companion.Tests/ViewModels/FirmwareTabViewModelTests.cs b/Companion.Tests/ViewModels/FirmwareTabViewModelTests.cs
@@ -143,6 +143,39 @@ public void CanExecuteDownloadFirmware_ReturnsTrue_IfValidState()
         Assert.That(canExecute, Is.True);
     }
 
+    [Test]
+    public void SelectedFirmwareSource_DefaultsToOpenIpcBuilder()
+    {
+        Assert.That(_viewModel.SelectedFirmwareSource, Is.EqualTo("OpenIPC Builder"));
+    }
+
+    [Test]
+    public void BuildFirmwareDownloadUrl_DefaultSource_UsesOpenIpcReleaseUrl()
+    {
+        var url = (string)InvokePrivateMethod(_viewModel, "BuildFirmwareDownloadUrl", "test-fw.tgz");
+        Assert.That(url, Is.EqualTo("https://github.com/OpenIPC/builder/releases/download/latest/test-fw.tgz"));
+    }
+
+    [Test]
+    public void BuildFirmwareDownloadUrl_GregSource_UsesRawGithubUrl()
+    {
+        _viewModel.SelectedFirmwareSource = "Greg APFPV";
+
+        var url = (string)InvokePrivateMethod(_viewModel, "BuildFirmwareDownloadUrl", "test-fw.tgz");
+
+        Assert.That(url, Is.EqualTo("https://raw.githubusercontent.com/sickgreg/OpenIPC_sickgregFPV_apfpv/main/test-fw.tgz"));
+    }
+
+    [Test]
+    public void CanUseDropdowns_GregSource_ReturnsFalse()
+    {
+        _viewModel.CanConnect = true;
+        _viewModel.IsConnected = true;
+        _viewModel.SelectedFirmwareSource = "Greg APFPV";
+
+        Assert.That(_viewModel.CanUseDropdowns, Is.False);
+    }
+
     [Test]
     public void UpdateSysupgradeProgressFromLine_KernelWritingPercent_MapsToRange()
     {
diff --git a/Companion/App.axaml.cs b/Companion/App.axaml.cs
@@ -147,29 +147,19 @@ private void UpdateExistingSettings(string configPath)
                 existingSettings["UpdateChecker"] = new JObject(
                     new JProperty("LatestJsonUrl", "https://github.com/OpenIPC/companion/releases/latest/download/latest.json")
                 );
-                
+
                 hasChanges = true;
-                Log.Information("Added Presets section to existing settings");
+                Log.Information("Updated UpdateChecker settings in existing settings");
             }
-            // Check if Presets section exists, add if missing
-            if (existingSettings["Presets"] == null)
+            else
             {
-                existingSettings["Presets"] = new JObject(
-                    new JProperty("Repositories", 
-                        new JArray(
-                            new JObject(
-                                new JProperty("Url", "https://github.com/OpenIPC/fpv-presets"),
-                                new JProperty("Branch", "master"),
-                                new JProperty("Description", "Official OpenIPC presets repository"),
-                                new JProperty("IsActive", true)
-                            )
-                        )
-                    )
+                existingSettings["UpdateChecker"] = new JObject(
+                    new JProperty("LatestJsonUrl", "https://github.com/OpenIPC/companion/releases/latest/download/latest.json")
                 );
+
                 hasChanges = true;
-                Log.Information("Added Presets section to existing settings");
+                Log.Information("Added UpdateChecker settings to existing settings");
             }
-            
             // Add more upgrade steps for other sections as needed
             
             // Save changes if needed
@@ -419,20 +409,6 @@ private JObject createDefaultAppSettings()
                         "https://github.com/OpenIPC/companion/releases/latest/download/latest.json")
                 )
             ),
-            new JProperty("Presets",
-                new JObject(
-                    new JProperty("Repositories", 
-                        new JArray(
-                            new JObject(
-                                new JProperty("Url", "https://github.com/OpenIPC/fpv-presets"),
-                                new JProperty("Branch", "master"),
-                                new JProperty("Description", "Official OpenIPC presets repository"),
-                                new JProperty("IsActive", true)
-                            )
-                        )
-                    )
-                )
-            ),
             new JProperty("Serilog",
                 new JObject(
                     new JProperty("Using", new JArray("Serilog.Sinks.Console", "Serilog.Sinks.File")),
diff --git a/Companion/Models/OpenIPC.cs b/Companion/Models/OpenIPC.cs
@@ -19,6 +19,10 @@ public enum FileType
 
     public const string OpenIPCBuilderGitHubApiUrl = "https://api.github.com/repos/OpenIPC/builder/releases/latest";
     public const string OpenIPCFirmwareGitHubApiUrl = "https://api.github.com/repos/OpenIPC/firmware/releases/latest";
+    public const string GregApfpvContentsGitHubApiUrl =
+        "https://api.github.com/repos/sickgreg/OpenIPC_sickgregFPV_apfpv/contents";
+    public const string GregApfpvRawBaseUrl =
+        "https://raw.githubusercontent.com/sickgreg/OpenIPC_sickgregFPV_apfpv/main/";
     public const string MajesticFileLoc = "/etc/majestic.yaml";
     public const string WfbConfFileLoc = "/etc/wfb.conf";
     public const string WfbYamlFileLoc = "/etc/wfb.yaml";
diff --git a/Companion/Services/UpdateChecker.cs b/Companion/Services/UpdateChecker.cs
@@ -9,13 +9,18 @@ namespace Companion.Services;
 
 public class UpdateChecker
 {
+    private const string DefaultLatestJsonUrl =
+        "https://github.com/OpenIPC/companion/releases/latest/download/latest.json";
+
     private readonly HttpClient _httpClient;
     private readonly string _latestJsonUrl;
 
     public UpdateChecker(HttpClient httpClient, IConfiguration configuration)
     {
         _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
         _latestJsonUrl = configuration["UpdateChecker:LatestJsonUrl"];
+        if (string.IsNullOrWhiteSpace(_latestJsonUrl))
+            _latestJsonUrl = DefaultLatestJsonUrl;
     }
 
 
diff --git a/Companion/Services/WifiCardDetector.cs b/Companion/Services/WifiCardDetector.cs
@@ -63,6 +63,10 @@ public static string DetectWifiCard(string lsusbOutput)
                     driver = "ar9271";
                     Log.Information($"Read WiFi card: {card}, Driver: {driver}");
                     break;
+                case "0bda:c812":
+                    driver = "88x2cu";
+                    Log.Information($"Read WiFi card: {card}, Driver: {driver}");
+                    break;
             }
 
            if (driver != null) break; //Stop at the first match (mimics the bash script behavior)
diff --git a/Companion/ViewModels/FirmwareTabViewModel.cs b/Companion/ViewModels/FirmwareTabViewModel.cs
@@ -79,6 +79,8 @@ private enum SysupgradePhase
     private static readonly Regex MtdLineRegex =
         new(@"^(?<dev>mtd\d+):\s+(?<size>[0-9a-fA-F]+)\s+(?<erasesize>[0-9a-fA-F]+)\s+""(?<name>[^""]+)""",
             RegexOptions.Compiled);
+    private const string OpenIpcFirmwareSource = "OpenIPC Builder";
+    private const string GregApfpvFirmwareSource = "Greg APFPV";
     #endregion
 
     #region Observable Properties
@@ -106,6 +108,7 @@ private enum SysupgradePhase
     [ObservableProperty] private bool _firmwareUpgradeInProgress;
     [ObservableProperty] private bool _isFirmwareExpanded = true;
     [ObservableProperty] private bool _isBootloaderExpanded;
+    [ObservableProperty] private string _selectedFirmwareSource;
 
     #endregion
 
@@ -114,7 +117,7 @@ private enum SysupgradePhase
     /// <summary>
     /// Gets whether dropdowns should be enabled based on connection and firmware selection state
     /// </summary>
-    public bool CanUseDropdowns => IsConnected;
+    public bool CanUseDropdowns => IsConnected && !IsGregApfpvSourceSelected();
 
     /// <summary>
     /// Gets whether soc dropdowns should be enabled based on connection and firmware selection state
@@ -147,6 +150,11 @@ private enum SysupgradePhase
     /// </summary>
     public ObservableCollection<string> FirmwareBySoc { get; set; } = new();
     public ObservableCollection<string> Bootloaders { get; set; } = new();
+    public ObservableCollection<string> FirmwareSources { get; } = new()
+    {
+        OpenIpcFirmwareSource,
+        GregApfpvFirmwareSource
+    };
 
     #endregion
 
@@ -201,6 +209,7 @@ private void InitializeProperties()
         FirmwareUpgradeInProgress = false;
         IsFirmwareExpanded = true;
         IsBootloaderExpanded = false;
+        SelectedFirmwareSource = OpenIpcFirmwareSource;
     }
 
     partial void OnIsFirmwareExpandedChanged(bool value)
@@ -299,6 +308,15 @@ partial void OnSelectedFirmwareBySocChanged(string value)
         _bRecursionSelectGuard = false;
         UpdateCanExecuteCommands();
     }
+
+    partial void OnSelectedFirmwareSourceChanged(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value) || _bRecursionSelectGuard)
+            return;
+
+        ClearFirmwareSelectionsAndCollections();
+        _ = LoadManufacturersAsync();
+    }
     
     partial void OnSelectedManufacturerChanged(string value)
     {
@@ -593,6 +611,30 @@ private void ClearForm()
         UpdateCanExecuteCommands();
     }
 
+    private void ClearFirmwareSelectionsAndCollections()
+    {
+        _bRecursionSelectGuard = true;
+
+        SelectedManufacturer = string.Empty;
+        SelectedDevice = string.Empty;
+        SelectedFirmware = string.Empty;
+        SelectedFirmwareBySoc = string.Empty;
+        ManualLocalFirmwarePackageFile = string.Empty;
+
+        IsLocalFirmwarePackageSelected = false;
+        IsManufacturerDeviceFirmwareComboSelected = false;
+        IsManualUpdateEnabled = true;
+        IsFirmwareBySocSelected = false;
+
+        Manufacturers.Clear();
+        Devices.Clear();
+        Firmwares.Clear();
+        FirmwareBySoc.Clear();
+
+        _bRecursionSelectGuard = false;
+        UpdateCanExecuteCommands();
+    }
+
     private bool CanExecuteDownloadFirmware()
     {
         return CanConnect &&
@@ -646,7 +688,9 @@ private async Task<FirmwareData> FetchFirmwareListAsync()
 
             Logger.Information($"Fetched {filenames.Count()} firmware files.");
 
-            FirmwareData firmwareData = ProcessFilenames(filenames);
+            FirmwareData firmwareData = IsGregApfpvSourceSelected()
+                ? new FirmwareData { Manufacturers = new ObservableCollection<Manufacturer>() }
+                : ProcessFilenames(filenames);
             
             // Populate FirmwareBySoc
             PopulateFirmwareBySoc(filenames); // Calling populate method here
@@ -696,11 +740,31 @@ private void PopulateFirmwareBySoc(IEnumerable<string> filenames)
 
     private async Task<IEnumerable<string>> GetFilenamesAsync()
     {
-        var response = await _gitHubService.GetGitHubDataAsync(OpenIPC.OpenIPCBuilderGitHubApiUrl);
-        var releaseData = JObject.Parse(response.ToString());
-        var assets = releaseData["assets"];
-        return assets?.Select(asset => asset["name"]?.ToString()).Where(name => !string.IsNullOrEmpty(name)) ??
-               Enumerable.Empty<string>();
+        if (IsGregApfpvSourceSelected())
+        {
+            var response = await _gitHubService.GetGitHubDataAsync(OpenIPC.GregApfpvContentsGitHubApiUrl);
+            if (string.IsNullOrEmpty(response))
+                return Enumerable.Empty<string>();
+
+            var items = JArray.Parse(response);
+            return items
+                .Where(item => item["type"]?.ToString() == "file")
+                .Select(item => item["name"]?.ToString())
+                .Where(name => !string.IsNullOrEmpty(name))
+                .Select(name => name!)
+                .Where(name => name.EndsWith(".tgz", StringComparison.OrdinalIgnoreCase));
+        }
+        else
+        {
+            var response = await _gitHubService.GetGitHubDataAsync(OpenIPC.OpenIPCBuilderGitHubApiUrl);
+            if (string.IsNullOrEmpty(response))
+                return Enumerable.Empty<string>();
+
+            var releaseData = JObject.Parse(response);
+            var assets = releaseData["assets"];
+            return assets?.Select(asset => asset["name"]?.ToString()).Where(name => !string.IsNullOrEmpty(name)) ??
+                   Enumerable.Empty<string>();
+        }
     }
 
     private async Task<IEnumerable<string>> GetBootloaderFilenamesAsync()
@@ -1385,7 +1449,7 @@ private async Task PerformFirmwareUpgradeFromSocAsync()
             if (!string.IsNullOrEmpty(firmwwareFile))
             {
                 filename = firmwwareFile;
-                downloadUrl = $"https://github.com/OpenIPC/builder/releases/download/latest/{firmwwareFile}";
+                downloadUrl = BuildFirmwareDownloadUrl(firmwwareFile);
             }
             
             else
@@ -1441,7 +1505,7 @@ private async Task PerformFirmwareUpgradeFromDropdownAsync()
                 !string.IsNullOrEmpty(firmware?.Name))
             {
                 filename = firmware.PackageFile;
-                downloadUrl = $"https://github.com/OpenIPC/builder/releases/download/latest/{filename}";
+                downloadUrl = BuildFirmwareDownloadUrl(filename);
             }
             
             else
@@ -1727,6 +1791,19 @@ public async Task SelectLocalFirmwarePackage(Window window)
         }
     }
 
+    private bool IsGregApfpvSourceSelected()
+    {
+        return string.Equals(SelectedFirmwareSource, GregApfpvFirmwareSource, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private string BuildFirmwareDownloadUrl(string firmwareFilename)
+    {
+        if (IsGregApfpvSourceSelected())
+            return $"{OpenIPC.GregApfpvRawBaseUrl}{firmwareFilename}";
+
+        return $"https://github.com/OpenIPC/builder/releases/download/latest/{firmwareFilename}";
+    }
+
     #endregion
 }
 
diff --git a/Companion/ViewModels/PresetsTabViewModel.cs b/Companion/ViewModels/PresetsTabViewModel.cs
diff --git a/Companion/Views/FirmwareTabView.axaml b/Companion/Views/FirmwareTabView.axaml

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,18 @@ namespace Companion.Services;`
`9`	`9`
`10`	`10`	`public class UpdateChecker`
`11`	`11`	`{`
	`12`	`+ private const string DefaultLatestJsonUrl =`
	`13`	`+ "https://github.com/OpenIPC/companion/releases/latest/download/latest.json";`
	`14`	`+`
`12`	`15`	`private readonly HttpClient _httpClient;`
`13`	`16`	`private readonly string _latestJsonUrl;`
`14`	`17`
`15`	`18`	`public UpdateChecker(HttpClient httpClient, IConfiguration configuration)`
`16`	`19`	`{`
`17`	`20`	`_httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));`
`18`	`21`	`_latestJsonUrl = configuration["UpdateChecker:LatestJsonUrl"];`
	`22`	`+ if (string.IsNullOrWhiteSpace(_latestJsonUrl))`
	`23`	`+ _latestJsonUrl = DefaultLatestJsonUrl;`
`19`	`24`	`}`
`20`	`25`
`21`	`26`