mirror of https://github.com/f4exb/sdrangel.git
Merge pull request #1916 from srcejon/freq_scanner
Radiosonde CSV header fix
This commit is contained in:
commit
609fff1bd6
|
@ -133,16 +133,3 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
make -j3
|
make -j3
|
||||||
- name: Stop XProtectBehaviorService
|
|
||||||
run: |
|
|
||||||
echo "killing XProject as it can interfere with hdiutil"; sudo pkill -9 XProtect >/dev/null || true;
|
|
||||||
echo "waiting..."; while pgrep XProtect; do sleep 3; done;
|
|
||||||
- name: Build DMG
|
|
||||||
run: |
|
|
||||||
cd build
|
|
||||||
make package -j3
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: ${{ steps.get_filename.outputs.filename }}.dmg
|
|
||||||
path: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg
|
|
||||||
|
|
|
@ -383,7 +383,7 @@ void RadiosondeDemod::applySettings(const RadiosondeDemodSettings& settings, boo
|
||||||
if (newFile)
|
if (newFile)
|
||||||
{
|
{
|
||||||
// Write header
|
// Write header
|
||||||
m_logStream << "Date,Time,Data,Serial,Frame,Lat,Lon,Alt (m),Speed (m/s),V/R (m/s),Heading,P (hPa),T (C), U (%)\n";
|
m_logStream << "Date,Time,Data,Serial,Frame,Lat,Lon,Alt (m),Speed (m/s),V/R (m/s),Heading,P (hPa),T (C),U (%)\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -56,11 +56,11 @@ target_link_libraries(${TARGET_NAME}
|
||||||
${SDRPLAY_LIBRARIES}
|
${SDRPLAY_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Library name is wrong in 3.12 release
|
# /usr/local/lib doesn't seem to be searched by default
|
||||||
if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64))
|
if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64))
|
||||||
add_custom_command(TARGET ${TARGET_NAME}
|
add_custom_command(TARGET ${TARGET_NAME}
|
||||||
POST_BUILD COMMAND
|
POST_BUILD COMMAND
|
||||||
${CMAKE_INSTALL_NAME_TOOL} -change libsdrplay_api_arm64.so.3.12 /Library/SDRplayAPI/3.12.0/lib/libsdrplay_api.so.3.12.0 $<TARGET_FILE:${TARGET_NAME}>)
|
${CMAKE_INSTALL_NAME_TOOL} -change libsdrplay_api.so.3.12 /usr/local/lib/libsdrplay_api.so.3.12 $<TARGET_FILE:${TARGET_NAME}>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
||||||
|
|
Loading…
Reference in New Issue