Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions OneWare.GhdlExtension.sln

This file was deleted.

7 changes: 7 additions & 0 deletions OneWare.GhdlExtension.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Solution>
<Folder Name="/Properties/">
<File Path="Extension.md" />
<File Path="oneware-extension.json" />
</Folder>
<Project Path="src/OneWare.GhdlExtension/OneWare.GhdlExtension.csproj" />
</Solution>
2 changes: 2 additions & 0 deletions src/OneWare.GhdlExtension/GhdlExtensionModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,14 @@

containerProvider.Resolve<IPackageService>().RegisterPackage(GhdlPackage);

containerProvider.Resolve<ISettingsService>().RegisterTitledFilePath("Simulator", "GHDL", GhdlPathSetting,

Check warning on line 274 in src/OneWare.GhdlExtension/GhdlExtensionModule.cs

View workflow job for this annotation

GitHub Actions / build

'ISettingsService.RegisterTitledFilePath(string, string, string, string, string, string, string?, string?, Func<string, bool>?, params FilePickerFileType[])' is obsolete: 'Use RegisterSetting instead'

Check warning on line 274 in src/OneWare.GhdlExtension/GhdlExtensionModule.cs

View workflow job for this annotation

GitHub Actions / build

'ISettingsService.RegisterTitledFilePath(string, string, string, string, string, string, string?, string?, Func<string, bool>?, params FilePickerFileType[])' is obsolete: 'Use RegisterSetting instead'
"GHDL Path", "Path for GHDL executable", "",
null, containerProvider.Resolve<IPaths>().NativeToolsDirectory, File.Exists);

var ghdlService = containerProvider.Resolve<GhdlService>();
var ghdlToolchainService = containerProvider.Resolve<GhdlToolchainService>();

containerProvider.Resolve<GhdlToolchainService>().SubscribeToSettings();


// containerProvider.Resolve<IWindowService>().RegisterMenuItem("MainWindow_MainMenu/Ghdl",
Expand Down Expand Up @@ -326,7 +328,7 @@
}
});

containerProvider.Resolve<IProjectSettingsService>().AddProjectSetting("GHDL_Libraries", new ListBoxSetting("GHDL libraries", []),

Check warning on line 331 in src/OneWare.GhdlExtension/GhdlExtensionModule.cs

View workflow job for this annotation

GitHub Actions / build

'IProjectSettingsService.AddProjectSetting(string, TitledSetting, Func<IProjectRootWithFile, bool>)' is obsolete: 'Use AddProjectSetting(ProjectSetting projectSetting) instead.'

Check warning on line 331 in src/OneWare.GhdlExtension/GhdlExtensionModule.cs

View workflow job for this annotation

GitHub Actions / build

'IProjectSettingsService.AddProjectSetting(string, TitledSetting, Func<IProjectRootWithFile, bool>)' is obsolete: 'Use AddProjectSetting(ProjectSetting projectSetting) instead.'
file =>
{
if (file is UniversalFpgaProjectRoot root)
Expand Down
1 change: 1 addition & 0 deletions src/OneWare.GhdlExtension/GhdlYosysToolchain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class GhdlYosysToolchain(GhdlToolchainService ghdlToolchainService, Yosys

public void OnProjectCreated(UniversalFpgaProjectRoot project)
{
yosysToolchain.OnProjectCreated(project);
}

public void LoadConnections(UniversalFpgaProjectRoot project, FpgaModel fpga)
Expand Down
10 changes: 7 additions & 3 deletions src/OneWare.GhdlExtension/Services/GhdlToolchainService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ public class GhdlToolchainService
private static string? _val;
private readonly GhdlVhdlToVerilogPreCompileStep _ghdlPreCompiler;
private readonly YosysService _yosysService;
private readonly ISettingsService _settingsService;

public GhdlToolchainService(GhdlVhdlToVerilogPreCompileStep ghdlPreCompiler, YosysService yosysService, ISettingsService settingsService)
{
_ghdlPreCompiler = ghdlPreCompiler;
_yosysService = yosysService;

settingsService.GetSettingObservable<string>("OssCadSuite_Path").Subscribe(x => _val = x);

_settingsService = settingsService;
}


Expand Down Expand Up @@ -67,4 +66,9 @@ public async Task<bool> AssembleAsync(UniversalFpgaProjectRoot project, FpgaMode
{
return await _yosysService.AssembleAsync(project, fpga);
}

public void SubscribeToSettings()
{
_settingsService.GetSettingObservable<string>("OssCadSuite_Path").Subscribe(x => _val = x);
}
}
Loading