n5ac/mmtty
1
0
Fork 0
mirror of https://github.com/n5ac/mmtty.git synced 2026-01-04 15:29:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add files via upload

Browse source 
- add COM ports 17-32 to the "PTT &FSK" port selector
- add COM ports 17-32 to the "Radio Command" port selector
- prevent prevent shift > 4000 Hz so CSlideFFT::Create does not divide by zero
This commit is contained in:
Dave 2016-09-27 16:44:30 -04:00 committed by GitHub
parent 9ba67fc376
commit 575c77dc3b
8 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ComLib.h
View file

@ -32,7 +32,10 @@
#include <SHELLAPI.H>
#define VERID "Ver1.70" //K6TU 1.68A -> 1.70A AA6YQ 1.65D->1.66G, JE3HHT 1.67
#define VERBETA "A"
#define VERBETA "D" //JA7UDE 1.70A -> 1.70B G3WYW FT-991 CAT support
//AA6YQ 1.70C added COM16-32 to PTT/FSK port selector and Radio port selector, added 991 to Yaesu Maker selector entry
//AA6YQ 1.70D prevent shift > 4000 Hz so CSlideFFT::Create does not divide by zero
#define VERTTL2 "MMTTY "VERID VERBETA
#define VERTTL VERTTL2" (C) JE3HHT 2000-2010."

BIN
Option.dfm
View file

Binary file not shown.

28
Rtty.cpp
View file

@ -740,22 +740,26 @@ void CFSKDEM::SetLPFFreq(double f)
void CFSKDEM::SetMarkFreq(double d)
{
m_SetMarkFreq = m_AFCMarkFreq = m_MarkFreq = d;
MakeFilter(HMark, m_Tap, ffBPF, DemSamp, m_MarkFreq-m_FilWidth, m_MarkFreq+m_FilWidth, 60, 1.0);
SetIIR(m_iirfw);
m_Phase.SetCarrierFreq(m_AFCMarkFreq);
if( m_AFCSpaceFreq > m_AFCMarkFreq ) m_Phase.SetShift(m_AFCSpaceFreq - m_AFCMarkFreq);
m_AA6YQ.SetMarkFreq(m_AFCMarkFreq);
if ((m_AFCSpaceFreq - d) < 4000) { //1.70D prevent divide by zero in M_SlideFFT.Create
m_SetMarkFreq = m_AFCMarkFreq = m_MarkFreq = d;
MakeFilter(HMark, m_Tap, ffBPF, DemSamp, m_MarkFreq-m_FilWidth, m_MarkFreq+m_FilWidth, 60, 1.0);
SetIIR(m_iirfw);
m_Phase.SetCarrierFreq(m_AFCMarkFreq);
if( m_AFCSpaceFreq > m_AFCMarkFreq ) m_Phase.SetShift(m_AFCSpaceFreq - m_AFCMarkFreq);
m_AA6YQ.SetMarkFreq(m_AFCMarkFreq);
}
}
void CFSKDEM::SetSpaceFreq(double d)
{
m_SetSpaceFreq = m_AFCSpaceFreq = m_SpaceFreq = d;
MakeFilter(HSpace, m_Tap, ffBPF, DemSamp, m_SpaceFreq-m_FilWidth, m_SpaceFreq+m_FilWidth, 60, 1.0);
SetIIR(m_iirfw);
m_Phase.SetCarrierFreq(m_AFCMarkFreq);
if( m_AFCSpaceFreq > m_AFCMarkFreq ) m_Phase.SetShift(m_AFCSpaceFreq - m_AFCMarkFreq);
m_AA6YQ.SetSpaceFreq(m_AFCSpaceFreq);
if ((d - m_AFCMarkFreq) < 4000) { //1.70D prevent divide by zero in M_SlideFFT.Create
m_SetSpaceFreq = m_AFCSpaceFreq = m_SpaceFreq = d;
MakeFilter(HSpace, m_Tap, ffBPF, DemSamp, m_SpaceFreq-m_FilWidth, m_SpaceFreq+m_FilWidth, 60, 1.0);
SetIIR(m_iirfw);
m_Phase.SetCarrierFreq(m_AFCMarkFreq);
if( m_AFCSpaceFreq > m_AFCMarkFreq ) m_Phase.SetShift(m_AFCSpaceFreq - m_AFCMarkFreq);
m_AA6YQ.SetSpaceFreq(m_AFCSpaceFreq);
}
}
void CFSKDEM::AFCMarkFreq(double d)

4
Sound.cpp
View file

@ -60,7 +60,7 @@ __fastcall TSound::TSound(bool CreateSuspended)
m_ReqFifoSize = 0;
m_IDDevice = WAVE_MAPPER;
m_IDOutDevice = WAVE_MAPPER; //AA6YQ 1.6.6
m_IDOutDevice = WAVE_MAPPER; //AA6YQ 1.66
m_playmode = 0;
m_susp = 0;
m_suspack = 0;
@ -1074,7 +1074,7 @@ int __fastcall TSound::DrawFFTWater(Graphics::TBitmap *pBitmap, int sw, int XRD)
//---------------------------------------------------------------------------
//AA6YQ 1.6.6
//AA6YQ 1.66
LPCSTR __fastcall TSound::GetInputSoundcard(unsigned int ID)
{

2
Sound.h
View file

@ -123,7 +123,7 @@ public:
void __fastcall InitWFX(void);
UINT m_IDDevice;
UINT m_IDOutDevice; //AA6YQ 1.6.6
UINT m_IDOutDevice; //AA6YQ 1.66
int m_playmode;
int m_susp;

3
radioset.cpp
View file

@ -29,7 +29,7 @@
//Define Maker groups; index is used by IsCompatible to select the correct Maker based on PollType (RADIO_POLLx)
LPCSTR __MK[]={
"Yaesu FT 1000D, 1000MP, 920", //AA6YQ 1.66 cosmetic, MakerIndex=0
"Yaesu FT 9000, 2000, 950, 450", //AA6YQ 1.66 , MakerIndex=1
"Yaesu FT 9000, 2000, 991, 950, 450", //AA6YQ 1.66 , MakerIndex=1
"Yaesu FT 736, 817, 847, 857, 897", //AA6YQ 1.66 cosmetic, MakerIndex=2
"Icom xx=addr 01-7F", // , MakerIndex=3
"Ten-Tec Omni VI xx=addr 00-64", // , MakerIndex=4
@ -560,3 +560,4 @@ void __fastcall TRADIOSetDlg::SBHelpClick(TObject *Sender)
}
//---------------------------------------------------------------------------

BIN
radioset.dfm
View file

Binary file not shown.

2
radioset.h
View file

@ -108,7 +108,7 @@ private:
int m_DisEvent;
int __fastcall IsXX(void);
int __fastcall IsSame(LPCSTR v, LPCSTR t);
int __fastcall IsCompatible(int PollType, int MakerIndex); //AA6YQ 1.6.6
int __fastcall IsCompatible(int PollType, int MakerIndex); //AA6YQ 1.66
void __fastcall SetMaker(void);
void __fastcall UpdateUI(void);
void __fastcall SetVFOList(void);