diff --git a/OneWare.sln b/OneWare.sln index c5c74c16..187dccf9 100644 --- a/OneWare.sln +++ b/OneWare.sln @@ -154,8 +154,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.OssCadSuiteIntegrat EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hardware", "Hardware", "{337B01B1-20B1-4B5B-A3B0-21AEB0729131}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.TangNano9K", "src\OneWare.TangNano9K\OneWare.TangNano9K.csproj", "{EE4DBBEA-32E3-4B73-8345-4F1DD4403E23}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.IceBreaker", "src\OneWare.IceBreaker\OneWare.IceBreaker.csproj", "{18299609-F214-4C4A-9963-FD1BFA07983D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Cyc5000", "src\OneWare.Cyc5000\OneWare.Cyc5000.csproj", "{D49DD06A-344A-4761-B765-E4ED295CEDA6}" @@ -166,8 +164,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Max1000", "src\OneW EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{53C7F88A-3B98-4AB4-992B-71C1F91F1BA7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.IasCameraExtension", "src\OneWare.IasCameraExtension\OneWare.IasCameraExtension.csproj", "{711BAA42-6B56-43E3-8474-E9377BCC102E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Studio.Desktop.UnitTests", "tests\OneWare.Studio.Desktop.UnitTests\OneWare.Studio.Desktop.UnitTests.csproj", "{4503F91D-D8BE-4A9B-AE74-E9AEEC2F67A2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Vcd.Parser.UnitTests", "tests\OneWare.Vcd.Parser.UnitTests\OneWare.Vcd.Parser.UnitTests.csproj", "{3174F07C-F96E-4695-B05D-CE91845CF292}" @@ -178,6 +174,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.WaveFormViewer.Test EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.UniversalFpgaProjectSystem.Tests", "tests\OneWare.UniversalFpgaProjectSystem.Tests\OneWare.UniversalFpgaProjectSystem.Tests.csproj", "{484F3E48-EF14-4801-B896-41BDB67A54E6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.CruviAdapterExtensions", "src\OneWare.CruviAdapterExtensions\OneWare.CruviAdapterExtensions.csproj", "{01BC6288-6AD8-4D70-9360-F84601CCBA56}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -340,10 +338,6 @@ Global {097B858B-7DE2-4328-857D-E19D6D05C53F}.Debug|Any CPU.Build.0 = Debug|Any CPU {097B858B-7DE2-4328-857D-E19D6D05C53F}.Release|Any CPU.ActiveCfg = Release|Any CPU {097B858B-7DE2-4328-857D-E19D6D05C53F}.Release|Any CPU.Build.0 = Release|Any CPU - {EE4DBBEA-32E3-4B73-8345-4F1DD4403E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE4DBBEA-32E3-4B73-8345-4F1DD4403E23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE4DBBEA-32E3-4B73-8345-4F1DD4403E23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE4DBBEA-32E3-4B73-8345-4F1DD4403E23}.Release|Any CPU.Build.0 = Release|Any CPU {18299609-F214-4C4A-9963-FD1BFA07983D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18299609-F214-4C4A-9963-FD1BFA07983D}.Debug|Any CPU.Build.0 = Debug|Any CPU {18299609-F214-4C4A-9963-FD1BFA07983D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -360,10 +354,6 @@ Global {10B805C0-C354-439E-8C3E-6EAB7E5F7CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {10B805C0-C354-439E-8C3E-6EAB7E5F7CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {10B805C0-C354-439E-8C3E-6EAB7E5F7CA6}.Release|Any CPU.Build.0 = Release|Any CPU - {711BAA42-6B56-43E3-8474-E9377BCC102E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {711BAA42-6B56-43E3-8474-E9377BCC102E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {711BAA42-6B56-43E3-8474-E9377BCC102E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {711BAA42-6B56-43E3-8474-E9377BCC102E}.Release|Any CPU.Build.0 = Release|Any CPU {4503F91D-D8BE-4A9B-AE74-E9AEEC2F67A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4503F91D-D8BE-4A9B-AE74-E9AEEC2F67A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {4503F91D-D8BE-4A9B-AE74-E9AEEC2F67A2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -384,6 +374,10 @@ Global {484F3E48-EF14-4801-B896-41BDB67A54E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {484F3E48-EF14-4801-B896-41BDB67A54E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {484F3E48-EF14-4801-B896-41BDB67A54E6}.Release|Any CPU.Build.0 = Release|Any CPU + {01BC6288-6AD8-4D70-9360-F84601CCBA56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01BC6288-6AD8-4D70-9360-F84601CCBA56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01BC6288-6AD8-4D70-9360-F84601CCBA56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01BC6288-6AD8-4D70-9360-F84601CCBA56}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {F08B36E8-AB80-42CD-BD47-6B05E96DA390} = {0761690C-7DA0-4554-9F6B-211088412DCD} @@ -432,17 +426,16 @@ Global {C4281D9E-BB03-4186-BCF6-859CE0A23AFE} = {E1C53C3A-ADE2-469D-B0C6-54ADF37A9FBD} {097B858B-7DE2-4328-857D-E19D6D05C53F} = {C4281D9E-BB03-4186-BCF6-859CE0A23AFE} {337B01B1-20B1-4B5B-A3B0-21AEB0729131} = {E1C53C3A-ADE2-469D-B0C6-54ADF37A9FBD} - {EE4DBBEA-32E3-4B73-8345-4F1DD4403E23} = {337B01B1-20B1-4B5B-A3B0-21AEB0729131} {18299609-F214-4C4A-9963-FD1BFA07983D} = {337B01B1-20B1-4B5B-A3B0-21AEB0729131} {D49DD06A-344A-4761-B765-E4ED295CEDA6} = {337B01B1-20B1-4B5B-A3B0-21AEB0729131} {6B407B1B-003B-47AF-9A19-C23469E8A55C} = {337B01B1-20B1-4B5B-A3B0-21AEB0729131} {10B805C0-C354-439E-8C3E-6EAB7E5F7CA6} = {337B01B1-20B1-4B5B-A3B0-21AEB0729131} {53C7F88A-3B98-4AB4-992B-71C1F91F1BA7} = {337B01B1-20B1-4B5B-A3B0-21AEB0729131} - {711BAA42-6B56-43E3-8474-E9377BCC102E} = {53C7F88A-3B98-4AB4-992B-71C1F91F1BA7} {4503F91D-D8BE-4A9B-AE74-E9AEEC2F67A2} = {EB783E04-C3C8-45F8-B810-24798DAE2450} {3174F07C-F96E-4695-B05D-CE91845CF292} = {EB783E04-C3C8-45F8-B810-24798DAE2450} {8EF6E36F-C63A-4F2A-99CF-8F3AE2A5C946} = {EB783E04-C3C8-45F8-B810-24798DAE2450} {AAC4D6FA-4F94-4616-93B3-3BB47E4A0BB1} = {EB783E04-C3C8-45F8-B810-24798DAE2450} {484F3E48-EF14-4801-B896-41BDB67A54E6} = {EB783E04-C3C8-45F8-B810-24798DAE2450} + {01BC6288-6AD8-4D70-9360-F84601CCBA56} = {53C7F88A-3B98-4AB4-992B-71C1F91F1BA7} EndGlobalSection EndGlobal diff --git a/OneWare.sln.DotSettings b/OneWare.sln.DotSettings index 9b25ace2..57c56dbf 100644 --- a/OneWare.sln.DotSettings +++ b/OneWare.sln.DotSettings @@ -1,5 +1,6 @@  True + True True True diff --git a/build/props/Base.props b/build/props/Base.props index b7fd33f2..be9aca1b 100644 --- a/build/props/Base.props +++ b/build/props/Base.props @@ -1,8 +1,9 @@  - 0.19.2.0 - 0.21.0.0 + 0.20.0.0 + 0.22.0.0 + 0.30.0.0 0.6.0 $(CoreVersion) Hendrik Mennen diff --git a/src/OneWare.ApplicationCommands/Services/ApplicationCommandService.cs b/src/OneWare.ApplicationCommands/Services/ApplicationCommandService.cs index 2e75609b..504b72a4 100644 --- a/src/OneWare.ApplicationCommands/Services/ApplicationCommandService.cs +++ b/src/OneWare.ApplicationCommands/Services/ApplicationCommandService.cs @@ -51,8 +51,6 @@ private void HandleKeyDown(object? sender, KeyEventArgs args) args.Handled = true; return; } - - ; } } } \ No newline at end of file diff --git a/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml b/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml index e15a0f49..84ff430f 100644 --- a/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml +++ b/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml @@ -24,6 +24,7 @@ @@ -38,7 +39,7 @@ Command="{Binding ChangeShortcutCommand}" CommandParameter="{Binding #CommandManagerViewView}" /> - + diff --git a/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml.cs b/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml.cs index 269ba7ef..43a59391 100644 --- a/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml.cs +++ b/src/OneWare.ApplicationCommands/Views/CommandManagerView.axaml.cs @@ -27,6 +27,6 @@ protected override void AttachedToHost() { base.AttachedToHost(); if (Host is { Owner: Window ownerWindow }) - Host.Position = new PixelPoint(Host.Position.X, ownerWindow.Position.Y + 100); + Host.Position = new PixelPoint(Host.Position.X, ownerWindow.Position.Y + 150); } } \ No newline at end of file diff --git a/src/OneWare.Core/App.axaml.cs b/src/OneWare.Core/App.axaml.cs index a995d84d..cbf84d23 100644 --- a/src/OneWare.Core/App.axaml.cs +++ b/src/OneWare.Core/App.axaml.cs @@ -16,6 +16,7 @@ using OneWare.Core.Views.Windows; using OneWare.Debugger; using OneWare.ErrorList; +using OneWare.Essentials.Commands; using OneWare.Essentials.Helpers; using OneWare.Essentials.LanguageService; using OneWare.Essentials.Services; @@ -251,6 +252,16 @@ protected override AvaloniaObject CreateShell() IconObservable = Current!.GetResourceObservable("VsImageLib.SaveAll16X") }); + var applicationCommandService = Container.Resolve(); + + applicationCommandService.RegisterCommand(new SimpleApplicationCommand("Active light theme", + () => settingsService.SetSettingValue("General_SelectedTheme", "Light"), + () => settingsService.GetSettingValue("General_SelectedTheme") != "Light")); + + applicationCommandService.RegisterCommand(new SimpleApplicationCommand("Active dark theme", + () => settingsService.SetSettingValue("General_SelectedTheme", "Dark"), + () => settingsService.GetSettingValue("General_SelectedTheme") != "Dark")); + //AvaloniaEdit Hyperlink support VisualLineLinkText.OpenUriEvent.AddClassHandler((window, args) => { @@ -305,7 +316,7 @@ public override void OnFrameworkInitializationCompleted() MaxItems = 3 }; } - + Container.Resolve().LoadKeyConfiguration(); Container.Resolve().GetSettingObservable("General_SelectedTheme").Subscribe(x => diff --git a/src/OneWare.Core/Styles/Accents/Base.axaml b/src/OneWare.Core/Styles/Accents/Base.axaml index d9016acf..fdc22209 100644 --- a/src/OneWare.Core/Styles/Accents/Base.axaml +++ b/src/OneWare.Core/Styles/Accents/Base.axaml @@ -68,7 +68,7 @@ #606e6e6e #30808080 - + @@ -163,9 +163,18 @@ + + + + + + + + + @@ -216,6 +225,14 @@ + + + + + + + + diff --git a/src/OneWare.Core/Styles/Menu.axaml b/src/OneWare.Core/Styles/Menu.axaml index 2ba539f4..eef03f32 100644 --- a/src/OneWare.Core/Styles/Menu.axaml +++ b/src/OneWare.Core/Styles/Menu.axaml @@ -43,7 +43,7 @@ - @@ -58,7 +58,7 @@ - @@ -83,7 +83,7 @@ - - + \ No newline at end of file diff --git a/src/OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter/extension.json b/src/OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter/extension.json new file mode 100644 index 00000000..6365adc6 --- /dev/null +++ b/src/OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter/extension.json @@ -0,0 +1,76 @@ +{ + "pins": [ + { + "name": "1", + "interfacePin": "LS_1" + }, + { + "name": "2", + "interfacePin": "LS_2" + }, + { + "name": "3", + "interfacePin": "LS_3" + }, + { + "name": "4", + "interfacePin": "LS_4" + }, + { + "name": "5", + "interfacePin": "LS_5" + }, + { + "name": "6", + "interfacePin": "LS_6" + }, + { + "name": "7", + "interfacePin": "LS_7" + }, + { + "name": "8", + "interfacePin": "LS_8" + } + ], + "interfaces": [ + { + "name": "PMOD_1", + "connector": "PMOD", + "pins": [ + { + "name": "1", + "pin": "1" + }, + { + "name": "2", + "pin": "2" + }, + { + "name": "3", + "pin": "3" + }, + { + "name": "4", + "pin": "4" + }, + { + "name": "5", + "pin": "5" + }, + { + "name": "6", + "pin": "6" + }, + { + "name": "7", + "pin": "7" + }, + { + "name": "8", + "pin": "8" + } + ] + } + ] +} diff --git a/src/OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter/gui.json b/src/OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter/gui.json new file mode 100644 index 00000000..bcb98bf2 --- /dev/null +++ b/src/OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter/gui.json @@ -0,0 +1,32 @@ +{ + "width": 88, + "height": 152, + "offset": "0 -80 0 0", + "elements": [ + { + "type": "rect", + "x": 0, + "y": 20, + "width": 88, + "height": 132, + "color": "#096845", + "cornerRadius": "3", + "boxShadow": "0 0 5 5 #77000000" + }, + { + "type": "pmod", + "x": 14, + "y": 0, + "bind": "PMOD_1" + }, + { + "type": "rect", + "x": 0, + "y": 80, + "width": 88, + "height": 50, + "textColor": "white", + "text": "PMOD\n↑\nCRUVI_LS" + } + ] +} diff --git a/src/OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter/extension.json b/src/OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter/extension.json new file mode 100644 index 00000000..9e06b185 --- /dev/null +++ b/src/OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter/extension.json @@ -0,0 +1,76 @@ +{ + "pins": [ + { + "name": "LS_1", + "interfacePin": "1" + }, + { + "name": "LS_2", + "interfacePin": "2" + }, + { + "name": "LS_3", + "interfacePin": "3" + }, + { + "name": "LS_4", + "interfacePin": "4" + }, + { + "name": "LS_5", + "interfacePin": "5" + }, + { + "name": "LS_6", + "interfacePin": "6" + }, + { + "name": "LS_7", + "interfacePin": "7" + }, + { + "name": "LS_8", + "interfacePin": "8" + } + ], + "interfaces": [ + { + "name": "CRUVI_LS_1", + "connector": "CRUVI_LS", + "pins": [ + { + "name": "LS_1", + "pin": "LS_1" + }, + { + "name": "LS_2", + "pin": "LS_2" + }, + { + "name": "LS_3", + "pin": "LS_3" + }, + { + "name": "LS_4", + "pin": "LS_4" + }, + { + "name": "LS_5", + "pin": "LS_5" + }, + { + "name": "LS_6", + "pin": "LS_6" + }, + { + "name": "LS_7", + "pin": "LS_7" + }, + { + "name": "LS_8", + "pin": "LS_8" + } + ] + } + ] +} diff --git a/src/OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter/gui.json b/src/OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter/gui.json new file mode 100644 index 00000000..966c0990 --- /dev/null +++ b/src/OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter/gui.json @@ -0,0 +1,32 @@ +{ + "width": 88, + "height": 132, + "offset": "0 -60 0 0", + "elements": [ + { + "type": "rect", + "x": 0, + "y": 0, + "width": 88, + "height": 132, + "color": "#096845", + "cornerRadius": "3", + "boxShadow": "0 0 5 5 #77000000" + }, + { + "type": "cruvi_ls", + "x": 19, + "y": 0, + "bind": "CRUVI_LS_1" + }, + { + "type": "rect", + "x": 0, + "y": 60, + "width": 88, + "height": 50, + "textColor": "white", + "text": "CRUVI_LS\n↑\nPMOD" + } + ] +} diff --git a/src/OneWare.CruviAdapterExtensions/CruviAdapterExtensionsModule.cs b/src/OneWare.CruviAdapterExtensions/CruviAdapterExtensionsModule.cs new file mode 100644 index 00000000..f853bcf2 --- /dev/null +++ b/src/OneWare.CruviAdapterExtensions/CruviAdapterExtensionsModule.cs @@ -0,0 +1,19 @@ +using OneWare.UniversalFpgaProjectSystem.Fpga; +using OneWare.UniversalFpgaProjectSystem.Services; +using Prism.Ioc; +using Prism.Modularity; + +namespace OneWare.CruviAdapterExtensions; + +public class CruviAdapterExtensionsModule : IModule +{ + public void RegisterTypes(IContainerRegistry containerRegistry) + { + } + + public void OnInitialized(IContainerProvider containerProvider) + { + containerProvider.Resolve().RegisterFpgaExtensionPackage(new GenericFpgaExtensionPackage("CRUVI_LS to PMOD Adapter", "CRUVI_LS", "avares://OneWare.CruviAdapterExtensions/Assets/CRUVI_LS/CRUVI_LS to PMOD Adapter")); + containerProvider.Resolve().RegisterFpgaExtensionPackage(new GenericFpgaExtensionPackage("PMOD to CRUVI_LS Adapter", "PMOD", "avares://OneWare.CruviAdapterExtensions/Assets/PMOD/PMOD to CRUVI_LS Adapter")); + } +} \ No newline at end of file diff --git a/src/OneWare.IasCameraExtension/OneWare.IasCameraExtension.csproj b/src/OneWare.CruviAdapterExtensions/OneWare.CruviAdapterExtensions.csproj similarity index 100% rename from src/OneWare.IasCameraExtension/OneWare.IasCameraExtension.csproj rename to src/OneWare.CruviAdapterExtensions/OneWare.CruviAdapterExtensions.csproj diff --git a/src/OneWare.Cyc5000/Assets/Cyc5000.json b/src/OneWare.Cyc5000/Assets/Cyc5000.json index 4bc65f18..10feece4 100644 --- a/src/OneWare.Cyc5000/Assets/Cyc5000.json +++ b/src/OneWare.Cyc5000/Assets/Cyc5000.json @@ -1,962 +1,961 @@ { - "Name": "CYC5000", - "Properties": { - "QuartusToolchain_Family": "Cyclone V", - "QuartusToolchain_Device": "5CEBA2U15C8", - "QuartusProgrammer_ShortTerm_Mode": "JTAG", - "QuartusProgrammer_ShortTerm_Operation": "P", - "QuartusProgrammer_LongTerm_Mode": "JTAG", - "QuartusProgrammer_LongTerm_Format": "JIC", - "QuartusProgrammer_LongTerm_CpfArguments": "-s 5CEBA2 --device EPCQ64A -m ASx4", - "QuartusProgrammer_LongTerm_Operation": "IPV" + "properties": { + "quartusToolchainFamily": "Cyclone V", + "quartusToolchainDevice": "5CEBA2U15C8", + "quartusProgrammerShortTermMode": "JTAG", + "quartusProgrammerShortTermOperation": "P", + "quartusProgrammerLongTermMode": "JTAG", + "quartusProgrammerLongTermFormat": "JIC", + "quartusProgrammerLongTermCpfArguments": "-s 5CEBA2 --device EPCQ64A -m ASx4", + "quartusProgrammerLongTermOperation": "IPV" }, - "Pins": [ + "pins": [ { - "Description": "CLK", - "Name": "F14" + "description": "CLK", + "name": "F14" }, { - "Description": "LED", - "Name": "P4" + "description": "LED", + "name": "P4" }, { - "Description": "LED", - "Name": "M4" + "description": "LED", + "name": "M4" }, { - "Description": "LED", - "Name": "M3" + "description": "LED", + "name": "M3" }, { - "Description": "LED", - "Name": "N3" + "description": "LED", + "name": "N3" }, { - "Description": "LED", - "Name": "V2" + "description": "LED", + "name": "V2" }, { - "Description": "LED", - "Name": "T2" + "description": "LED", + "name": "T2" }, { - "Description": "LED", - "Name": "L1" + "description": "LED", + "name": "L1" }, { - "Description": "LED", - "Name": "K1" + "description": "LED", + "name": "K1" }, { - "Description": "Button", - "Name": "L17" + "description": "Button", + "name": "L17" }, { - "Description": "USB TX", - "Name": "E18" + "description": "USB TX", + "name": "E18" }, { - "Description": "USB RX", - "Name": "F16" + "description": "USB RX", + "name": "F16" }, { - "Description": "USB BD2", - "Name": "H17" + "description": "USB BD2", + "name": "H17" }, { - "Description": "USB BD3", - "Name": "H16" + "description": "USB BD3", + "name": "H16" }, { - "Description": "USB BD4", - "Name": "J16" + "description": "USB BD4", + "name": "J16" }, { - "Description": "USB BD5", - "Name": "G15" + "description": "USB BD5", + "name": "G15" }, { - "Description": "USB BD6", - "Name": "J14" + "description": "USB BD6", + "name": "J14" }, { - "Description": "USB BD7", - "Name": "L15" + "description": "USB BD7", + "name": "L15" }, { - "Description": "USB BC0", - "Name": "G13" + "description": "USB BC0", + "name": "G13" }, { - "Description": "USB BC1", - "Name": "H13" + "description": "USB BC1", + "name": "H13" }, { - "Description": "USB BC2", - "Name": "J15" + "description": "USB BC2", + "name": "J15" }, { - "Description": "USB BC3", - "Name": "J13" + "description": "USB BC3", + "name": "J13" }, { - "Description": "USB BC4", - "Name": "K16" + "description": "USB BC4", + "name": "K16" }, { - "Description": "USB BC5", - "Name": "K18" + "description": "USB BC5", + "name": "K18" }, { - "Description": "USB BC6", - "Name": "K17" + "description": "USB BC6", + "name": "K17" }, { - "Description": "USB BC7", - "Name": "L16" + "description": "USB BC7", + "name": "L16" }, { - "Description": "CRUVI HS SMB_ALERT", - "Name": "G17" + "description": "CRUVI HS SMB_ALERT", + "name": "G17" }, { - "Description": "CRUVI HS SMB_SDA", - "Name": "H18" + "description": "CRUVI HS SMB_SDA", + "name": "H18" }, { - "Description": "CRUVI HS SMB_SCL", - "Name": "F17" + "description": "CRUVI HS SMB_SCL", + "name": "F17" }, { - "Description": "CRUVI HS REFCLK", - "Name": "G14" + "description": "CRUVI HS REFCLK", + "name": "G14" }, { - "Description": "CRUVI HS HSMIO", - "Name": "C16" + "description": "CRUVI HS HSMIO", + "name": "C16" }, { - "Description": "CRUVI HS HSO", - "Name": "B14" + "description": "CRUVI HS HSO", + "name": "B14" }, { - "Description": "CRUVI HS HSRST", - "Name": "B15" + "description": "CRUVI HS HSRST", + "name": "B15" }, { - "Description": "CRUVI HS HSI", - "Name": "D16" + "description": "CRUVI HS HSI", + "name": "D16" }, { - "Description": "CRUVI HS Low Speed I/Os", - "Name": "F4" + "description": "CRUVI HS Low Speed I/Os", + "name": "F4" }, { - "Description": "CRUVI HS Low Speed I/Os", - "Name": "J3" + "description": "CRUVI HS Low Speed I/Os", + "name": "J3" }, { - "Description": "CRUVI HS Low Speed I/Os", - "Name": "E3" + "description": "CRUVI HS Low Speed I/Os", + "name": "E3" }, { - "Description": "CRUVI HS Low Speed I/Os", - "Name": "J4" + "description": "CRUVI HS Low Speed I/Os", + "name": "J4" }, { - "Description": "CRUVI HS Low Speed I/Os", - "Name": "E2" + "description": "CRUVI HS Low Speed I/Os", + "name": "E2" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B17" + "description": "CRUVI HS Differential I/Os", + "name": "B17" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B18" + "description": "CRUVI HS Differential I/Os", + "name": "B18" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A7" + "description": "CRUVI HS Differential I/Os", + "name": "A7" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A6" + "description": "CRUVI HS Differential I/Os", + "name": "A6" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "C13" + "description": "CRUVI HS Differential I/Os", + "name": "C13" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "C12" + "description": "CRUVI HS Differential I/Os", + "name": "C12" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "E8" + "description": "CRUVI HS Differential I/Os", + "name": "E8" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "F7" + "description": "CRUVI HS Differential I/Os", + "name": "F7" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "G6" + "description": "CRUVI HS Differential I/Os", + "name": "G6" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "F6" + "description": "CRUVI HS Differential I/Os", + "name": "F6" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B4" + "description": "CRUVI HS Differential I/Os", + "name": "B4" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B5" + "description": "CRUVI HS Differential I/Os", + "name": "B5" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A12" + "description": "CRUVI HS Differential I/Os", + "name": "A12" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B12" + "description": "CRUVI HS Differential I/Os", + "name": "B12" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A11" + "description": "CRUVI HS Differential I/Os", + "name": "A11" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A10" + "description": "CRUVI HS Differential I/Os", + "name": "A10" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A14" + "description": "CRUVI HS Differential I/Os", + "name": "A14" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A15" + "description": "CRUVI HS Differential I/Os", + "name": "A15" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A16" + "description": "CRUVI HS Differential I/Os", + "name": "A16" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "A17" + "description": "CRUVI HS Differential I/Os", + "name": "A17" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "F9" + "description": "CRUVI HS Differential I/Os", + "name": "F9" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "F10" + "description": "CRUVI HS Differential I/Os", + "name": "F10" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B7" + "description": "CRUVI HS Differential I/Os", + "name": "B7" }, { - "Description": "CRUVI HS Differential I/Os", - "Name": "B8" + "description": "CRUVI HS Differential I/Os", + "name": "B8" }, { - "Description": "VSEL", - "Name": "N10" + "description": "VSEL", + "name": "N10" }, { - "Description": "Low Speed I/Os", - "Name": "V17" + "description": "Low Speed I/Os", + "name": "V17" }, { - "Description": "Low Speed I/Os", - "Name": "U17" + "description": "Low Speed I/Os", + "name": "U17" }, { - "Description": "Low Speed I/Os", - "Name": "T17" + "description": "Low Speed I/Os", + "name": "T17" }, { - "Description": "Low Speed I/Os", - "Name": "U18" + "description": "Low Speed I/Os", + "name": "U18" }, { - "Description": "Low Speed I/Os", - "Name": "R17" + "description": "Low Speed I/Os", + "name": "R17" }, { - "Description": "Low Speed I/Os", - "Name": "R18" + "description": "Low Speed I/Os", + "name": "R18" }, { - "Description": "Low Speed I/Os", - "Name": "P18" + "description": "Low Speed I/Os", + "name": "P18" }, { - "Description": "Low Speed I/Os", - "Name": "N17" + "description": "Low Speed I/Os", + "name": "N17" }, { - "Description": "Low Speed I/Os", - "Name": "N18" + "description": "Low Speed I/Os", + "name": "N18" }, { - "Description": "Low Speed I/Os", - "Name": "M18" + "description": "Low Speed I/Os", + "name": "M18" }, { - "Description": "Low Speed I/Os", - "Name": "J18" + "description": "Low Speed I/Os", + "name": "J18" }, { - "Description": "Low Speed I/Os", - "Name": "G18" + "description": "Low Speed I/Os", + "name": "G18" }, { - "Description": "Low Speed I/Os", - "Name": "D18" + "description": "Low Speed I/Os", + "name": "D18" }, { - "Description": "Low Speed I/Os", - "Name": "C18" + "description": "Low Speed I/Os", + "name": "C18" }, { - "Description": "Low Speed I/Os", - "Name": "T1" + "description": "Low Speed I/Os", + "name": "T1" }, { - "Description": "Low Speed I/Os", - "Name": "R2" + "description": "Low Speed I/Os", + "name": "R2" }, { - "Description": "Low Speed I/Os", - "Name": "R1" + "description": "Low Speed I/Os", + "name": "R1" }, { - "Description": "Low Speed I/Os", - "Name": "N2" + "description": "Low Speed I/Os", + "name": "N2" }, { - "Description": "Low Speed I/Os", - "Name": "L2" + "description": "Low Speed I/Os", + "name": "L2" }, { - "Description": "Low Speed I/Os", - "Name": "J1" + "description": "Low Speed I/Os", + "name": "J1" }, { - "Description": "Low Speed I/Os", - "Name": "F1" + "description": "Low Speed I/Os", + "name": "F1" }, { - "Description": "Low Speed I/Os", - "Name": "E1" + "description": "Low Speed I/Os", + "name": "E1" }, { - "Description": "Low Speed I/Os", - "Name": "D1" + "description": "Low Speed I/Os", + "name": "D1" }, { - "Description": "Low Speed I/Os", - "Name": "M2" + "description": "Low Speed I/Os", + "name": "M2" }, { - "Description": "Low Speed I/Os", - "Name": "P1" + "description": "Low Speed I/Os", + "name": "P1" }, { - "Description": "SPI Flash", - "Name": "P3" + "description": "SPI Flash", + "name": "P3" }, { - "Description": "SPI Flash", - "Name": "K6" + "description": "SPI Flash", + "name": "K6" }, { - "Description": "SPI Flash", - "Name": "V1" + "description": "SPI Flash", + "name": "V1" }, { - "Description": "SPI Flash", - "Name": "U2" + "description": "SPI Flash", + "name": "U2" }, { - "Description": "SPI Flash", - "Name": "U3" + "description": "SPI Flash", + "name": "U3" }, { - "Description": "SPI Flash", - "Name": "M5" + "description": "SPI Flash", + "name": "M5" }, { - "Description": "SDRAM Address", - "Name": "R13" + "description": "SDRAM Address", + "name": "R13" }, { - "Description": "SDRAM Address", - "Name": "U12" + "description": "SDRAM Address", + "name": "U12" }, { - "Description": "SDRAM Address", - "Name": "V12" + "description": "SDRAM Address", + "name": "V12" }, { - "Description": "SDRAM Address", - "Name": "V13" + "description": "SDRAM Address", + "name": "V13" }, { - "Description": "SDRAM Address", - "Name": "V15" + "description": "SDRAM Address", + "name": "V15" }, { - "Description": "SDRAM Address", - "Name": "V16" + "description": "SDRAM Address", + "name": "V16" }, { - "Description": "SDRAM Address", - "Name": "T16" + "description": "SDRAM Address", + "name": "T16" }, { - "Description": "SDRAM Address", - "Name": "U15" + "description": "SDRAM Address", + "name": "U15" }, { - "Description": "SDRAM Address", - "Name": "P14" + "description": "SDRAM Address", + "name": "P14" }, { - "Description": "SDRAM Address", - "Name": "T15" + "description": "SDRAM Address", + "name": "T15" }, { - "Description": "SDRAM Address", - "Name": "M13" + "description": "SDRAM Address", + "name": "M13" }, { - "Description": "SDRAM Address", - "Name": "P15" + "description": "SDRAM Address", + "name": "P15" }, { - "Description": "SDRAM Address", - "Name": "N16" + "description": "SDRAM Address", + "name": "N16" }, { - "Description": "SDRAM Address", - "Name": "R16," + "description": "SDRAM Address", + "name": "R16" }, { - "Description": "SDRAM Bank Select", - "Name": "T12" + "description": "SDRAM Bank Select", + "name": "T12" }, { - "Description": "SDRAM Bank Select", - "Name": "N13" + "description": "SDRAM Bank Select", + "name": "N13" }, { - "Description": "SDRAM Data", - "Name": "U4" + "description": "SDRAM Data", + "name": "U4" }, { - "Description": "SDRAM Data", - "Name": "T4" + "description": "SDRAM Data", + "name": "T4" }, { - "Description": "SDRAM Data", - "Name": "V6" + "description": "SDRAM Data", + "name": "V6" }, { - "Description": "SDRAM Data", - "Name": "U5" + "description": "SDRAM Data", + "name": "U5" }, { - "Description": "SDRAM Data", - "Name": "V7" + "description": "SDRAM Data", + "name": "V7" }, { - "Description": "SDRAM Data", - "Name": "T5" + "description": "SDRAM Data", + "name": "T5" }, { - "Description": "SDRAM Data", - "Name": "V8" + "description": "SDRAM Data", + "name": "V8" }, { - "Description": "SDRAM Data", - "Name": "U8" + "description": "SDRAM Data", + "name": "U8" }, { - "Description": "SDRAM Data", - "Name": "P10" + "description": "SDRAM Data", + "name": "P10" }, { - "Description": "SDRAM Data", - "Name": "P9" + "description": "SDRAM Data", + "name": "P9" }, { - "Description": "SDRAM Data", - "Name": "T11" + "description": "SDRAM Data", + "name": "T11" }, { - "Description": "SDRAM Data", - "Name": "R9" + "description": "SDRAM Data", + "name": "R9" }, { - "Description": "SDRAM Data", - "Name": "R11" + "description": "SDRAM Data", + "name": "R11" }, { - "Description": "SDRAM Data", - "Name": "T9" + "description": "SDRAM Data", + "name": "T9" }, { - "Description": "SDRAM Data", - "Name": "V10" + "description": "SDRAM Data", + "name": "V10" }, { - "Description": "SDRAM Data", - "Name": "U9" + "description": "SDRAM Data", + "name": "U9" }, { - "Description": "SDRAM I/O Mask", - "Name": "U13" + "description": "SDRAM I/O Mask", + "name": "U13" }, { - "Description": "SDRAM I/O Mask", - "Name": "U14" + "description": "SDRAM I/O Mask", + "name": "U14" }, { - "Description": "SDRAM Row Address Strobe", - "Name": "P13" + "description": "SDRAM Row Address Strobe", + "name": "P13" }, { - "Description": "SDRAM Column Address Strobe", - "Name": "M14" + "description": "SDRAM Column Address Strobe", + "name": "M14" }, { - "Description": "SDRAM Write Enable", - "Name": "N12" + "description": "SDRAM Write Enable", + "name": "N12" }, { - "Description": "SDRAM Clock", - "Name": "P16" + "description": "SDRAM Clock", + "name": "P16" }, { - "Description": "SDRAM Clock Enable", - "Name": "T14" + "description": "SDRAM Clock Enable", + "name": "T14" }, { - "Description": "SDRAM Chip Select", - "Name": "L13" + "description": "SDRAM Chip Select", + "name": "L13" } ], - "Interfaces": [ + "interfaces": [ { - "Name": "CRUVIHS_1", - "Connector": "CruviHS", - "Pins": [ + "name": "CRUVI_HS_1", + "connector": "CRUVI_HS", + "pins": [ { - "Name": "HS_Dif_1", - "Pin": "B17" + "name": "HS_Dif_1", + "pin": "B17" }, { - "Name": "HS_Dif_2", - "Pin": "B18" + "name": "HS_Dif_2", + "pin": "B18" }, { - "Name": "HS_Dif_3", - "Pin": "A7" + "name": "HS_Dif_3", + "pin": "A7" }, { - "Name": "HS_Dif_4", - "Pin": "A6" + "name": "HS_Dif_4", + "pin": "A6" }, { - "Name": "HS_Dif_5", - "Pin": "C13" + "name": "HS_Dif_5", + "pin": "C13" }, { - "Name": "HS_Dif_6", - "Pin": "C12" + "name": "HS_Dif_6", + "pin": "C12" }, { - "Name": "HS_Dif_7", - "Pin": "E8" + "name": "HS_Dif_7", + "pin": "E8" }, { - "Name": "HS_Dif_8", - "Pin": "F7" + "name": "HS_Dif_8", + "pin": "F7" }, { - "Name": "HS_Dif_9", - "Pin": "G6" + "name": "HS_Dif_9", + "pin": "G6" }, { - "Name": "HS_Dif_10", - "Pin": "F6" + "name": "HS_Dif_10", + "pin": "F6" }, { - "Name": "HS_Dif_11", - "Pin": "B4" + "name": "HS_Dif_11", + "pin": "B4" }, { - "Name": "HS_Dif_12", - "Pin": "B5" + "name": "HS_Dif_12", + "pin": "B5" }, { - "Name": "HS_Dif_13", - "Pin": "A12" + "name": "HS_Dif_13", + "pin": "A12" }, { - "Name": "HS_Dif_14", - "Pin": "B12" + "name": "HS_Dif_14", + "pin": "B12" }, { - "Name": "HS_Dif_15", - "Pin": "A11" + "name": "HS_Dif_15", + "pin": "A11" }, { - "Name": "HS_Dif_16", - "Pin": "A10" + "name": "HS_Dif_16", + "pin": "A10" }, { - "Name": "HS_Dif_17", - "Pin": "A14" + "name": "HS_Dif_17", + "pin": "A14" }, { - "Name": "HS_Dif_18", - "Pin": "A15" + "name": "HS_Dif_18", + "pin": "A15" }, { - "Name": "HS_Dif_19", - "Pin": "A16" + "name": "HS_Dif_19", + "pin": "A16" }, { - "Name": "HS_Dif_20", - "Pin": "A17" + "name": "HS_Dif_20", + "pin": "A17" }, { - "Name": "HS_Dif_21", - "Pin": "F9" + "name": "HS_Dif_21", + "pin": "F9" }, { - "Name": "HS_Dif_22", - "Pin": "F10" + "name": "HS_Dif_22", + "pin": "F10" }, { - "Name": "HS_Dif_23", - "Pin": "B7" + "name": "HS_Dif_23", + "pin": "B7" }, { - "Name": "HS_Dif_24", - "Pin": "B8" + "name": "HS_Dif_24", + "pin": "B8" }, { - "Name": "HS_Ale", - "Pin": "G17" + "name": "HS_Ale", + "pin": "G17" }, { - "Name": "HS_SDA", - "Pin": "H18" + "name": "HS_SDA", + "pin": "H18" }, { - "Name": "HS_SCL", - "Pin": "F17" + "name": "HS_SCL", + "pin": "F17" }, { - "Name": "HS_Ref", - "Pin": "G14" + "name": "HS_Ref", + "pin": "G14" }, { - "Name": "HS_HSM", - "Pin": "C16" + "name": "HS_HSM", + "pin": "C16" }, { - "Name": "HS_HSO", - "Pin": "B14" + "name": "HS_HSO", + "pin": "B14" }, { - "Name": "HS_HSR", - "Pin": "B15" + "name": "HS_HSR", + "pin": "B15" }, { - "Name": "HS_HSI", - "Pin": "D16" + "name": "HS_HSI", + "pin": "D16" }, { - "Name": "HS_LOW_,1", - "Pin": "F4" + "name": "HS_LOW_,1", + "pin": "F4" }, { - "Name": "HS_LOW_2", - "Pin": "J3" + "name": "HS_LOW_2", + "pin": "J3" }, { - "Name": "HS_LOW_3", - "Pin": "E3" + "name": "HS_LOW_3", + "pin": "E3" }, { - "Name": "HS_LOW_4", - "Pin": "J4" + "name": "HS_LOW_4", + "pin": "J4" }, { - "Name": "HS_LOW_5", - "Pin": "E2" + "name": "HS_LOW_5", + "pin": "E2" } ] }, { - "Name": "UART", - "Pins": [ + "name": "UART", + "pins": [ { - "Name": "TXD", - "Pin": "E18" + "name": "TXD", + "pin": "E18" }, { - "Name": "RXD", - "Pin": "F16" + "name": "RXD", + "pin": "F16" } ] }, { - "Name": "SDRAM", - "Pins": [ + "name": "SDRAM", + "pins": [ { - "Name": "ADD_1", - "Pin": "R13" + "name": "ADD_1", + "pin": "R13" }, { - "Name": "ADD_2", - "Pin": "U12" + "name": "ADD_2", + "pin": "U12" }, { - "Name": "ADD_3", - "Pin": "V12" + "name": "ADD_3", + "pin": "V12" }, { - "Name": "ADD_4", - "Pin": "V13" + "name": "ADD_4", + "pin": "V13" }, { - "Name": "ADD_5", - "Pin": "V15" + "name": "ADD_5", + "pin": "V15" }, { - "Name": "ADD_6", - "Pin": "V16" + "name": "ADD_6", + "pin": "V16" }, { - "Name": "ADD_7", - "Pin": "T16" + "name": "ADD_7", + "pin": "T16" }, { - "Name": "ADD_8", - "Pin": "U15" + "name": "ADD_8", + "pin": "U15" }, { - "Name": "ADD_9", - "Pin": "P14" + "name": "ADD_9", + "pin": "P14" }, { - "Name": "ADD_10", - "Pin": "T15" + "name": "ADD_10", + "pin": "T15" }, { - "Name": "ADD_11", - "Pin": "M13" + "name": "ADD_11", + "pin": "M13" }, { - "Name": "ADD_12", - "Pin": "P15" + "name": "ADD_12", + "pin": "P15" }, { - "Name": "ADD_13", - "Pin": "N16" + "name": "ADD_13", + "pin": "N16" }, { - "Name": "ADD_14", - "Pin": "R16" + "name": "ADD_14", + "pin": "R16" }, { - "Name": "BAN_1", - "Pin": "T12" + "name": "BAN_1", + "pin": "T12" }, { - "Name": "BAN_2", - "Pin": "N13" + "name": "BAN_2", + "pin": "N13" }, { - "Name": "DAT_1", - "Pin": "U4" + "name": "DAT_1", + "pin": "U4" }, { - "Name": "DAT_2", - "Pin": "T4" + "name": "DAT_2", + "pin": "T4" }, { - "Name": "DAT_3", - "Pin": "V6" + "name": "DAT_3", + "pin": "V6" }, { - "Name": "DAT_4", - "Pin": "U5" + "name": "DAT_4", + "pin": "U5" }, { - "Name": "DAT_5", - "Pin": "V7" + "name": "DAT_5", + "pin": "V7" }, { - "Name": "DAT_6", - "Pin": "T5" + "name": "DAT_6", + "pin": "T5" }, { - "Name": "DAT_7", - "Pin": "V8" + "name": "DAT_7", + "pin": "V8" }, { - "Name": "DAT_8", - "Pin": "U8" + "name": "DAT_8", + "pin": "U8" }, { - "Name": "DAT_9", - "Pin": "P10" + "name": "DAT_9", + "pin": "P10" }, { - "Name": "DAT_10", - "Pin": "P9" + "name": "DAT_10", + "pin": "P9" }, { - "Name": "DAT_11", - "Pin": "T11" + "name": "DAT_11", + "pin": "T11" }, { - "Name": "DAT_12", - "Pin": "R9" + "name": "DAT_12", + "pin": "R9" }, { - "Name": "DAT_13", - "Pin": "R11" + "name": "DAT_13", + "pin": "R11" }, { - "Name": "DAT_14", - "Pin": "T9" + "name": "DAT_14", + "pin": "T9" }, { - "Name": "DAT_15", - "Pin": "V10" + "name": "DAT_15", + "pin": "V10" }, { - "Name": "DAT_16", - "Pin": "U9" + "name": "DAT_16", + "pin": "U9" }, { - "Name": "DQM_1", - "Pin": "U13" + "name": "DQM_1", + "pin": "U13" }, { - "Name": "DQM_2", - "Pin": "U14" + "name": "DQM_2", + "pin": "U14" }, { - "Name": "RAS", - "Pin": "P13" + "name": "RAS", + "pin": "P13" }, { - "Name": "CAS", - "Pin": "M14" + "name": "CAS", + "pin": "M14" }, { - "Name": "WEN", - "Pin": "N12" + "name": "WEN", + "pin": "N12" }, { - "Name": "ClK", - "Pin": "P16" + "name": "clk", + "pin": "P16" }, { - "Name": "CKE", - "Pin": "T14" + "name": "CKE", + "pin": "T14" }, { - "Name": "CSE", - "Pin": "L13" + "name": "CSE", + "pin": "L13" } ] }, { - "Name": "FLASH", - "Pins": [ + "name": "FLASH", + "pins": [ { - "Name": "1", - "Pin": "K6" + "name": "1", + "pin": "K6" }, { - "Name": "2", - "Pin": "U2" + "name": "2", + "pin": "U2" }, { - "Name": "3", - "Pin": "V1" + "name": "3", + "pin": "V1" }, { - "Name": "4", - "Pin": "P3" + "name": "4", + "pin": "P3" }, { - "Name": "5", - "Pin": "U3" + "name": "5", + "pin": "U3" }, { - "Name": "6", - "Pin": "M5" + "name": "6", + "pin": "M5" } ] }, { - "Name": "LED", - "Pins": [ + "name": "LED", + "pins": [ { - "Name": "1", - "Pin": "P4" + "name": "1", + "pin": "P4" }, { - "Name": "2", - "Pin": "M4" + "name": "2", + "pin": "M4" }, { - "Name": "3", - "Pin": "M3" + "name": "3", + "pin": "M3" }, { - "Name": "4", - "Pin": "N3" + "name": "4", + "pin": "N3" }, { - "Name": "5", - "Pin": "V2" + "name": "5", + "pin": "V2" }, { - "Name": "6", - "Pin": "T2" + "name": "6", + "pin": "T2" }, { - "Name": "7", - "Pin": "L1" + "name": "7", + "pin": "L1" }, { - "Name": "8", - "Pin": "K1" + "name": "8", + "pin": "K1" } ] }, { - "Name": "CLK", - "Pins": [ + "name": "CLK", + "pins": [ { - "Name": "1", - "Pin": "F14" + "name": "1", + "pin": "F14" } ] } diff --git a/src/OneWare.Cyc5000/Cyc5000Fpga.cs b/src/OneWare.Cyc5000/Cyc5000Fpga.cs deleted file mode 100644 index fb6f76bf..00000000 --- a/src/OneWare.Cyc5000/Cyc5000Fpga.cs +++ /dev/null @@ -1,11 +0,0 @@ -using OneWare.UniversalFpgaProjectSystem.Fpga; - -namespace OneWare.Cyc5000; - -public class Cyc5000Fpga : FpgaBase -{ - public Cyc5000Fpga() - { - LoadFromJsonAsset("avares://OneWare.Cyc5000/Assets/Cyc5000.json"); - } -} \ No newline at end of file diff --git a/src/OneWare.Cyc5000/Cyc5000FpgaPackage.cs b/src/OneWare.Cyc5000/Cyc5000FpgaPackage.cs new file mode 100644 index 00000000..d463a0c8 --- /dev/null +++ b/src/OneWare.Cyc5000/Cyc5000FpgaPackage.cs @@ -0,0 +1,21 @@ +using OneWare.Cyc5000.ViewModels; +using OneWare.UniversalFpgaProjectSystem.Fpga; +using OneWare.UniversalFpgaProjectSystem.Models; +using OneWare.UniversalFpgaProjectSystem.ViewModels; + +namespace OneWare.Cyc5000; + +public class Cyc5000FpgaPackage : IFpgaPackage +{ + public string Name => "CYC5000"; + + public IFpga LoadFpga() + { + return new GenericFpga(Name, "avares://OneWare.Cyc5000/Assets/Cyc5000.json"); + } + + public FpgaViewModelBase? LoadFpgaViewModel(FpgaModel fpgaModel) + { + return new Cyc5000ViewModel(fpgaModel); + } +} \ No newline at end of file diff --git a/src/OneWare.Cyc5000/Cyc5000Module.cs b/src/OneWare.Cyc5000/Cyc5000Module.cs index 37ac410e..a96a5eea 100644 --- a/src/OneWare.Cyc5000/Cyc5000Module.cs +++ b/src/OneWare.Cyc5000/Cyc5000Module.cs @@ -13,8 +13,6 @@ public void RegisterTypes(IContainerRegistry containerRegistry) public void OnInitialized(IContainerProvider containerProvider) { - var fpga = new Cyc5000Fpga(); - containerProvider.Resolve().RegisterFpga(fpga); - containerProvider.Resolve().RegisterCustomFpgaViewModel(fpga); + containerProvider.Resolve().RegisterFpgaPackage(new Cyc5000FpgaPackage()); } } \ No newline at end of file diff --git a/src/OneWare.Cyc5000/ViewModels/Cyc5000ViewModel.cs b/src/OneWare.Cyc5000/ViewModels/Cyc5000ViewModel.cs index f8e87a6c..accc5eef 100644 --- a/src/OneWare.Cyc5000/ViewModels/Cyc5000ViewModel.cs +++ b/src/OneWare.Cyc5000/ViewModels/Cyc5000ViewModel.cs @@ -1,6 +1,7 @@ using OneWare.UniversalFpgaProjectSystem.Fpga; using OneWare.UniversalFpgaProjectSystem.Models; +using OneWare.UniversalFpgaProjectSystem.ViewModels; namespace OneWare.Cyc5000.ViewModels; -public class Cyc5000ViewModel(FpgaBase fpga) : FpgaModel(fpga); \ No newline at end of file +public class Cyc5000ViewModel(FpgaModel model) : FpgaViewModelBase(model); \ No newline at end of file diff --git a/src/OneWare.Cyc5000/Views/Cyc5000View.axaml b/src/OneWare.Cyc5000/Views/Cyc5000View.axaml index 89906f7d..abaae61d 100644 --- a/src/OneWare.Cyc5000/Views/Cyc5000View.axaml +++ b/src/OneWare.Cyc5000/Views/Cyc5000View.axaml @@ -16,7 +16,7 @@ - + + + + + + + + \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPinView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPinView.axaml.cs new file mode 100644 index 00000000..48b1072e --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPinView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views.FpgaGuiElements; + +public partial class FpgaGuiElementPinView : UserControl +{ + public FpgaGuiElementPinView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml new file mode 100644 index 00000000..00640fa8 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml.cs new file mode 100644 index 00000000..8d2b578f --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views.FpgaGuiElements; + +public partial class FpgaGuiElementPmodView : UserControl +{ + public FpgaGuiElementPmodView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementRectView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementRectView.axaml new file mode 100644 index 00000000..d0e947b3 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementRectView.axaml @@ -0,0 +1,25 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementRectView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementRectView.axaml.cs new file mode 100644 index 00000000..98df02b7 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementRectView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views.FpgaGuiElements; + +public partial class FpgaGuiElementRectView : UserControl +{ + public FpgaGuiElementRectView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementTextView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementTextView.axaml new file mode 100644 index 00000000..a738dfe8 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementTextView.axaml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementTextView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementTextView.axaml.cs new file mode 100644 index 00000000..3b4f7ae2 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementTextView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views.FpgaGuiElements; + +public partial class FpgaGuiElementTextView : UserControl +{ + public FpgaGuiElementTextView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/GenericExtensionView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericExtensionView.axaml new file mode 100644 index 00000000..c9dcf3bf --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericExtensionView.axaml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/GenericExtensionView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericExtensionView.axaml.cs new file mode 100644 index 00000000..8cc7f483 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericExtensionView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views; + +public partial class GenericExtensionView : UserControl +{ + public GenericExtensionView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/GenericFpgaView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericFpgaView.axaml new file mode 100644 index 00000000..cbdce33d --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericFpgaView.axaml @@ -0,0 +1,25 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/GenericFpgaView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericFpgaView.axaml.cs new file mode 100644 index 00000000..74a0d138 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/GenericFpgaView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views; + +public partial class GenericFpgaView : UserControl +{ + public GenericFpgaView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/HardwareGuiView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/HardwareGuiView.axaml new file mode 100644 index 00000000..c0a69929 --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/HardwareGuiView.axaml @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/HardwareGuiView.axaml.cs b/src/OneWare.UniversalFpgaProjectSystem/Views/HardwareGuiView.axaml.cs new file mode 100644 index 00000000..a7e40bee --- /dev/null +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/HardwareGuiView.axaml.cs @@ -0,0 +1,13 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace OneWare.UniversalFpgaProjectSystem.Views; + +public partial class HardwareGuiView : UserControl +{ + public HardwareGuiView() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml index 4fd04c13..c9d57599 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml @@ -7,6 +7,7 @@ xmlns:converters="clr-namespace:OneWare.Essentials.Converters;assembly=OneWare.Essentials" xmlns:models="clr-namespace:OneWare.UniversalFpgaProjectSystem.Models" xmlns:behaviors="clr-namespace:OneWare.Essentials.Behaviors;assembly=OneWare.Essentials" + xmlns:converters1="clr-namespace:OneWare.UniversalFpgaProjectSystem.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" PrefHeight="750" PrefWidth="900" Padding="4" WindowBackground="{DynamicResource ThemeBackgroundBrush}" @@ -17,13 +18,16 @@ x:DataType="viewModels:UniversalFpgaProjectCompileViewModel" Name="UniversalFpgaProjectCompileViewView"> - + - - + CommandParameter="{Binding #UniversalFpgaProjectCompileViewView}" /> + @@ -32,31 +36,66 @@ - + + - + + + + + + - + + + - - - + + + + + + - + + + + + + + + + + Text="{Binding ConnectedNode.Node.Name, FallbackValue={}}" /> @@ -186,8 +225,8 @@