dac: final fixes

Signed-off-by: AlexandraTrifan <[email protected]>
analogdevicesinc · Sep 26, 2024 · dfbdf97 · dfbdf97
1 parent 6f145a2
commit dfbdf97
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/ci/armhf/armhf_build_process.sh b/ci/armhf/armhf_build_process.sh
@@ -324,7 +324,7 @@ create_appdir(){
 		cp -r $REGMAP_XMLS $APP_DIR/usr/lib/scopy/plugins
 	fi
 
-	cp -r $DAC_WAVEFORM_CSV $DEST_FOLDER/plugins
+	cp -r $DAC_WAVEFORM_CSV $APP_DIR/usr/lib/scopy/plugins
 
 	$COPY_DEPS $APP_DIR/usr/bin/scopy $APP_DIR/usr/lib
 	$COPY_DEPS $APP_DIR/usr/bin/iio-emu $APP_DIR/usr/lib

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -77,7 +77,7 @@ endif()
 
 if(ENABLE_PLUGIN_DAC)
 	add_subdirectory(dac)
-	list(APPEND PLUGINS ${PLUGIN_NAME})
+	list(APPEND PLUGINS ${DAC_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_SWIOT)

diff --git a/plugins/dac/CMakeLists.txt b/plugins/dac/CMakeLists.txt
@@ -42,7 +42,8 @@ endif()
 set(DAC_CSV_SYSTEM_PATH ${SCOPY_PLUGIN_INSTALL_PATH}/csv)
 set(DAC_CSV_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/csv)
 
-install(FILES res/csv/* DESTINATION ${SCOPY_PLUGIN_INSTALL_PATH}/csv)
+install(DIRECTORY res/csv DESTINATION ${SCOPY_PLUGIN_INSTALL_PATH})
+
 file(GLOB CSVS ${CMAKE_CURRENT_SOURCE_DIR}/res/csv/*)
 foreach(_csv ${CSVS})
 	file(COPY ${_csv} DESTINATION ${DAC_CSV_BUILD_PATH})
@@ -75,6 +76,9 @@ target_link_libraries(
 	       scopy-iio-widgets
 )
 
-set(PLUGIN_NAME ${PROJECT_NAME} PARENT_SCOPE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set(INSTALLER_DESCRIPTION "${PLUGIN_DISPLAY_NAME} ${PLUGIN_DESCRIPTION}")
+	configureinstallersettings(${SCOPY_MODULE} ${INSTALLER_DESCRIPTION} FALSE)
+endif()
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${SCOPY_PLUGIN_INSTALL_DIR})
+set(DAC_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
diff --git a/plugins/dac/res/resources.qrc b/plugins/dac/res/resources.qrc
@@ -1,12 +1,5 @@
 <RCC>
     <qresource prefix="/dacinstrument">
         <file>tutorial_chapters.json</file>
-        <file>csv/sine_complex_2_15360_sr_15360000_samps_40000_ampl_32767.csv</file>
-        <file>csv/sine_complex_2_30720_sr_15360000_samps_20000_ampl_32767.csv</file>
-        <file>csv/sine_complex_1_30720_sr_15360000_samps_20000_ampl_32767.csv</file>
-        <file>csv/sine_complex_1_15360_sr_15360000_samps_40000_ampl_32767.csv</file>
-        <file>csv/sine_complex_245760_sr_122880000_samps_20000_ampl_32767.csv</file>
-        <file>csv/sine_complex_245760_sr_122880000_samps_20000_ampl_16384.csv</file>
-        <file>csv/sinewave_0.9_2ch.csv</file>
     </qresource>
 </RCC>