Skip to content
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.

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

To support debian #30

Merged
merged 4 commits into from
Sep 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,22 @@ target_link_libraries(${TARGET}
# ${catkin_LIBRARIES} ${eigen_LIBRARIES} )

# install
set(DESTDIR ${PROJECT_SOURCE_DIR}/install)
install(TARGETS ${TARGET} RUNTIME DESTINATION ${DESTDIR}/bin)
#install(TARGETS ${TARGET} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
if("${CMAKE_SYSTEM}" MATCHES "Linux")
install(TARGETS ${TARGET} RUNTIME DESTINATION ${DESTDIR}/usr/bin)
if(EXISTS "/lib/udev/rules.d/")
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/extra/linux/64-xscope.rules"
DESTINATION
"/lib/udev/rules.d/"
COMPONENT
Runtime)
endif()
else()
set(DESTDIR ${PROJECT_SOURCE_DIR}/install)
install(TARGETS ${TARGET} RUNTIME DESTINATION ${DESTDIR}/bin)
#install(TARGETS ${TARGET} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
endif()


# data files
#install(DIRECTORY data/
Expand Down
1 change: 1 addition & 0 deletions extra/linux/64-xscope.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ACTION=="add", SUBSYSTEM=="usb", ATTR{manufacturer}=="Gabotronics", GROUP=="plugdev", MODE="066", SYMLINK+="XScope%n"
Binary file removed libs/unix/libusb-1.0.a
Binary file not shown.
Binary file removed libs/unix/libusb-1.0.so.0.1.0
Binary file not shown.
43 changes: 43 additions & 0 deletions log.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Device Settings:
Sampling rate: 1
GPIO1 CH1 Option: 1
GPIO2 CH2 Option: 1
GPIO3 CHD Option: 8
GPIO4 Mask: 255
GPIO5 Trigger: 128
GPIO6 Mcursors: 0
GPIO7 display: 193
GPIO8 MFFT: 9
GPIO9 Sweep: 0
GPIOA Sniffer Controls: 28
GPIOB MStatus: 64
M 12 Gain CH1: 3
M 13 Gain CH2: 3
M 14 HPos: 64
M 15 Vertical cursor A: 32
M 16 Vertical cursor B: 96
M 17 CH1 Horizontal cursor A: 66
M 18 CH1 Horizontal cursor B: 62
M 19 CH2 Horizontal cursor A: 66
M 20 CH2 Horizontal cursor B: 62
M 21 Trigger Hold: 0
M 22 23 Post Trigger: 32768
M 24 Trigger source: 0
M 25 Trigger Level: 128
M 26 Window Trigger level 1: 160
M 27 Window Trigger level 2: 96
M 28 Trigger Timeout: 24
M 29 Channel 1 position: 224
M 30 Channel 2 position: 160
M 31 Channel D position: 7
M 32 Decode Protocol: 0
M 33 Sweep Start Frequency: 1
M 34 Sweep End Frequency: 255
M 35 Sweep Speed: 16
M 36 Amplitude range: [-128,0]: 128
M 37 Waveform type: 1
38 Duty cycle range: [1,255]: 128
M 39 Offset: 0
40 Desired frequency: 440
------------------------------------------