Update to V5.1

gusmanb · May 5, 2024 · 28ca9c9 · 28ca9c9
1 parent 5838d03
commit 28ca9c9
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 18 deletions.
diff --git a/Software/LogicAnalyzer/Artwork/Logo.png b/Software/LogicAnalyzer/Artwork/Logo.png
diff --git a/Software/LogicAnalyzer/Artwork/Logo.psd b/Software/LogicAnalyzer/Artwork/Logo.psd
diff --git a/Software/LogicAnalyzer/CLCapture/CLCapture.csproj b/Software/LogicAnalyzer/CLCapture/CLCapture.csproj
@@ -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>

diff --git a/Software/LogicAnalyzer/CLCapture/Properties/launchSettings.json b/Software/LogicAnalyzer/CLCapture/Properties/launchSettings.json
@@ -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"
     }
   }
 }
diff --git a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj
@@ -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>

diff --git a/...cAnalyzer/LogicAnalyzer/Assets/Logo40.png → ...gicAnalyzer/LogicAnalyzer/Assets/Logo.png b/...cAnalyzer/LogicAnalyzer/Assets/Logo40.png → ...gicAnalyzer/LogicAnalyzer/Assets/Logo.png
diff --git a/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml b/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml
@@ -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>

diff --git a/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml b/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml
@@ -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>
diff --git a/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj b/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj
@@ -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>

diff --git a/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml b/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml
@@ -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

diff --git a/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIAnalyzer.cs b/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIAnalyzer.cs
@@ -282,7 +282,6 @@ private int FindFirstSampleClock(int start, byte[] clockRange, int cpol, int cph
             }
             else if (cpol == 1 && cpha == 1)
             {
-                //High-low-high-low
                 //High-log-high
 
                 pos = FindSample(pos, clockRange, 1);
@@ -297,13 +296,6 @@ private int FindFirstSampleClock(int start, byte[] clockRange, int cpol, int cph
 
                 return FindSample(pos, clockRange, 1);
 
-                /*
-                pos = FindSample(pos, clockRange, 1);
-
-                if (pos == -1)
-                    return -1;
-
-                return FindSample(pos, clockRange, 0); */
             }
 
             return -1;

diff --git a/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj b/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj
@@ -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>

diff --git a/Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj b/Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj
@@ -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>