VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
f4exb 2019-04-21 20:34:59 +02:00
commit 1f8f8e4286
5 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
cmake_policy(SET CMP0043 OLD)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
message(FATAL_ERROR "SDRangel requires GCC version 4.9 or higher!") message(FATAL_ERROR "SDRangel requires GCC version 4.9 or higher!")
@ -425,9 +424,7 @@ target_link_libraries(sdrangel
if(WIN32) if(WIN32)
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE") set_target_properties(sdrangel PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
set_target_properties(sdrangel PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE") set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
set_target_properties(sdrangel PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE")
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
endif(WIN32) endif(WIN32)

23
devices/perseus/deviceperseusscan.cpp
View File

@ -29,33 +29,24 @@ bool DevicePerseusScan::scan(int nbDevices)
return true; return true;
} }
bool done = true; bool done = true;
perseus_descr *descr; perseus_descr *descr;
eeprom_prodid prodid; eeprom_prodid prodid;
for (int deviceIndex = 0; deviceIndex < nbDevices; deviceIndex++) for (int deviceIndex = 0; deviceIndex < nbDevices; deviceIndex++)
{ {
if ((descr = perseus_open(deviceIndex)) == 0) if ((descr = perseus_open(deviceIndex)) == 0)
{ {
qCritical("DevicePerseusScan::scan: device #%d open error: %s", deviceIndex, perseus_errorstr()); qCritical("DevicePerseusScan::scan: device #%d open error: %s", deviceIndex, perseus_errorstr());
perseus_close(descr); perseus_close(descr);
continue; continue;
} }
if (descr->firmware_downloaded)
{
qDebug("DevicePerseusScan::scan: device #%d firmware is already downloaded", deviceIndex);
}
else
{
qDebug("DevicePerseusScan::scan: device #%d firmware is not yet downloaded", deviceIndex);
done = false;
}
if (perseus_firmware_download(descr, 0) < 0) if (perseus_firmware_download(descr, 0) < 0)
{ {
qCritical("DevicePerseusScan::scan: device #%d firmware download error: %s", deviceIndex, perseus_errorstr()); qCritical("DevicePerseusScan::scan: device #%d firmware download error: %s", deviceIndex, perseus_errorstr());
perseus_close(descr); perseus_close(descr);
done = false;
continue; continue;
} }
else else

4
plugins/samplesource/CMakeLists.txt
View File

@ -29,10 +29,10 @@ if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerf2input) add_subdirectory(bladerf2input)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
if(LIBUSB_FOUND AND NOT APPLE) if(LIBUSB_FOUND)
add_subdirectory(fcdpro) add_subdirectory(fcdpro)
add_subdirectory(fcdproplus) add_subdirectory(fcdproplus)
endif(LIBUSB_FOUND AND NOT APPLE) endif(LIBUSB_FOUND)
find_package(LibHACKRF) find_package(LibHACKRF)
if(LIBUSB_FOUND AND LIBHACKRF_FOUND) if(LIBUSB_FOUND AND LIBHACKRF_FOUND)

1
plugins/samplesource/fcdpro/CMakeLists.txt
View File

@ -46,7 +46,6 @@ add_library(inputfcdpro SHARED
target_link_libraries(inputfcdpro target_link_libraries(inputfcdpro
${QT_LIBRARIES} ${QT_LIBRARIES}
asound
fcdhid fcdhid
fcdlib fcdlib
sdrbase sdrbase

3
plugins/samplesource/fcdproplus/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(fcdproplus_FORMS
include_directories( include_directories(
. .
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/fcdhid ${CMAKE_SOURCE_DIR}/fcdhid
${CMAKE_SOURCE_DIR}/fcdlib ${CMAKE_SOURCE_DIR}/fcdlib
) )
@ -46,7 +46,6 @@ add_library(inputfcdproplus SHARED
target_link_libraries(inputfcdproplus target_link_libraries(inputfcdproplus
${QT_LIBRARIES} ${QT_LIBRARIES}
asound
fcdhid fcdhid
fcdlib fcdlib
sdrbase sdrbase