From bf4c3a9c42ba5fc26ed674f3d02dea6c8f0b40db Mon Sep 17 00:00:00 2001 From: MonavaTim Date: Sun, 5 Apr 2026 20:45:34 +0200 Subject: [PATCH 1/2] openFPGAloader supports the fs file format as is, Added it as an option in the settings. Used for Gowin devices --- src/OneWare.OssCadSuiteIntegration/Loaders/OpenFpgaLoader.cs | 3 +++ .../ViewModels/YosysCompileSettingsViewModel.cs | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/OneWare.OssCadSuiteIntegration/Loaders/OpenFpgaLoader.cs b/src/OneWare.OssCadSuiteIntegration/Loaders/OpenFpgaLoader.cs index 771bdde49..ff90310df 100644 --- a/src/OneWare.OssCadSuiteIntegration/Loaders/OpenFpgaLoader.cs +++ b/src/OneWare.OssCadSuiteIntegration/Loaders/OpenFpgaLoader.cs @@ -69,6 +69,9 @@ public async Task DownloadAsync(UniversalFpgaProjectRoot project) case "bit": openFpgaLoaderArguments.Add("./build/pack.bit"); break; + case "fs": + openFpgaLoaderArguments.Add("./build/pack.fs"); + break; default: outputService.WriteLine($"Could not find output type: {bitstreamFormat}"); return; diff --git a/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs b/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs index 1465a5714..c5bbef1c2 100644 --- a/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs +++ b/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs @@ -143,7 +143,8 @@ public YosysCompileSettingsViewModel(UniversalFpgaProjectRoot fpgaProjectRoot, I _packOutputTypeSetting = new ComboBoxSetting("Pack output format", defaultProperties.GetValueOrDefault("packToolOutputFormat") ?? "", [ "bin", - "bit" + "bit", + "fs" ]) { HoverDescription = "Set Pack tool output format" From 0f4939e8475efed8cee10135a10840feeecaec1b Mon Sep 17 00:00:00 2001 From: MonavaTim Date: Sun, 5 Apr 2026 20:53:41 +0200 Subject: [PATCH 2/2] changed loader input rather than packer output --- .../ViewModels/OpenFpgaLoaderSettingsViewModel.cs | 3 ++- .../ViewModels/YosysCompileSettingsViewModel.cs | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OneWare.OssCadSuiteIntegration/ViewModels/OpenFpgaLoaderSettingsViewModel.cs b/src/OneWare.OssCadSuiteIntegration/ViewModels/OpenFpgaLoaderSettingsViewModel.cs index 3e17e18eb..d97e5d113 100644 --- a/src/OneWare.OssCadSuiteIntegration/ViewModels/OpenFpgaLoaderSettingsViewModel.cs +++ b/src/OneWare.OssCadSuiteIntegration/ViewModels/OpenFpgaLoaderSettingsViewModel.cs @@ -50,7 +50,8 @@ public OpenFpgaLoaderSettingsViewModel(UniversalFpgaProjectRoot projectRoot, IFp _inputBitstreamFormat = new ComboBoxSetting("Pack output format", defaultProperties.GetValueOrDefault("openFpgaLoaderBitstreamFormat") ?? "", [ "bin", - "bit" + "bit", + "fs" ]) { HoverDescription = "Set Pack tool output format" diff --git a/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs b/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs index c5bbef1c2..1465a5714 100644 --- a/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs +++ b/src/OneWare.OssCadSuiteIntegration/ViewModels/YosysCompileSettingsViewModel.cs @@ -143,8 +143,7 @@ public YosysCompileSettingsViewModel(UniversalFpgaProjectRoot fpgaProjectRoot, I _packOutputTypeSetting = new ComboBoxSetting("Pack output format", defaultProperties.GetValueOrDefault("packToolOutputFormat") ?? "", [ "bin", - "bit", - "fs" + "bit" ]) { HoverDescription = "Set Pack tool output format"