diff --git a/CMakeLists.txt b/CMakeLists.txt index 26a712e..a45d716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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/ diff --git a/extra/linux/64-xscope.rules b/extra/linux/64-xscope.rules new file mode 100644 index 0000000..1ec2859 --- /dev/null +++ b/extra/linux/64-xscope.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="usb", ATTR{manufacturer}=="Gabotronics", GROUP=="plugdev", MODE="066", SYMLINK+="XScope%n" diff --git a/libs/unix/libusb-1.0.a b/libs/unix/libusb-1.0.a deleted file mode 100644 index ec16bd9..0000000 Binary files a/libs/unix/libusb-1.0.a and /dev/null differ diff --git a/libs/unix/libusb-1.0.so.0.1.0 b/libs/unix/libusb-1.0.so.0.1.0 deleted file mode 100644 index f078cc4..0000000 Binary files a/libs/unix/libusb-1.0.so.0.1.0 and /dev/null differ diff --git a/log.txt b/log.txt new file mode 100644 index 0000000..e707385 --- /dev/null +++ b/log.txt @@ -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 +------------------------------------------ +