mirror of
https://github.com/JasonYANG170/logicanalyzer.git
synced 2024-11-26 21:46:27 +00:00
Update to V5.1
This commit is contained in:
parent
5838d0360e
commit
28ca9c9f0b
Binary file not shown.
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 2.4 MiB |
BIN
Software/LogicAnalyzer/Artwork/Logo.psd
Normal file
BIN
Software/LogicAnalyzer/Artwork/Logo.psd
Normal file
Binary file not shown.
|
@ -6,7 +6,7 @@
|
|||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<ApplicationIcon>window.ico</ApplicationIcon>
|
||||
<Version>5.0.0.0</Version>
|
||||
<Version>5.1.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
"profiles": {
|
||||
"CLCapture": {
|
||||
"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"
|
||||
"commandName": "Project"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -4,7 +4,7 @@
|
|||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>3.5.0.1</Version>
|
||||
<Version>5.1.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 2.4 MiB |
|
@ -11,9 +11,9 @@
|
|||
WindowStartupLocation="CenterScreen"
|
||||
Topmost="True">
|
||||
<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">
|
||||
<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>
|
||||
<Button Name="btnLicense" Margin="10,0,10,0">License</Button>
|
||||
</StackPanel>
|
||||
|
|
|
@ -10,6 +10,6 @@
|
|||
SystemDecorations="None"
|
||||
Topmost="True">
|
||||
<Border BorderBrush="Black" BorderThickness="2">
|
||||
<Image Source="/Assets/Logo40.png"></Image>
|
||||
<Image Source="/Assets/Logo.png"></Image>
|
||||
</Border>
|
||||
</Window>
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
||||
<ApplicationIcon>Assets\Ico40.ico</ApplicationIcon>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<Version>5.0.0.0</Version>
|
||||
<Version>5.1.0.0</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Remove=".gitignore" />
|
||||
<None Remove="Assets\Logo40.png" />
|
||||
<None Remove="Assets\Logo.png" />
|
||||
<None Remove="Assets\window.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
</StackPanel>
|
||||
</StackPanel>
|
||||
</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">
|
||||
<TextBlock Margin="5,2,5,2">
|
||||
Information
|
||||
|
|
|
@ -282,7 +282,6 @@ namespace SPIProtocolAnalyzer
|
|||
}
|
||||
else if (cpol == 1 && cpha == 1)
|
||||
{
|
||||
//High-low-high-low
|
||||
//High-log-high
|
||||
|
||||
pos = FindSample(pos, clockRange, 1);
|
||||
|
@ -297,13 +296,6 @@ namespace SPIProtocolAnalyzer
|
|||
|
||||
return FindSample(pos, clockRange, 1);
|
||||
|
||||
/*
|
||||
pos = FindSample(pos, clockRange, 1);
|
||||
|
||||
if (pos == -1)
|
||||
return -1;
|
||||
|
||||
return FindSample(pos, clockRange, 0); */
|
||||
}
|
||||
|
||||
return -1;
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>3.5.0.1</Version>
|
||||
<AssemblyVersion>5.1.0.0</AssemblyVersion>
|
||||
<FileVersion>5.1.0.0</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
<Nullable>enable</Nullable>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<Version>3.5.0.1</Version>
|
||||
<AssemblyVersion>5.1.0.0</AssemblyVersion>
|
||||
<FileVersion>5.1.0.0</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Loading…
Reference in New Issue
Block a user