From 5f16dea9d03a5768e7cc8c8346cf6cce5414fce1 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 13 Aug 2014 18:50:44 +0000 Subject: [PATCH] Finished modifications to support the IQ+ XT. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@4231 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 2 +- map65.iss | 30 ++++++++++++++++-------------- soundout.cpp | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index f99c47892..9edd92fcb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/map65.iss b/map65.iss index 3347e92a5..374a72fbb 100644 --- a/map65.iss +++ b/map65.iss @@ -1,25 +1,27 @@ [Setup] AppName=MAP65 -AppVerName=MAP65 Version 2.5 r3653 +AppVerName=MAP65 Version 2.5 r4231 AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT DefaultDirName=c:\MAP65 DefaultGroupName=MAP65 [Files] -Source: "c:\Users\joe\wsjt\map65_install\m65.exe"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\map65_install\map65.exe"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\map65_install\wsjt.ico"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\map65_install\kvasd.exe"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\map65_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\wsjt\map65_install\fftwf-wisdom.exe"; DestDir: "{app}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\wsjt\map65_install\wisdom1.bat"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\map65_install\wisdom2.bat"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\map65_install\afmhot.dat"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\map65_install\blue.dat"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\map65_install\qthid.exe"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist +Source: "C:\JTSDK-QT\src\map65_install\m65.exe"; DestDir: "{app}" +Source: "C:\JTSDK-QT\src\map65_install\map65.exe"; DestDir: "{app}" +Source: "C:\JTSDK-QT\src\map65_install\wsjt.ico"; DestDir: "{app}" +Source: "C:\JTSDK-QT\src\map65_install\kvasd.exe"; DestDir: "{app}" +Source: "C:\JTSDK-QT\src\map65_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist +Source: "C:\JTSDK-QT\src\map65_install\fftwf-wisdom.exe"; DestDir: "{app}"; Flags: onlyifdoesntexist +Source: "C:\JTSDK-QT\src\map65_install\wisdom1.bat"; DestDir: "{app}"; +Source: "C:\JTSDK-QT\src\map65_install\wisdom2.bat"; DestDir: "{app}"; +Source: "C:\JTSDK-QT\src\map65_install\afmhot.dat"; DestDir: "{app}"; +Source: "C:\JTSDK-QT\src\map65_install\blue.dat"; DestDir: "{app}"; +Source: "C:\JTSDK-QT\src\map65_install\qthid.exe"; DestDir: "{app}"; +Source: "C:\JTSDK-QT\src\map65_install\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist +Source: "C:\JTSDK-QT\src\map65_install\platforms\qwindows.dll"; DestDir: "{app}\platforms"; -Source: "c:\Users\joe\wsjt\map65_install\save\dummy"; DestDir: "{app}\save"; + +Source: "C:\JTSDK-QT\src\map65_install\save\dummy"; DestDir: "{app}\save"; [Icons] Name: "{group}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico diff --git a/soundout.cpp b/soundout.cpp index 86c60ae1f..736193d2a 100644 --- a/soundout.cpp +++ b/soundout.cpp @@ -95,7 +95,7 @@ extern "C" int d2aCallback(const void *inputBuffer, void *outputBuffer, if(bTune) { phi += dphi; } else { - phi=qAtan2(qreal(i2a),qreal(i2b)); + phi=qAtan2(qreal(i2b),qreal(i2a)); } i2a=xAmp*qCos(phi); i2b=yAmp*qSin(phi + dPhase);