Skip to content

Restructure project and update Saleae AnalyzersSDK support #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AddioElectronics merged 6 commits into from
May 15, 2026
Merged

Restructure project and update Saleae AnalyzersSDK support #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d33989
Project re-structure, and Saleae AnalyzersSDK update
AddioElectronics May 15, 2026
781021d
Merged MacOS build workflow
AddioElectronics May 15, 2026
306eed4
Add sdk/architecture matrix to macOS build workflow
AddioElectronics May 15, 2026
f15245d
Fix stale submodule path reference after history reset
AddioElectronics May 15, 2026
3d5221d
Changed Kingst AnalyzerSDKConfig.cmake to check CMAKE_OSX_ARCHITECTUR…
AddioElectronics May 15, 2026
fbc64f7
Added linux toolchain cmake files for cross compiling
AddioElectronics May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .github/workflows/macOS-Build-Manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS Build (Manual)
name: MacOS Build (Manual)

on:
workflow_dispatch:
Expand All @@ -12,6 +12,15 @@ jobs:
build-macos:
runs-on: macos-latest

strategy:
matrix:
sdk: [saleae, kingst]
arch: [arm64, x86_64]

exclude:
- sdk: kingst
arch: arm64

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -22,7 +31,8 @@ jobs:
run: |
cmake -B build \
-DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \
-DCMAKE_OSX_ARCHITECTURES=arm64
-DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
-DTARGET_SDK=${{matrix.sdk}}

- name: Build
run: cmake --build build
Expand All @@ -33,5 +43,5 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: macos-${{ inputs.build_type }}
name: macos-${{ matrix.sdk }}-${{ matrix.arch }}-${{ inputs.build_type }}
path: build/*.dylib
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ mono_crash.*
[Rr]elease/
[Rr]eleases/
[Bb]uild/
[Bb]uild*/
x64/
x86/
[Ww][Ii][Nn]32/
Expand All @@ -32,6 +33,7 @@ bld/
[Oo]bj/
[Ll]og/
[Ll]ogs/
.vscode/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "SaleaeAnalyzerSDK"]
path = SaleaeAnalyzerSDK
[submodule "thirdparty/SaleaeAnalyzerSDK"]
path = thirdparty/SaleaeAnalyzerSDK
url = https://github.com/saleae/AnalyzerSDK.git
28 changes: 18 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
cmake_minimum_required(VERSION 3.14...3.22)

