VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-10-02 17:56:45 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'remote_control' of https://github.com/srcejon/sdrangel into remote_control

Browse Source
This commit is contained in:
Jon Beniston 2022-09-17 20:33:48 +01:00
commit aa84e2d0f6
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.appveyor.yml
View File

@ -20,17 +20,17 @@ environment:
# -DBUILD_SERVER=OFF \ # -DBUILD_SERVER=OFF \
# -DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0" # -DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0"
# CMAKE_GENERATOR: Ninja # CMAKE_GENERATOR: Ninja
- TARGET: ubuntu2004prod - TARGET: ubuntu2204prod
APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
APPVEYOR_BUILD_WORKER_IMAGE: Linux APPVEYOR_BUILD_WORKER_IMAGE: Linux
CC: "gcc-9" CC: "gcc-11"
CXX: "g++-9" CXX: "g++-11"
CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \ CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
-DARCH_OPT=nehalem \ -DARCH_OPT=nehalem \
-DDEBUG_OUTPUT=ON \ -DDEBUG_OUTPUT=ON \
-DENABLE_EXTERNAL_LIBRARIES=ON \ -DENABLE_EXTERNAL_LIBRARIES=ON \
-DBUILD_SERVER=OFF" -DBUILD_SERVER=OFF"
- TARGET: ubuntu2004docker - TARGET: ubuntu2204docker
APPVEYOR_BUILD_WORKER_CLOUD: nasrock APPVEYOR_BUILD_WORKER_CLOUD: nasrock
APPVEYOR_BUILD_WORKER_IMAGE: Linux APPVEYOR_BUILD_WORKER_IMAGE: Linux
APPVEYOR_CONSOLE_DISABLE_PTY: true APPVEYOR_CONSOLE_DISABLE_PTY: true
@ -68,7 +68,7 @@ for:
# branch: master # release from master branch only # branch: master # release from master branch only
- matrix: - matrix:
only: only:
- TARGET: ubuntu2004prod - TARGET: ubuntu2204prod
clone_folder: /home/appveyor/projects clone_folder: /home/appveyor/projects
cache: cache:
- $HOME/external/ - $HOME/external/
@ -90,7 +90,7 @@ for:
libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \ libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev \ libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev \
python3-mako python3-cheetah python3-numpy \ python3-mako python3-cheetah python3-numpy \
autoconf automake libtool ninja-build libclang1-9 autoconf automake libtool ninja-build libclang1-11
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_mbelib.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_mbelib.sh; fi
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_serialdv.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_serialdv.sh; fi
@ -128,7 +128,7 @@ for:
branch: master # release from master branch only branch: master # release from master branch only
- matrix: - matrix:
only: only:
- TARGET: ubuntu2004docker - TARGET: ubuntu2204docker
before_build: before_build:
- git clone https://github.com/f4exb/sdrangel-docker.git - git clone https://github.com/f4exb/sdrangel-docker.git
- cd sdrangel-docker - cd sdrangel-docker

2
plugins/channelrx/CMakeLists.txt
View File

@ -83,7 +83,7 @@ endif()
if(ENABLE_CHANNELRX_DEMODDSD AND LIBDSDCC_FOUND AND LIBMBE_FOUND) if(ENABLE_CHANNELRX_DEMODDSD AND LIBDSDCC_FOUND AND LIBMBE_FOUND)
add_subdirectory(demoddsd) add_subdirectory(demoddsd)
endif(LIBDSDCC_FOUND AND LIBMBE_FOUND) endif()
if (ENABLE_CHANNELRX_REMOTESINK AND CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON)) if (ENABLE_CHANNELRX_REMOTESINK AND CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
add_subdirectory(remotesink) add_subdirectory(remotesink)

2
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -211,6 +211,8 @@ bool LimeSDROutputGUI::handleMessage(const Message& message)
} else { } else {
ui->calibrationLabel->setStyleSheet("QLabel { background-color : red; }"); ui->calibrationLabel->setStyleSheet("QLabel { background-color : red; }");
} }
return true;
} }
else if (LimeSDROutput::MsgReportStreamInfo::match(message)) else if (LimeSDROutput::MsgReportStreamInfo::match(message))
{ {

2
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -198,6 +198,8 @@ bool LimeSDRInputGUI::handleMessage(const Message& message)
} else { } else {
ui->calibrationLabel->setStyleSheet("QLabel { background-color : red; }"); ui->calibrationLabel->setStyleSheet("QLabel { background-color : red; }");
} }
return true;
} }
else if (LimeSDRInput::MsgReportStreamInfo::match(message)) else if (LimeSDRInput::MsgReportStreamInfo::match(message))
{ {