Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ed1a571a2d6
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9ed93b4ae8a
Choose a head ref
  • 1 commit
  • 8 files changed
  • 1 contributor

Commits on Oct 6, 2020

  1. Added demo oscilloscope. Fixes #296.

    @azonenberg
    azonenberg committed Oct 6, 2020
    Copy the full SHA
    c9ed93b View commit details
7 changes: 5 additions & 2 deletions scopehal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ set(SCOPEHAL_SOURCES
AgilentOscilloscope.cpp
AntikernelLabsOscilloscope.cpp
AntikernelLogicAnalyzer.cpp
DemoOscilloscope.cpp
LeCroyOscilloscope.cpp
MockOscilloscope.cpp
SiglentSCPIOscilloscope.cpp
@@ -77,10 +78,12 @@ set(SCOPEHAL_SOURCES

add_library(scopehal SHARED
${SCOPEHAL_SOURCES})
target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget yaml-cpp ${LXI_LIBRARIES} ${WIN_LIBS})
target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget yaml-cpp
${LXI_LIBRARIES} ${WIN_LIBS} ${LIBFFTS_LIBRARIES})

target_include_directories(scopehal
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${LIBFFTS_INCLUDE_DIR})

if(${HAS_LXI})
target_compile_definitions(scopehal PUBLIC HAS_LXI)
Loading