yang/logicanalyzer
1
0
Fork 0
mirror of https://github.com/JasonYANG170/logicanalyzer.git synced 2024-11-27 05:56:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to V5.1

Browse Source
This commit is contained in:
Agustín Gimenez 2024-05-05 13:44:00 +02:00
parent 5838d0360e
commit 28ca9c9f0b
13 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Software/LogicAnalyzer/Artwork/Logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 2.4 MiB

BIN
Software/LogicAnalyzer/Artwork/Logo.psd Normal file
View File

Binary file not shown.

2
Software/LogicAnalyzer/CLCapture/CLCapture.csproj
View File

@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ApplicationIcon>window.ico</ApplicationIcon> <ApplicationIcon>window.ico</ApplicationIcon>
<Version>5.0.0.0</Version> <Version>5.1.0.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

3
Software/LogicAnalyzer/CLCapture/Properties/launchSettings.json
View File

@ -1,8 +1,7 @@
{ {
"profiles": { "profiles": {
"CLCapture": { "CLCapture": {
"commandName": "Project", "commandName": "Project"
"commandLineArgs": "capture COM9 1000000 1:SDA,2:SDB,3:SDC_A,4:nana,5,6,7,8 512 1000 5 TriggerType:Edge,Channel:1,Value:1 test.csv"
} }
} }
} }

2
Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>3.5.0.1</Version> <Version>5.1.0.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

BIN
Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo40.png → Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 MiB

After

Width:  |  Height:  |  Size: 2.4 MiB

4
Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml
View File

@ -11,9 +11,9 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Topmost="True"> Topmost="True">
<Grid ColumnDefinitions="Auto,180"> <Grid ColumnDefinitions="Auto,180">
<Image Source="/Assets/Logo40.png" Margin="20" Height="420" Width="420"></Image> <Image Source="/Assets/Logo.png" Margin="20" Height="420" Width="420"></Image>
<StackPanel Spacing="10" Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="20"> <StackPanel Spacing="10" Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="20">
<TextBlock TextWrapping="Wrap">©2023 Agustín Giménez Bernad</TextBlock> <TextBlock TextWrapping="Wrap">©2024 Agustín Giménez Bernad</TextBlock>
<TextBlock TextWrapping="Wrap" Name="txtVersion">Version 5.0.0.0</TextBlock> <TextBlock TextWrapping="Wrap" Name="txtVersion">Version 5.0.0.0</TextBlock>
<Button Name="btnLicense" Margin="10,0,10,0">License</Button> <Button Name="btnLicense" Margin="10,0,10,0">License</Button>
</StackPanel> </StackPanel>

2
Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml
View File

@ -10,6 +10,6 @@
SystemDecorations="None" SystemDecorations="None"
Topmost="True"> Topmost="True">
<Border BorderBrush="Black" BorderThickness="2"> <Border BorderBrush="Black" BorderThickness="2">
<Image Source="/Assets/Logo40.png"></Image> <Image Source="/Assets/Logo.png"></Image>
</Border> </Border>
</Window> </Window>

4
Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj
View File

@ -8,11 +8,11 @@
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationIcon>Assets\Ico40.ico</ApplicationIcon> <ApplicationIcon>Assets\Ico40.ico</ApplicationIcon>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Version>5.0.0.0</Version> <Version>5.1.0.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove=".gitignore" /> <None Remove=".gitignore" />
<None Remove="Assets\Logo40.png" /> <None Remove="Assets\Logo.png" />
<None Remove="Assets\window.ico" /> <None Remove="Assets\window.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml
View File

@ -84,7 +84,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Image Source="/Assets/Logo40.png" VerticalAlignment="Center"></Image> <Image Source="/Assets/Logo.png" VerticalAlignment="Center"></Image>
<StackPanel DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Margin="5" Background="#80383838"> <StackPanel DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Margin="5" Background="#80383838">
<TextBlock Margin="5,2,5,2"> <TextBlock Margin="5,2,5,2">
Information Information

8
Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIAnalyzer.cs
View File

@ -282,7 +282,6 @@ namespace SPIProtocolAnalyzer
} }
else if (cpol == 1 && cpha == 1) else if (cpol == 1 && cpha == 1)
{ {
//High-low-high-low
//High-log-high //High-log-high
pos = FindSample(pos, clockRange, 1); pos = FindSample(pos, clockRange, 1);
@ -297,13 +296,6 @@ namespace SPIProtocolAnalyzer
return FindSample(pos, clockRange, 1); return FindSample(pos, clockRange, 1);
/*
pos = FindSample(pos, clockRange, 1);
if (pos == -1)
return -1;
return FindSample(pos, clockRange, 0); */
} }
return -1; return -1;

2
Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj
View File

@ -5,6 +5,8 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>3.5.0.1</Version> <Version>3.5.0.1</Version>
<AssemblyVersion>5.1.0.0</AssemblyVersion>
<FileVersion>5.1.0.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj
View File

@ -6,6 +6,8 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Version>3.5.0.1</Version> <Version>3.5.0.1</Version>
<AssemblyVersion>5.1.0.0</AssemblyVersion>
<FileVersion>5.1.0.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>