mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-28 04:12:32 -04:00
Merge branch 'release-2.5.0'
This commit is contained in:
commit
7eac855608
2
NEWS
2
NEWS
@ -26,6 +26,8 @@ MAP65:
|
||||
decodes.
|
||||
- Provide access to Release Notes from the Help menu
|
||||
- Correct the formatting of Q65 messages to livecq
|
||||
- Repair an Xpol polarization finding hang
|
||||
- Build MAP65 to start without an attached console
|
||||
|
||||
WSJT-X:
|
||||
- Repair a long standing defect that caused UDP Protocol Heartbeat
|
||||
|
@ -26,6 +26,8 @@ MAP65:
|
||||
decodes.
|
||||
- Provide access to Release Notes from the Help menu
|
||||
- Correct the formatting of Q65 messages to livecq
|
||||
- Repair an Xpol polarization finding hang
|
||||
- Build MAP65 to start without an attached console
|
||||
|
||||
WSJT-X:
|
||||
- Repair a long standing defect that caused UDP Protocol Heartbeat
|
||||
|
@ -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_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)
|
||||
install (
|
||||
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH)
|
||||
|
@ -128,7 +128,6 @@ subroutine display(nkeep,ftol)
|
||||
line3(k)(23:27)//line3(k)(35:38)//line3(k)(46:70)// &
|
||||
line3(k)(73:77)
|
||||
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. &
|
||||
index(livecq,' QRT ').gt.0 .or. index(livecq,' CQV ').gt.0 .or. &
|
||||
index(livecq,' CQH ').gt.0) write(19,1029) livecq
|
||||
|
@ -17,7 +17,7 @@ subroutine polfit(y,npts,a)
|
||||
ipk=maxloc(y)
|
||||
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
|
||||
nterms=3
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user