Release 1.0.0

Release.md

@@ -1,5 +1,8 @@
 # OneWare.CologneChip
 
+## Release 1.0.0
+- Support OWS 1.x.x
+
 ## Release 0.7.1
 - nextpnr support (OSSCAD Suite needed)
 - Global and project support for changing the toolchain 

oneware-extension.json

@@ -83,6 +83,14 @@
           "target": "all"
         }
       ]
+    },
+    {
+      "version": "1.0.0",
+      "targets": [
+        {
+          "target": "all"
+        }
+      ]
     }
   ]
 }

src/OneWare.CologneChip/CologneChipLoader.cs

@@ -1,18 +1,19 @@
+using Microsoft.Extensions.Logging;
 using OneWare.CologneChip.Services;
 using OneWare.Essentials.Enums;
 using OneWare.Essentials.Services;
 using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Parser;
 using OneWare.UniversalFpgaProjectSystem.Services;
-using Prism.Ioc;
-using ILogger = OneWare.Essentials.Services.ILogger;
 
 namespace OneWare.CologneChip;
 
 public class CologneChipLoader(IChildProcessService childProcessService, ISettingsService settingsService, ILogger logger)
     : IFpgaLoader
 {
-    public string Name => "CologneChip";
+    public string Name => "CologneChip Loader";
+
+    public string Id => "cologneChipLoader";
 
     private enum ProgrammerState
     {
@@ -102,11 +103,11 @@ private ProgrammerState GetProgrammerState(Dictionary<string, string> properties
     public async Task DownloadAsync(UniversalFpgaProjectRoot project)
     {
 
-        var top = project.TopEntity?.Header ?? throw new Exception("TopEntity not set!");
+        var top = project.TopEntity ?? throw new Exception("TopEntity not set!");
         var topName = top.Split(".").First();
         var outputDir = project.FullPath;
 
-        var fpga = project.GetProjectProperty("Fpga");
+        var fpga = project.Properties.GetString("fpga");
         var properties = FpgaSettingsParser.LoadSettings(project, fpga!);
         var useWsl = bool.Parse(properties.GetValueOrDefault(CologneChipConstantService.CologneChipSettingsUseWsl) ?? "false");
 
@@ -117,10 +118,10 @@ public async Task DownloadAsync(UniversalFpgaProjectRoot project)
         switch (toolchain)
         {
             case "p_r": 
-                 bitStreamPath = $"{CologneChipConstantService.Instance.GetBuildPath(project.RelativePath)}{topName}_00.cfg.bit";
+                 bitStreamPath = $"{CologneChipConstantService.GetInstance.GetBuildPath(project.RelativePath)}{topName}_00.cfg.bit";
                 break;
             case "nextpnr":
-                 bitStreamPath = $"{CologneChipConstantService.Instance.GetBuildPath(project.RelativePath)}{topName}.bit";
+                 bitStreamPath = $"{CologneChipConstantService.GetInstance.GetBuildPath(project.RelativePath)}{topName}.bit";
                 break;
         }
 
@@ -166,7 +167,7 @@ public async Task DownloadAsync(UniversalFpgaProjectRoot project)
         if (!useWsl)
         {
             // C:\Users\sebas\OneWareStudio\Packages\NativeTools\colognechip\cc-toolchain-win
-            var execPath = ResolveOpenFPGALoaderPath(project);
+            var execPath = ResolveOpenFpgaLoaderPath(project);
 
             await childProcessService.ExecuteShellAsync(execPath, fpgaArgs,
             outputDir, "Running OpenFPGALoader (Short-Term)...", AppState.Loading, true);
@@ -181,7 +182,7 @@ await childProcessService.ExecuteShellAsync("wsl", args,
         }
     }
 
-    protected virtual string ResolveOpenFPGALoaderPath(UniversalFpgaProjectRoot project)
+    protected virtual string ResolveOpenFpgaLoaderPath(UniversalFpgaProjectRoot project)
     {
         var src = ContainerLocator.Container.Resolve<CcSettingsService>()
             .GetSetting(CologneChipConstantService.YosysSourceSettingsKey, project);

src/OneWare.CologneChip/CologneChipToolchain.cs

@@ -1,18 +1,20 @@
 using System.Text.RegularExpressions;
+using Microsoft.Extensions.Logging;
 using OneWare.CologneChip.Helpers;
 using OneWare.CologneChip.Services;
 using OneWare.Essentials.Services;
 using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Services;
-using Prism.Ioc;
 
 
 namespace OneWare.CologneChip;
 
 public class CologneChipToolchain(CologneChipService cologneChipService) : IFpgaToolchain
 {
 
-    public string Name => "CologneChip";
+    public string Name => "CologneChip Toolchain";
+
+    public string Id => "cologneChipToolchain";
 
     private static string Pattern => @"NET\s+""(?<pinName>[^""]+)""\s+Loc\s+=\s+""(?<pinLocation>[^""]+)""(?:\s*\|\s*(?<constraints>[^;]*))?;";
 
@@ -22,7 +24,7 @@ public void OnProjectCreated(UniversalFpgaProjectRoot project)
         var file = Directory.GetParent(project.ProjectFilePath)?.FullName + @"\" + CologneChipSettingsHelper.GetConstraintFile(project);
 
         File.WriteAllText(file, CologneChipConstantService.CcfTemplate);
-        project.ImportFile(file, false);
+        // project.ImportFile(file, false);
     }
 
     public void LoadConnections(UniversalFpgaProjectRoot project, FpgaModel fpga)

src/OneWare.CologneChip/Helpers/CologneChipSettingsHelper.cs

@@ -2,14 +2,13 @@
 using System.Text.Json.Nodes;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Media;
 using Avalonia.Styling;
 using OneWare.CologneChip.Services;
 using OneWare.Essentials.Models;
+using OneWare.Essentials.Services;
 using OneWare.UniversalFpgaProjectSystem;
 using OneWare.UniversalFpgaProjectSystem.Models;
-using Prism.Ioc;
 
 namespace OneWare.CologneChip.Helpers;
 
@@ -23,7 +22,7 @@
         var test = project.Properties["Include"]?.AsArray()!;
         foreach (var t in test)
         {
             if (t.ToString() == "*.ccf")
                 ccfInclude = false;
         }
 
@@ -72,8 +71,10 @@
 
         var ccfFile = GetConstraintFile(root);
 
-        foreach (var projectFile in root.Files)
+        foreach (var projectFileString in root.GetFiles("*.ccf"))
         {
+            var projectFile = root.GetFile(projectFileString)!;
+            /*
             if (icon != null)
             {
                 projectFile.IconOverlays.Remove(icon);
@@ -83,26 +84,27 @@
                     projectFile.IconOverlays.Add(icon);
                 }
             }
+            */
         }
     }
 
     public static Task UpdateProjectProperties(IProjectFile file)
     {
         if (file.Root is not UniversalFpgaProjectRoot universalFpgaProjectRoot)
             return Task.CompletedTask;
 
         var path = GetConstraintFile(universalFpgaProjectRoot);
-
-        // var icon = Application.Current!.FindResource(ThemeVariant.Dark, "VsImageLib.Test") as IImage;
-
-        foreach (var projectFile in file.Root.Files)
+        
+
+        /*
+        foreach (var projectFile in file.Root.GetFiles("*.ccf"))
         {
             if (icon != null) projectFile.IconOverlays.Remove(icon);
         }
-
+        
         if (icon != null && !file.IconOverlays.Contains(icon))
             file.IconOverlays.Add(icon);
-
+        */
         if (file.RelativePath == path)
             return Task.CompletedTask;
 
@@ -116,7 +118,7 @@
         // Überprüfen, ob Elemente hinzugefügt wurden
         if (e.Action == NotifyCollectionChangedAction.Add)
         {
             foreach (var newItem in e.NewItems)
             {
                 if (newItem is not UniversalFpgaProjectRoot universalFpgaProjectRoot) 
                     continue;

src/OneWare.CologneChip/OneWare.CologneChip.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>0.7.1</Version>
-        <TargetFramework>net9.0</TargetFramework>
+        <Version>1.0.0</Version>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -15,9 +15,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneWare.Essentials" Version="0.11.7" Private="false" ExcludeAssets="runtime;Native" />
-        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.41.8" Private="false" ExcludeAssets="runtime;Native" />
-        <PackageReference Include="OneWare.GhdlExtension" Version="0.11.1" Private="true" ExcludeAssets="runtime;Native"/>
+        <PackageReference Include="OneWare.Essentials" Version="1.0.1" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="1.0.1" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.GhdlExtension" Version="1.0.0" Private="true" ExcludeAssets="runtime;Native"/>
     </ItemGroup>
 
     <Target Name="GenerateCompatibilityFile" AfterTargets="Build">