diff --git a/Software/LogicAnalyzer/Artwork/Logo.png b/Software/LogicAnalyzer/Artwork/Logo.png index 9b93c0f..9b43e53 100644 Binary files a/Software/LogicAnalyzer/Artwork/Logo.png and b/Software/LogicAnalyzer/Artwork/Logo.png differ diff --git a/Software/LogicAnalyzer/Artwork/Logo.psd b/Software/LogicAnalyzer/Artwork/Logo.psd new file mode 100644 index 0000000..2535c2e Binary files /dev/null and b/Software/LogicAnalyzer/Artwork/Logo.psd differ diff --git a/Software/LogicAnalyzer/CLCapture/CLCapture.csproj b/Software/LogicAnalyzer/CLCapture/CLCapture.csproj index a41225b..6db1b8f 100644 --- a/Software/LogicAnalyzer/CLCapture/CLCapture.csproj +++ b/Software/LogicAnalyzer/CLCapture/CLCapture.csproj @@ -6,7 +6,7 @@ enable enable window.ico - 5.0.0.0 + 5.1.0.0 diff --git a/Software/LogicAnalyzer/CLCapture/Properties/launchSettings.json b/Software/LogicAnalyzer/CLCapture/Properties/launchSettings.json index 8b29ea9..99208ca 100644 --- 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" } } } \ No newline at end of file diff --git a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj index 2885bc6..2775eef 100644 --- a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj +++ b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj @@ -4,7 +4,7 @@ net7.0 enable enable - 3.5.0.1 + 5.1.0.0 diff --git a/Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo40.png b/Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo.png similarity index 97% rename from Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo40.png rename to Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo.png index ac9dd9c..9b43e53 100644 Binary files a/Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo40.png and b/Software/LogicAnalyzer/LogicAnalyzer/Assets/Logo.png differ diff --git a/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml b/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml index c1da4d0..7a64de0 100644 --- a/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml +++ b/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/AboutDialog.axaml @@ -11,9 +11,9 @@ WindowStartupLocation="CenterScreen" Topmost="True"> - + - ©2023 Agustín Giménez Bernad + ©2024 Agustín Giménez Bernad Version 5.0.0.0 diff --git a/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml b/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml index bf9537b..0f68367 100644 --- a/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml +++ b/Software/LogicAnalyzer/LogicAnalyzer/Dialogs/SplashScreen.axaml @@ -10,6 +10,6 @@ SystemDecorations="None" Topmost="True"> - + diff --git a/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj b/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj index 69bdf37..621d870 100644 --- a/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj +++ b/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj @@ -8,11 +8,11 @@ true Assets\Ico40.ico True - 5.0.0.0 + 5.1.0.0 - + diff --git a/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml b/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml index 5fbd264..787d363 100644 --- a/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml +++ b/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml @@ -84,7 +84,7 @@ - + Information diff --git a/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIAnalyzer.cs b/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIAnalyzer.cs index d20ff6a..153afc3 100644 --- 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 index 2885bc6..83ac31a 100644 --- a/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj +++ b/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj @@ -5,6 +5,8 @@ enable enable 3.5.0.1 + 5.1.0.0 + 5.1.0.0 diff --git a/Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj b/Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj index dcdab0b..157710e 100644 --- a/Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj +++ b/Software/LogicAnalyzer/SharedDriver/SharedDriver.csproj @@ -6,6 +6,8 @@ enable True 3.5.0.1 + 5.1.0.0 + 5.1.0.0