w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 12:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.5.0'

Browse Source
This commit is contained in:
Bill Somerville 2021-07-05 20:58:15 +01:00
commit 7eac855608
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -26,6 +26,8 @@ MAP65:
decodes. decodes.
- Provide access to Release Notes from the Help menu - Provide access to Release Notes from the Help menu
- Correct the formatting of Q65 messages to livecq - Correct the formatting of Q65 messages to livecq
- Repair an Xpol polarization finding hang
- Build MAP65 to start without an attached console
WSJT-X: WSJT-X:
- Repair a long standing defect that caused UDP Protocol Heartbeat - Repair a long standing defect that caused UDP Protocol Heartbeat

2
Release_Notes.txt
View File

@ -26,6 +26,8 @@ MAP65:
decodes. decodes.
- Provide access to Release Notes from the Help menu - Provide access to Release Notes from the Help menu
- Correct the formatting of Q65 messages to livecq - Correct the formatting of Q65 messages to livecq
- Repair an Xpol polarization finding hang
- Build MAP65 to start without an attached console
WSJT-X: WSJT-X:
- Repair a long standing defect that caused UDP Protocol Heartbeat - Repair a long standing defect that caused UDP Protocol Heartbeat

4
map65/CMakeLists.txt
View File

@ -51,6 +51,10 @@ add_executable (map65 ${map65_CXXSRCS} ${map65_CSRCS} ${map65_GENUISRCS} map65.r
target_include_directories (map65 PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS}) target_include_directories (map65 PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS})
target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb) target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb)
if (WSJT_CREATE_WINMAIN)
set_target_properties (map65 PROPERTIES WIN32_EXECUTABLE ON)
endif (WSJT_CREATE_WINMAIN)
if (WIN32) if (WIN32)
install ( install (
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH) CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH)

1
map65/libm65/display.f90
View File

@ -128,7 +128,6 @@ subroutine display(nkeep,ftol)
line3(k)(23:27)//line3(k)(35:38)//line3(k)(46:70)// & line3(k)(23:27)//line3(k)(35:38)//line3(k)(46:70)// &
line3(k)(73:77) line3(k)(73:77)
if(livecq(56:56).eq.':') livecq(56:58)=' '//livecq(56:57) if(livecq(56:56).eq.':') livecq(56:58)=' '//livecq(56:57)
print*,'= ',trim(livecq)
if(index(livecq,' CQ ').gt.0 .or. index(livecq,' QRZ ').gt.0 .or. & if(index(livecq,' CQ ').gt.0 .or. index(livecq,' QRZ ').gt.0 .or. &
index(livecq,' QRT ').gt.0 .or. index(livecq,' CQV ').gt.0 .or. & index(livecq,' QRT ').gt.0 .or. index(livecq,' CQV ').gt.0 .or. &
index(livecq,' CQH ').gt.0) write(19,1029) livecq index(livecq,' CQH ').gt.0) write(19,1029) livecq

2
map65/libm65/polfit.f90
View File

@ -17,7 +17,7 @@ subroutine polfit(y,npts,a)
ipk=maxloc(y) ipk=maxloc(y)
a(3)=(ipk(1)-1)*45.0 a(3)=(ipk(1)-1)*45.0
deltaa(1:2)=0.1*(a(2)-a(1)) deltaa(1:2)=0.1*a(2)
deltaa(3)=10.0 deltaa(3)=10.0
nterms=3 nterms=3