project(
QSPI_Analyzer
VERSION 1.0
LANGUAGES CXX
project(QSPI_Analyzer VERSION 1.0.1 LANGUAGES CXX)
add_library(QSPI_Analyzer SHARED)
target_compile_features(QSPI_Analyzer PRIVATE cxx_std_17)

set_target_properties(QSPI_Analyzer PROPERTIES
OUTPUT_NAME "QSPI_Analyzer"
PREFIX ""
)

set(AnalyzerSDK_DIR SaleaeAnalyzerSDK)
find_package(AnalyzerSDK REQUIRED)
target_compile_features(QSPI_Analyzer PRIVATE cxx_std_17)

set(BUILD_SHARED_LIBS ON) # Dynamic library

add_library(${PROJECT_NAME} SHARED
target_sources(QSPI_Analyzer PRIVATE
src/QSpiAnalyzer.cpp
src/QSpiAnalyzer.h
src/QSpiAnalyzerResults.cpp
Expand All @@ -23,6 +27,10 @@ add_library(${PROJECT_NAME} SHARED
src/QspiTypes.h
src/QSpiUtil.h
)
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
target_link_libraries(${PROJECT_NAME} PUBLIC Saleae::AnalyzerSDK)
target_compile_definitions(${PROJECT_NAME} PRIVATE SALEAE_ANALYZER)

# Select SDK
if(NOT DEFINED TARGET_SDK OR TARGET_SDK STREQUAL "saleae")
include(cmake/Saleae.cmake)
elseif(TARGET_SDK MATCHES "kingst")
include(cmake/Kingst.cmake)
endif()
52 changes: 32 additions & 20 deletions QSpiAnalyzer.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,62 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33815.320
# Visual Studio Version 18
VisualStudioVersion = 18.5.11723.231
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QSpiAnalyzer", "QSpiAnalyzer.vcxproj", "{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DebugKingstVIS|ARM64 = DebugKingstVIS|ARM64
DebugKingstVIS|Win32 = DebugKingstVIS|Win32
DebugKingstVIS|x64 = DebugKingstVIS|x64
DebugKingstVIS|x86 = DebugKingstVIS|x86
DebugLogic1|ARM64 = DebugLogic1|ARM64
DebugLogic1|Win32 = DebugLogic1|Win32
DebugLogic1|x64 = DebugLogic1|x64
DebugLogic1|x86 = DebugLogic1|x86
DebugLogic2|ARM64 = DebugLogic2|ARM64
DebugLogic2|Win32 = DebugLogic2|Win32
DebugLogic2|x64 = DebugLogic2|x64
DebugLogic2|x86 = DebugLogic2|x86
ReleaseKingstVIS|ARM64 = ReleaseKingstVIS|ARM64
ReleaseKingstVIS|Win32 = ReleaseKingstVIS|Win32
ReleaseKingstVIS|x64 = ReleaseKingstVIS|x64
ReleaseKingstVIS|x86 = ReleaseKingstVIS|x86
ReleaseLogic1|ARM64 = ReleaseLogic1|ARM64
ReleaseLogic1|Win32 = ReleaseLogic1|Win32
ReleaseLogic1|x64 = ReleaseLogic1|x64
ReleaseLogic1|x86 = ReleaseLogic1|x86
ReleaseLogic2|ARM64 = ReleaseLogic2|ARM64
ReleaseLogic2|Win32 = ReleaseLogic2|Win32
ReleaseLogic2|x64 = ReleaseLogic2|x64
ReleaseLogic2|x86 = ReleaseLogic2|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|ARM64.ActiveCfg = DebugKingstVIS|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|Win32.ActiveCfg = DebugKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|Win32.Build.0 = DebugKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|x64.ActiveCfg = DebugKingstVIS|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|x64.Build.0 = DebugKingstVIS|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|x86.ActiveCfg = DebugKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugKingstVIS|x86.Build.0 = DebugKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|ARM64.ActiveCfg = DebugLogic1|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|ARM64.Build.0 = DebugLogic1|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|Win32.ActiveCfg = DebugLogic1|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|x64.ActiveCfg = DebugLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|x64.Build.0 = DebugLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|x86.ActiveCfg = DebugLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic1|x86.Build.0 = DebugLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|ARM64.ActiveCfg = DebugLogic2|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|ARM64.Build.0 = DebugLogic2|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|Win32.ActiveCfg = DebugLogic2|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|x64.ActiveCfg = DebugLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|x64.Build.0 = DebugLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|x86.ActiveCfg = DebugLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.DebugLogic2|x86.Build.0 = DebugLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|ARM64.ActiveCfg = ReleaseKingstVIS|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|Win32.ActiveCfg = ReleaseKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|Win32.Build.0 = ReleaseKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|x64.ActiveCfg = ReleaseKingstVIS|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|x64.Build.0 = ReleaseKingstVIS|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|x86.ActiveCfg = ReleaseKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseKingstVIS|x86.Build.0 = ReleaseKingstVIS|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|ARM64.ActiveCfg = ReleaseLogic1|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|ARM64.Build.0 = ReleaseLogic1|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|Win32.ActiveCfg = ReleaseLogic1|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|x64.ActiveCfg = ReleaseLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|x64.Build.0 = ReleaseLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|x86.ActiveCfg = ReleaseLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic1|x86.Build.0 = ReleaseLogic1|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|ARM64.ActiveCfg = ReleaseLogic2|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|ARM64.Build.0 = ReleaseLogic2|ARM64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|Win32.ActiveCfg = ReleaseLogic2|Win32
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|x64.ActiveCfg = ReleaseLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|x64.Build.0 = ReleaseLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|x86.ActiveCfg = ReleaseLogic2|x64
{35A9CF32-7794-46BA-95E2-41A42E1AC6C0}.ReleaseLogic2|x86.Build.0 = ReleaseLogic2|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading
Loading