diff --git a/.gitignore b/.gitignore index 620d3dc..881bac3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ *.lai *.la *.a + +# C++Builder generated files +mmtty.exe +Debug_Build/* diff --git a/ComLib.h b/ComLib.h index 22deafc..5acfcb5 100644 --- a/ComLib.h +++ b/ComLib.h @@ -31,7 +31,7 @@ #include #include -#define VERID "Ver1.68" //AA6YQ 1.65D->1.66G, JE3HHT 1.67 +#define VERID "Ver1.70" //K6TU 1.68A -> 1.70A AA6YQ 1.65D->1.66G, JE3HHT 1.67 #define VERBETA "A" #define VERTTL2 "MMTTY "VERID VERBETA #define VERTTL VERTTL2" (C) JE3HHT 2000-2010." diff --git a/Mmtty.ini b/Mmtty.ini index e695946..e1e16db 100644 --- a/Mmtty.ini +++ b/Mmtty.ini @@ -1,802 +1,802 @@ -[SoundCard] -SampFreq=1.102500e+04 -TxOffset=0.000000e+00 - -[ComboList] -Mark=2125,2000,1700,1445,1275,1170,1000,915 -Shift=23,85,160,170,182,200,240,350,425,850 -Baud=22,45,45.45,50,56,75,100,110,150,200,300 -RST=599,579,569,559,449,339,448,337,225,111 -IIRBW=15,20,25,30,35,40,45,50,60,70,80,90,100,150,200 -VCO=1.0,1.2,1.5,2.0,2.5,3.0,3.25,3.5,3.75,4.0,4.5,5.0,8.0 -LoopFC=30,40,50,80,100,150,200,250,300,350,400,450,500,600,800,1000 - -[Grid] -Log= -QSO= - -[Help] -HTML= -MMTTY=Mmtty.txt -MMTTYLOG=Mmttylog.txt -DIGITAL=Digital.txt -FontName=Arial -FontCharset=0 -FontSize=10 -UseNotePad=0 - -[Window] -WindowState=0 -ShowMacro=1 -MemoryWindow=0 -Disable=0 -StayOnTop=0 - -[WindowFont] -Name=Arial -Charset=0 -Style=0 -Adjust=0 - -[ButtonFont] -Name=Arial -Charset=0 -Style=0 -Adjust=0 - -[Font] -Name=Arial -Size=10 -AdjX=0 -AdjY=0 -Charset=0 -Zero=1 -Style=0 - -[Define] -ControlPanel=1 -FFT=1 -FFTFW=0 -FFTGain=1 -FFTResp=2 -UOS=1 -CodeSet=0 -XYScope=0 -XYScopeSize=0 -XYScopeReverse=0 -XYQuality=0 -PanelSize=2 -AFC=0 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -AutoCR=1 -WardWarp=1 -SendWay=0 -Running=0 -PttTimer=60 -TxNet=0 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -LimitAGC=1 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=1 -SQ=1 -SQLevel=6.000000e+02 -DefFix45=1 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -Rev=0 -SpaceFreq=2.295000e+03 -MarkFreq=2.125000e+03 -VERFFTDEM=1 -DEMTYPE=1 -BaudRate=4.545000e+01 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.500000e+01 -Smooz=3.000000e+02 -FFTTones=4 -SoundRxFifo=12 -SoundTxFifo=4 -SoundPriority=1 -SoundDevice=2 -SoundOutDevice=5 -SoundStereo=0 -SoundMMW= -Tap=512 -IIRBW=60 -Diddle=2 -TxPort=0 -TxdJob=0 -TxFixShift=0 -PTT=NONE -InvPTT=0 -TXUOS=1 -MacroImm=0 -CharLenFile=1024 -DisTX=0 -TXLoop=1 -TXBPF=1 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -RXBPF=0 -RXBPFTAP=64 -RXBPFAFC=1 -RXBPFFW=2.500000e+02 -RXlms=0 -RXlmsDelay=24 -RXlmsMU2=1.000000e-03 -RXlmsGM=9.998000e-01 -RXlmsInv=0 -RXlmsAGC=1 -RXlmsTAP=512 -RXNotchTAP=192 -RXlmsBPF=0 -RXlmsType=1 -RXlmsNotch=2210 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Call=JA7UDE - -[Button] -Hint=1 - -[Log] -Switch=0 -TimeStamp=1 -TimeStampUTC=0 -AutoUTCOffset=0 -UTCOffset=0 -UTCOffsetMin=0 -LogLink=1 -LinkPoll=0 -LinkPTT=0 -PathName= -ShowTimeStamp=1 - -[MMLink] -Name= - -[Dir] -OutFile= -ExtLog= -RecSound= - -[LogFile] -Name= - -[WaterFall] -Palette=0 - -[Input] -Height=97 - -[Color] -RXBack=16777215 -RXChar=0 -RXTXChar=0 -INBack=16777215 -INChar=0 -INTXChar=255 -WaterLow=0 -WaterHigh=16777215 -XYScope=16777215 - -[SysKey] -S1=0 -S2=0 -S3=0 -S4=0 -S5=0 -S6=0 -S7=0 -S8=0 -S9=321 -S10=0 -S11=335 -S12=332 -S13=324 -S14=0 -S15=0 -S16=579 -S17=0 -S18=0 -S19=0 -S20=0 -S21=0 -S22=0 -S23=0 -S24=0 -S25=120 -S26=119 -S27=0 -S28=323 -S29=334 -S30=337 -S31=338 -S32=326 -S33=112 -S34=0 -S35=0 -S36=0 -S37=0 -S38=36 -S39=35 -S40=0 -S41=0 -S42=33 -S43=34 -S44=0 -S45=0 -S46=0 -S47=0 -S48=0 -S49=0 -S50=294 -S51=296 -S52=0 -S53=0 -S54=588 -S55=0 -S56=549 -S57=551 -S58=596 -S59=0 -S60=322 -S61=0 -S62=0 -S63=0 -S64=0 -S65=0 -S66=0 -S67=0 -S68=0 -S69=0 -S70=0 -S71=0 -S72=0 -S73=0 -S74=0 -S75=0 -S76=0 -S77=0 -S78=0 -S79=0 -S80=582 - -[InBtnCol] -M1=0 -M2=0 -M3=0 -M4=0 - -[InBtnKey] -M1=113 -M2=114 -M3=115 -M4=116 - -[InBtnName] -M1=1X1 -M2=DEAR -M3=ANS -M4=BTU - -[InBtn] -M1="%c DE %m" -M2="DEAR %n" -M3="__\r\nRGR %c DE %m ALL OK DEAR %n\r\n" -M4="BTU %c DE %m KN\r\n_\\" - -[MacroTimer] -M1=0 -M2=0 -M3=0 -M4=0 -M5=0 -M6=0 -M7=0 -M8=0 -M9=0 -M10=0 -M11=0 -M12=0 -M13=0 -M14=0 -M15=0 -M16=0 - -[MacroCol] -M1=0 -M2=0 -M3=0 -M4=0 -M5=0 -M6=0 -M7=0 -M8=0 -M9=0 -M10=0 -M11=0 -M12=0 -M13=0 -M14=0 -M15=0 -M16=0 - -[MacroKey] -M1=305 -M2=306 -M3=307 -M4=308 -M5=309 -M6=310 -M7=311 -M8=312 -M9=313 -M10=121 -M11=122 -M12=123 -M13=0 -M14=0 -M15=118 -M16=117 - -[MacroEditKey] -M1=0 -M2=0 -M3=0 -M4=0 -M5=0 -M6=0 -M7=0 -M8=0 -M9=0 -M10=0 -M11=0 -M12=0 -M13=0 -M14=0 -M15=0 -M16=0 - -[MacroName] -M1=1X2 -M2=2X3 -M3=DE3 -M4=UR599 -M5=QANS -M6=M6 -M7=M7 -M8=M8 -M9=SK -M10=EE -M11=M11 -M12=M12 -M13=RY -M14=M14 -M15=CQ2 -M16=CQ1 - -[Macro] -M1="__\r\n%c DE %m %m K\r\n_\\" -M2="__\r\n%c %c DE %m %m %m K\r\n_\\" -M3="__\r\nDE %m %m %m K\r\n_\\" -M4="__\r\nQSL UR 599-599 TU\r\n_\\" -M5="__\r\nOK TNX %n\r\nUR %r %r NAME MAKO %c DE %m TU SK\r\n_\\" -M6="" -M7="" -M8="" -M9="\\\r\n73 TU SK SK\r\n%{TU}\\" -M10="[__~~__~\\" -M11="" -M12="" -M13="\r\nRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRY#" -M14="" -M15="__\r\nRYRY CQ CQ CQ DE %m %m %m\r\nRYRY CQ CQ CQ DE %m %m %m PSE K\r\n_\\" -M16="__\r\nRYRY CQ CQ CQ DE %m %m %m PSE K\r\n_\\" - -[MsgKey] -M1=368 -M2=369 -M3=370 -M4=371 -M5=372 -M6=373 -M7=374 -M8=375 -M9=376 -M10=0 - -[MsgName] -M1=AF CALL1 -M2=FINAL3 -M3=FINAL2 -M4=FINAL -M5=AF CQ2 (GEAR) -M6=AF CQ1 -M7=AF CALL2 (GEAR) -M8=AF CALL1 (QUICK) -M9=FINAL (QUICK) -M10= - -[MsgList] -M1="\\__\r\nRGR %c DE %m %g DEAR %n\r\nTHANK YOU FOR THE NICE REPORT.\r\nYOU ARE %r %r %r IN OSAKA OSAKA OSAKA\r\nMY NAME IS MAKO MAKO MAKO\r\nHOW COPY? BTU %c DE %m KN\r\n_\\" -M2="\\__\\" -M3="\\__\r\nTNX AGAIN DEAR %n CU SK\r\n__\\" -M4="\\__\r\nOK DEAR %n\r\nMANY THANK YOU FOR THE NICE QSO.\r\nI AM LOOKING FORWARD TO SEE YOU AGAIN ON CW AND PSK31.\r\nCUL! AND BEST 73\r\n%c DE %m TU SK SK..\r\n__" -M5="\\__\r\nRGR %c DE %m ALL OK DEAR %n\r\nTHANK YOU FOR THE NICE REPORT.\r\n\r\nI AM RUNNING 50W 50W INTO A SMALL LOOP ANTENNA(ONLY 90CM DIA!)\r\n\r\nRTTY MODEM IS HOMEMADE SOFTWARE ON WINDOWS-95 SOUNDBLASTER.\r\n\r\nTHANK YOU FOR THE NICE QSO DEAR %n\r\nMY QSL IS OK VIA THE BURO.\r\n\r\nHOW? BTU %c DE %m KN\r\n_\\" -M6="\\__\r\n%c %c DE %m %g\r\nTHANK YOU FOR YOUR CALL. I AM GLAD TO SEE YOU ON RTTY.\r\nYOU ARE %r %r %r IN OSAKA OSAKA OSAKA\r\nMY NAME IS MAKO MAKO MAKO\r\nHOW COPY? BTU %c %c DE %m KN\r\n_\\" -M7="\\__\r\nRGR %c DE %m ALL OK DEAR %n\r\nTHANK YOU FOR THE NICE INFO.\r\n\r\nI AM RUNNING 50W 50W INTO A SMALL LOOP ANTENNA(ONLY 90CM DIA!)\r\n\r\nRTTY MODEM IS HOMEMADE SOFTWARE ON WINDOWS-95 SOUNDBLASTER.\r\n\r\nTHANK YOU FOR THE NICE QSO DEAR %n\r\nMY QSL IS OK VIA THE BURO.\r\n\r\nHOW? BTU %c DE %m KN\r\n_\\" -M8="\\__\r\nRGR TNX %n\r\nUR %r %r %r NAME IS MAKO MAKO MAKO\r\nHOW? BTU %c DE %m KN\r\n_\\" -M9="\\__\r\nOK DEAR %n\r\nTNX FB QSO, CUL BEST 73 %c DE %m TU SK..\r\n__\\" -M10= - -[ExtConv] -WDEF1=%YYYY-MM-DD -WLEN1=0 -WDEF2=%HHMM -WLEN2=0 -WDEF3=%EHHMM -WLEN3=0 -WDEF4=%CALL -WLEN4=0 -WDEF5=%HIS -WLEN5=0 -WDEF6=%MY -WLEN6=0 -WDEF7=%FREQ -WLEN7=0 -WDEF8=%MODE -WLEN8=0 -WDEF9=%POWER -WLEN9=0 -WDEF10=%NAME -WLEN10=0 -WDEF11=%QTH -WLEN11=0 -WDEF12=%REM -WLEN12=0 -WDEF13=%QSL -WLEN13=0 -WDEF14=%S -WLEN14=0 -WDEF15=%R -WLEN15=0 -WDEF16=%EOD -WLEN16=0 -WDEF17= -WLEN17=0 -WDEF18= -WLEN18=0 -WDEF19= -WLEN19=0 -WDEF20= -WLEN20=0 -WDEF21= -WLEN21=0 -WDEF22= -WLEN22=0 -WDEF23= -WLEN23=0 -WDEF24= -WLEN24=0 -WDEF25= -WLEN25=0 -WDEF26= -WLEN26=0 -WDEF27= -WLEN27=0 -WDEF28= -WLEN28=0 -WDEF29= -WLEN29=0 -WDEF30= -WLEN30=0 -WDEF31= -WLEN31=0 -WDEF32= -WLEN32=0 -WDEF33= -WLEN33=0 -WDEF34= -WLEN34=0 -WDEF35= -WLEN35=0 -WDEF36= -WLEN36=0 -WDEF37= -WLEN37=0 -WDEF38= -WLEN38=0 -WDEF39= -WLEN39=0 -WDEF40= -WLEN40=0 -WDEF41= -WLEN41=0 -WDEF42= -WLEN42=0 -WDEF43= -WLEN43=0 -WDEF44= -WLEN44=0 -WDEF45= -WLEN45=0 -WDEF46= -WLEN46=0 -WDEF47= -WLEN47=0 -WDEF48= -WLEN48=0 -WDEF49= -WLEN49=0 -WDEF50= -WLEN50=0 -WDEF51= -WLEN51=0 -WDEF52= -WLEN52=0 -WDEF53= -WLEN53=0 -WDEF54= -WLEN54=0 -WDEF55= -WLEN55=0 -WDEF56= -WLEN56=0 -WDEF57= -WLEN57=0 -WDEF58= -WLEN58=0 -WDEF59= -WLEN59=0 -WDEF60= -WLEN60=0 -WDEF61= -WLEN61=0 -WDEF62= -WLEN62=0 -WDEF63= -WLEN63=0 -WDEF64= -WLEN64=0 -RDEF1=%YYYY-MM-DD -RLEN1=0 -RDEF2=%HHMM -RLEN2=0 -RDEF3=%EHHMM -RLEN3=0 -RDEF4=%CALL -RLEN4=0 -RDEF5=%HIS -RLEN5=0 -RDEF6=%MY -RLEN6=0 -RDEF7=%FREQ -RLEN7=0 -RDEF8=%MODE -RLEN8=0 -RDEF9=%POWER -RLEN9=0 -RDEF10=%NAME -RLEN10=0 -RDEF11=%QTH -RLEN11=0 -RDEF12=%REM -RLEN12=0 -RDEF13=%QSL -RLEN13=0 -RDEF14=%S -RLEN14=0 -RDEF15=%R -RLEN15=0 -RDEF16=%EOD -RLEN16=0 -RDEF17= -RLEN17=0 -RDEF18= -RLEN18=0 -RDEF19= -RLEN19=0 -RDEF20= -RLEN20=0 -RDEF21= -RLEN21=0 -RDEF22= -RLEN22=0 -RDEF23= -RLEN23=0 -RDEF24= -RLEN24=0 -RDEF25= -RLEN25=0 -RDEF26= -RLEN26=0 -RDEF27= -RLEN27=0 -RDEF28= -RLEN28=0 -RDEF29= -RLEN29=0 -RDEF30= -RLEN30=0 -RDEF31= -RLEN31=0 -RDEF32= -RLEN32=0 -RDEF33= -RLEN33=0 -RDEF34= -RLEN34=0 -RDEF35= -RLEN35=0 -RDEF36= -RLEN36=0 -RDEF37= -RLEN37=0 -RDEF38= -RLEN38=0 -RDEF39= -RLEN39=0 -RDEF40= -RLEN40=0 -RDEF41= -RLEN41=0 -RDEF42= -RLEN42=0 -RDEF43= -RLEN43=0 -RDEF44= -RLEN44=0 -RDEF45= -RLEN45=0 -RDEF46= -RLEN46=0 -RDEF47= -RLEN47=0 -RDEF48= -RLEN48=0 -RDEF49= -RLEN49=0 -RDEF50= -RLEN50=0 -RDEF51= -RLEN51=0 -RDEF52= -RLEN52=0 -RDEF53= -RLEN53=0 -RDEF54= -RLEN54=0 -RDEF55= -RLEN55=0 -RDEF56= -RLEN56=0 -RDEF57= -RLEN57=0 -RDEF58= -RLEN58=0 -RDEF59= -RLEN59=0 -RDEF60= -RLEN60=0 -RDEF61= -RLEN61=0 -RDEF62= -RLEN62=0 -RDEF63= -RLEN63=0 -RDEF64= -RLEN64=0 - -[LogSet] -TimeZone=73 -DateType=0 -UpperName=0 -UpperQTH=0 -UpperREM=0 -UpperQSL=0 -DefMyRST=0 -Contest=0 -CopyFreq=0 -CopyHis=0 -CopyName=1 -CopyQTH=1 -CopyREM=0 -CopyQSL=1 -CopyREMB4=0 -CheckBand=1 -AutoSave=1 -QSOMacroFlag=0 -QSOMacro1=1 -QSOMacroKey1=0 -QSOMacroStr1="\r\n %c %c UR %R-%N-%N BK\r\n\\" -QSOMacro2=1 -QSOMacroKey2=0 -QSOMacroStr2="\r\nQSL TU QRZ? DE %m %m K\r\n\\" -QSOMacro3=1 -QSOMacroKey3=0 -QSOMacroStr3="\r\n %c SRI QSO B4 QRZ? DE %m %m K\r\n\\" -QSOMacro4=0 -QSOMacroKey4=0 -QSOMacroStr4="\r\nDE %m %m K\r\n\\" -QSOMacro5=0 -QSOMacroKey5=0 -QSOMacroStr5="\r\n %c %R-%N-%N TU\r\n\\" -THRTTY=RTY -THSSTV=STV -THTZ=0 -ClipRSTADIF=1 -Backup=1 -TH5Fields=3,3,7,4,12,28,54 - -[Program] -Name1=&G3PLX PSK31SBW -Command1= -Name2=&IZ8BLY Hellschreiber -Command2= -Name3=&External 3 -Command3= -Name4=E&xternal 4 -Command4= - -[TNC] -PortName=NONE -Type=0 -BaudRate=1200 -BitLen=1 -Stop=0 -Parity=0 -flwXON=1 -flwCTS=0 -Echo=2 - -[RADIO] -PortName=NONE -BaudRate=4800 -BitLen=1 -Stop=1 -Parity=0 -flwXON=0 -flwCTS=0 -usePTT=0 -ByteWait=0 -Cmdxx=0 -CmdInit= -CmdRx=\$000000000F -CmdTx=\$000000010F\w10 -FileGNR= -OpenGNR=0 -PollType=0 -PollInterval=5 -PollOffset=0 - -[AA6YQ] -Version=2 -Enabled=1 -TapsBPF=512 -WidthBPF=3.500000e+01 -TapsBEF=256 -WidthBEF=1.500000e+01 -afcERR=5.000000e+00 - +[SoundCard] +SampFreq=1.102500e+04 +TxOffset=0.000000e+00 + +[ComboList] +Mark=2125,2000,1700,1445,1275,1170,1000,915 +Shift=23,85,160,170,182,200,240,350,425,850 +Baud=22,45,45.45,50,56,75,100,110,150,200,300 +RST=599,579,569,559,449,339,448,337,225,111 +IIRBW=15,20,25,30,35,40,45,50,60,70,80,90,100,150,200 +VCO=1.0,1.2,1.5,2.0,2.5,3.0,3.25,3.5,3.75,4.0,4.5,5.0,8.0 +LoopFC=30,40,50,80,100,150,200,250,300,350,400,450,500,600,800,1000 + +[Grid] +Log= +QSO= + +[Help] +HTML= +MMTTY=Mmtty.txt +MMTTYLOG=Mmttylog.txt +DIGITAL=Digital.txt +FontName=Arial +FontCharset=0 +FontSize=10 +UseNotePad=0 + +[Window] +WindowState=0 +ShowMacro=1 +MemoryWindow=0 +Disable=0 +StayOnTop=0 + +[WindowFont] +Name=Arial +Charset=0 +Style=0 +Adjust=0 + +[ButtonFont] +Name=Arial +Charset=0 +Style=0 +Adjust=0 + +[Font] +Name=Arial +Size=10 +AdjX=0 +AdjY=0 +Charset=0 +Zero=1 +Style=0 + +[Define] +ControlPanel=1 +FFT=1 +FFTFW=0 +FFTGain=1 +FFTResp=2 +UOS=1 +CodeSet=0 +XYScope=0 +XYScopeSize=0 +XYScopeReverse=0 +XYQuality=0 +PanelSize=2 +AFC=0 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +AutoCR=1 +WardWarp=1 +SendWay=0 +Running=0 +PttTimer=60 +TxNet=0 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +LimitAGC=1 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=1 +SQ=1 +SQLevel=6.000000e+02 +DefFix45=1 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +Rev=0 +SpaceFreq=2.295000e+03 +MarkFreq=2.125000e+03 +VERFFTDEM=1 +DEMTYPE=1 +BaudRate=4.545000e+01 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.500000e+01 +Smooz=3.000000e+02 +FFTTones=4 +SoundRxFifo=12 +SoundTxFifo=4 +SoundPriority=1 +SoundDevice=6 +SoundOutDevice=13 +SoundStereo=0 +SoundMMW= +Tap=512 +IIRBW=60 +Diddle=2 +TxPort=0 +TxdJob=0 +TxFixShift=0 +PTT=NONE +InvPTT=0 +TXUOS=1 +MacroImm=0 +CharLenFile=1024 +DisTX=0 +TXLoop=1 +TXBPF=1 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +RXBPF=0 +RXBPFTAP=64 +RXBPFAFC=1 +RXBPFFW=2.500000e+02 +RXlms=0 +RXlmsDelay=24 +RXlmsMU2=1.000000e-03 +RXlmsGM=9.998000e-01 +RXlmsInv=0 +RXlmsAGC=1 +RXlmsTAP=512 +RXNotchTAP=192 +RXlmsBPF=0 +RXlmsType=1 +RXlmsNotch=2210 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Call=JA7UDE + +[Button] +Hint=1 + +[Log] +Switch=0 +TimeStamp=1 +TimeStampUTC=0 +AutoUTCOffset=0 +UTCOffset=0 +UTCOffsetMin=0 +LogLink=1 +LinkPoll=0 +LinkPTT=0 +PathName= +ShowTimeStamp=1 + +[MMLink] +Name= + +[Dir] +OutFile= +ExtLog= +RecSound= + +[LogFile] +Name=Y:\Documents\Ham Radio\mmtty\.MDT + +[WaterFall] +Palette=0 + +[Input] +Height=97 + +[Color] +RXBack=16777215 +RXChar=0 +RXTXChar=0 +INBack=16777215 +INChar=0 +INTXChar=255 +WaterLow=0 +WaterHigh=16777215 +XYScope=16777215 + +[SysKey] +S1=0 +S2=0 +S3=0 +S4=0 +S5=0 +S6=0 +S7=0 +S8=0 +S9=321 +S10=0 +S11=335 +S12=332 +S13=324 +S14=0 +S15=0 +S16=579 +S17=0 +S18=0 +S19=0 +S20=0 +S21=0 +S22=0 +S23=0 +S24=0 +S25=120 +S26=119 +S27=0 +S28=323 +S29=334 +S30=337 +S31=338 +S32=326 +S33=112 +S34=0 +S35=0 +S36=0 +S37=0 +S38=36 +S39=35 +S40=0 +S41=0 +S42=33 +S43=34 +S44=0 +S45=0 +S46=0 +S47=0 +S48=0 +S49=0 +S50=294 +S51=296 +S52=0 +S53=0 +S54=588 +S55=0 +S56=549 +S57=551 +S58=596 +S59=0 +S60=322 +S61=0 +S62=0 +S63=0 +S64=0 +S65=0 +S66=0 +S67=0 +S68=0 +S69=0 +S70=0 +S71=0 +S72=0 +S73=0 +S74=0 +S75=0 +S76=0 +S77=0 +S78=0 +S79=0 +S80=582 + +[InBtnCol] +M1=0 +M2=0 +M3=0 +M4=0 + +[InBtnKey] +M1=113 +M2=114 +M3=115 +M4=116 + +[InBtnName] +M1=1X1 +M2=DEAR +M3=ANS +M4=BTU + +[InBtn] +M1="%c DE %m" +M2="DEAR %n" +M3="__\r\nRGR %c DE %m ALL OK DEAR %n\r\n" +M4="BTU %c DE %m KN\r\n_\\" + +[MacroTimer] +M1=0 +M2=0 +M3=0 +M4=0 +M5=0 +M6=0 +M7=0 +M8=0 +M9=0 +M10=0 +M11=0 +M12=0 +M13=0 +M14=0 +M15=0 +M16=0 + +[MacroCol] +M1=0 +M2=0 +M3=0 +M4=0 +M5=0 +M6=0 +M7=0 +M8=0 +M9=0 +M10=0 +M11=0 +M12=0 +M13=0 +M14=0 +M15=0 +M16=0 + +[MacroKey] +M1=305 +M2=306 +M3=307 +M4=308 +M5=309 +M6=310 +M7=311 +M8=312 +M9=313 +M10=121 +M11=122 +M12=123 +M13=0 +M14=0 +M15=118 +M16=117 + +[MacroEditKey] +M1=0 +M2=0 +M3=0 +M4=0 +M5=0 +M6=0 +M7=0 +M8=0 +M9=0 +M10=0 +M11=0 +M12=0 +M13=0 +M14=0 +M15=0 +M16=0 + +[MacroName] +M1=1X2 +M2=2X3 +M3=DE3 +M4=UR599 +M5=QANS +M6=M6 +M7=M7 +M8=M8 +M9=SK +M10=EE +M11=M11 +M12=M12 +M13=RY +M14=M14 +M15=CQ2 +M16=CQ1 + +[Macro] +M1="__\r\n%c DE %m %m K\r\n_\\" +M2="__\r\n%c %c DE %m %m %m K\r\n_\\" +M3="__\r\nDE %m %m %m K\r\n_\\" +M4="__\r\nQSL UR 599-599 TU\r\n_\\" +M5="__\r\nOK TNX %n\r\nUR %r %r NAME MAKO %c DE %m TU SK\r\n_\\" +M6="" +M7="" +M8="" +M9="\\\r\n73 TU SK SK\r\n%{TU}\\" +M10="[__~~__~\\" +M11="" +M12="" +M13="\r\nRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRY#" +M14="" +M15="__\r\nRYRY CQ CQ CQ DE %m %m %m\r\nRYRY CQ CQ CQ DE %m %m %m PSE K\r\n_\\" +M16="__\r\nRYRY CQ CQ CQ DE %m %m %m PSE K\r\n_\\" + +[MsgKey] +M1=368 +M2=369 +M3=370 +M4=371 +M5=372 +M6=373 +M7=374 +M8=375 +M9=376 +M10=0 + +[MsgName] +M1=AF CALL1 +M2=FINAL3 +M3=FINAL2 +M4=FINAL +M5=AF CQ2 (GEAR) +M6=AF CQ1 +M7=AF CALL2 (GEAR) +M8=AF CALL1 (QUICK) +M9=FINAL (QUICK) +M10= + +[MsgList] +M1="\\__\r\nRGR %c DE %m %g DEAR %n\r\nTHANK YOU FOR THE NICE REPORT.\r\nYOU ARE %r %r %r IN OSAKA OSAKA OSAKA\r\nMY NAME IS MAKO MAKO MAKO\r\nHOW COPY? BTU %c DE %m KN\r\n_\\" +M2="\\__\\" +M3="\\__\r\nTNX AGAIN DEAR %n CU SK\r\n__\\" +M4="\\__\r\nOK DEAR %n\r\nMANY THANK YOU FOR THE NICE QSO.\r\nI AM LOOKING FORWARD TO SEE YOU AGAIN ON CW AND PSK31.\r\nCUL! AND BEST 73\r\n%c DE %m TU SK SK..\r\n__" +M5="\\__\r\nRGR %c DE %m ALL OK DEAR %n\r\nTHANK YOU FOR THE NICE REPORT.\r\n\r\nI AM RUNNING 50W 50W INTO A SMALL LOOP ANTENNA(ONLY 90CM DIA!)\r\n\r\nRTTY MODEM IS HOMEMADE SOFTWARE ON WINDOWS-95 SOUNDBLASTER.\r\n\r\nTHANK YOU FOR THE NICE QSO DEAR %n\r\nMY QSL IS OK VIA THE BURO.\r\n\r\nHOW? BTU %c DE %m KN\r\n_\\" +M6="\\__\r\n%c %c DE %m %g\r\nTHANK YOU FOR YOUR CALL. I AM GLAD TO SEE YOU ON RTTY.\r\nYOU ARE %r %r %r IN OSAKA OSAKA OSAKA\r\nMY NAME IS MAKO MAKO MAKO\r\nHOW COPY? BTU %c %c DE %m KN\r\n_\\" +M7="\\__\r\nRGR %c DE %m ALL OK DEAR %n\r\nTHANK YOU FOR THE NICE INFO.\r\n\r\nI AM RUNNING 50W 50W INTO A SMALL LOOP ANTENNA(ONLY 90CM DIA!)\r\n\r\nRTTY MODEM IS HOMEMADE SOFTWARE ON WINDOWS-95 SOUNDBLASTER.\r\n\r\nTHANK YOU FOR THE NICE QSO DEAR %n\r\nMY QSL IS OK VIA THE BURO.\r\n\r\nHOW? BTU %c DE %m KN\r\n_\\" +M8="\\__\r\nRGR TNX %n\r\nUR %r %r %r NAME IS MAKO MAKO MAKO\r\nHOW? BTU %c DE %m KN\r\n_\\" +M9="\\__\r\nOK DEAR %n\r\nTNX FB QSO, CUL BEST 73 %c DE %m TU SK..\r\n__\\" +M10= + +[ExtConv] +WDEF1=%YYYY-MM-DD +WLEN1=0 +WDEF2=%HHMM +WLEN2=0 +WDEF3=%EHHMM +WLEN3=0 +WDEF4=%CALL +WLEN4=0 +WDEF5=%HIS +WLEN5=0 +WDEF6=%MY +WLEN6=0 +WDEF7=%FREQ +WLEN7=0 +WDEF8=%MODE +WLEN8=0 +WDEF9=%POWER +WLEN9=0 +WDEF10=%NAME +WLEN10=0 +WDEF11=%QTH +WLEN11=0 +WDEF12=%REM +WLEN12=0 +WDEF13=%QSL +WLEN13=0 +WDEF14=%S +WLEN14=0 +WDEF15=%R +WLEN15=0 +WDEF16=%EOD +WLEN16=0 +WDEF17= +WLEN17=0 +WDEF18= +WLEN18=0 +WDEF19= +WLEN19=0 +WDEF20= +WLEN20=0 +WDEF21= +WLEN21=0 +WDEF22= +WLEN22=0 +WDEF23= +WLEN23=0 +WDEF24= +WLEN24=0 +WDEF25= +WLEN25=0 +WDEF26= +WLEN26=0 +WDEF27= +WLEN27=0 +WDEF28= +WLEN28=0 +WDEF29= +WLEN29=0 +WDEF30= +WLEN30=0 +WDEF31= +WLEN31=0 +WDEF32= +WLEN32=0 +WDEF33= +WLEN33=0 +WDEF34= +WLEN34=0 +WDEF35= +WLEN35=0 +WDEF36= +WLEN36=0 +WDEF37= +WLEN37=0 +WDEF38= +WLEN38=0 +WDEF39= +WLEN39=0 +WDEF40= +WLEN40=0 +WDEF41= +WLEN41=0 +WDEF42= +WLEN42=0 +WDEF43= +WLEN43=0 +WDEF44= +WLEN44=0 +WDEF45= +WLEN45=0 +WDEF46= +WLEN46=0 +WDEF47= +WLEN47=0 +WDEF48= +WLEN48=0 +WDEF49= +WLEN49=0 +WDEF50= +WLEN50=0 +WDEF51= +WLEN51=0 +WDEF52= +WLEN52=0 +WDEF53= +WLEN53=0 +WDEF54= +WLEN54=0 +WDEF55= +WLEN55=0 +WDEF56= +WLEN56=0 +WDEF57= +WLEN57=0 +WDEF58= +WLEN58=0 +WDEF59= +WLEN59=0 +WDEF60= +WLEN60=0 +WDEF61= +WLEN61=0 +WDEF62= +WLEN62=0 +WDEF63= +WLEN63=0 +WDEF64= +WLEN64=0 +RDEF1=%YYYY-MM-DD +RLEN1=0 +RDEF2=%HHMM +RLEN2=0 +RDEF3=%EHHMM +RLEN3=0 +RDEF4=%CALL +RLEN4=0 +RDEF5=%HIS +RLEN5=0 +RDEF6=%MY +RLEN6=0 +RDEF7=%FREQ +RLEN7=0 +RDEF8=%MODE +RLEN8=0 +RDEF9=%POWER +RLEN9=0 +RDEF10=%NAME +RLEN10=0 +RDEF11=%QTH +RLEN11=0 +RDEF12=%REM +RLEN12=0 +RDEF13=%QSL +RLEN13=0 +RDEF14=%S +RLEN14=0 +RDEF15=%R +RLEN15=0 +RDEF16=%EOD +RLEN16=0 +RDEF17= +RLEN17=0 +RDEF18= +RLEN18=0 +RDEF19= +RLEN19=0 +RDEF20= +RLEN20=0 +RDEF21= +RLEN21=0 +RDEF22= +RLEN22=0 +RDEF23= +RLEN23=0 +RDEF24= +RLEN24=0 +RDEF25= +RLEN25=0 +RDEF26= +RLEN26=0 +RDEF27= +RLEN27=0 +RDEF28= +RLEN28=0 +RDEF29= +RLEN29=0 +RDEF30= +RLEN30=0 +RDEF31= +RLEN31=0 +RDEF32= +RLEN32=0 +RDEF33= +RLEN33=0 +RDEF34= +RLEN34=0 +RDEF35= +RLEN35=0 +RDEF36= +RLEN36=0 +RDEF37= +RLEN37=0 +RDEF38= +RLEN38=0 +RDEF39= +RLEN39=0 +RDEF40= +RLEN40=0 +RDEF41= +RLEN41=0 +RDEF42= +RLEN42=0 +RDEF43= +RLEN43=0 +RDEF44= +RLEN44=0 +RDEF45= +RLEN45=0 +RDEF46= +RLEN46=0 +RDEF47= +RLEN47=0 +RDEF48= +RLEN48=0 +RDEF49= +RLEN49=0 +RDEF50= +RLEN50=0 +RDEF51= +RLEN51=0 +RDEF52= +RLEN52=0 +RDEF53= +RLEN53=0 +RDEF54= +RLEN54=0 +RDEF55= +RLEN55=0 +RDEF56= +RLEN56=0 +RDEF57= +RLEN57=0 +RDEF58= +RLEN58=0 +RDEF59= +RLEN59=0 +RDEF60= +RLEN60=0 +RDEF61= +RLEN61=0 +RDEF62= +RLEN62=0 +RDEF63= +RLEN63=0 +RDEF64= +RLEN64=0 + +[LogSet] +TimeZone=73 +DateType=0 +UpperName=0 +UpperQTH=0 +UpperREM=0 +UpperQSL=0 +DefMyRST=0 +Contest=0 +CopyFreq=0 +CopyHis=0 +CopyName=1 +CopyQTH=1 +CopyREM=0 +CopyQSL=1 +CopyREMB4=0 +CheckBand=1 +AutoSave=1 +QSOMacroFlag=0 +QSOMacro1=1 +QSOMacroKey1=0 +QSOMacroStr1="\r\n %c %c UR %R-%N-%N BK\r\n\\" +QSOMacro2=1 +QSOMacroKey2=0 +QSOMacroStr2="\r\nQSL TU QRZ? DE %m %m K\r\n\\" +QSOMacro3=1 +QSOMacroKey3=0 +QSOMacroStr3="\r\n %c SRI QSO B4 QRZ? DE %m %m K\r\n\\" +QSOMacro4=0 +QSOMacroKey4=0 +QSOMacroStr4="\r\nDE %m %m K\r\n\\" +QSOMacro5=0 +QSOMacroKey5=0 +QSOMacroStr5="\r\n %c %R-%N-%N TU\r\n\\" +THRTTY=RTY +THSSTV=STV +THTZ=0 +ClipRSTADIF=1 +Backup=1 +TH5Fields=3,3,7,4,12,28,54 + +[Program] +Name1=&G3PLX PSK31SBW +Command1= +Name2=&IZ8BLY Hellschreiber +Command2= +Name3=&External 3 +Command3= +Name4=E&xternal 4 +Command4= + +[TNC] +PortName=NONE +Type=0 +BaudRate=1200 +BitLen=1 +Stop=0 +Parity=0 +flwXON=1 +flwCTS=0 +Echo=2 + +[RADIO] +PortName=NONE +BaudRate=4800 +BitLen=1 +Stop=1 +Parity=0 +flwXON=0 +flwCTS=0 +usePTT=0 +ByteWait=0 +Cmdxx=0 +CmdInit= +CmdRx=RX; +CmdTx=TX;\w10 +FileGNR= +OpenGNR=0 +PollType=0 +PollInterval=5 +PollOffset=0 + +[AA6YQ] +Version=2 +Enabled=1 +TapsBPF=512 +WidthBPF=3.500000e+01 +TapsBEF=256 +WidthBEF=1.500000e+01 +afcERR=5.000000e+00 + diff --git a/Option.cpp b/Option.cpp index 3f9dd85..e525676 100644 --- a/Option.cpp +++ b/Option.cpp @@ -34,6 +34,12 @@ //TAgcSetDlg *AgcSetDlg; int PageIndex = 0; static int PageIndexBPF = 0; + +// Static array to map selected audio devices from radio group index +// to unit number - one each for input & output devices +// K6TU 3/17/2015 +static int InputDeviceMap[16]; +static int OutputDeviceMap[16]; //--------------------------------------------------------------------- __fastcall TOptionDlg::TOptionDlg(TComponent* AOwner) : TForm(AOwner) @@ -58,20 +64,73 @@ __fastcall TOptionDlg::TOptionDlg(TComponent* AOwner) SetComboBox(pllVCOGain, MmttyWd->m_asVCOGain.c_str()); SetComboBox(pllLoopFC, MmttyWd->m_asLoopFC.c_str()); - //AA6YQ 1.66 - InputSoundcards->Items->BeginUpdate(); - InputSoundcards->Items->Clear(); - for( int i = 0; i < 16; i++ ){ - InputSoundcards->Items->Add(MmttyWd->pSound->GetInputSoundcard(i)); - } - InputSoundcards->Items->EndUpdate(); + //K6TU + // Amended enumeration of audio units to review the + // first 32 units for each of input & output. + // + // To address the introduction of DAX by FlexRadio systems + // for their Flex-6000 series radios, only devices that do NOT + // include the substrings "IQ" or "RESERVED" are provided + // as choices to the user. + int CountUnits = 0; + int CurrentUnit = 0; + LPCSTR devName; + char *cString; - OutputSoundcards->Items->BeginUpdate(); - OutputSoundcards->Items->Clear(); - for( int i = 0; i < 16; i++ ){ - OutputSoundcards->Items->Add(MmttyWd->pSound->GetOutputSoundcard(i)); - } - OutputSoundcards->Items->EndUpdate(); + //AA6YQ 1.66 + InputSoundcards->Items->BeginUpdate(); + InputSoundcards->Items->Clear(); + + while (CountUnits < 16 && CurrentUnit < 32) { + devName = MmttyWd->pSound->GetInputSoundcard(CurrentUnit); + cString = AnsiString(devName).c_str(); + + if (strstr(cString, "IQ") || strstr(cString, "RESERVED")) { + // This is one of the FlexRadio audio devices we don't want + CurrentUnit++; + continue; + } + + // This is a device we want... + if (devName) { + InputSoundcards->Items->Add(devName); + InputDeviceMap[CountUnits++] = CurrentUnit++; + } else { + CurrentUnit++; + } + } + // for( int i = 0; i < 16; i++ ){ + // InputSoundcards->Items->Add(MmttyWd->pSound->GetInputSoundcard(i)); + // } + InputSoundcards->Items->EndUpdate(); + + OutputSoundcards->Items->BeginUpdate(); + OutputSoundcards->Items->Clear(); + + CountUnits = 0; + CurrentUnit = 0; + while (CountUnits < 16 && CurrentUnit < 32) { + devName = MmttyWd->pSound->GetOutputSoundcard(CurrentUnit); + cString = AnsiString(devName).c_str(); + + if (strstr(cString, "IQ") || strstr(cString, "RESERVED")) { + // This is one of the FlexRadio audio devices we don't want + CurrentUnit++; + continue; + } + + // This is a device we want... + if (devName) { + OutputSoundcards->Items->Add(devName); + OutputDeviceMap[CountUnits++] = CurrentUnit++; + } else { + CurrentUnit++; + } + } + //for( int i = 0; i < 16; i++ ){ + // OutputSoundcards->Items->Add(MmttyWd->pSound->GetOutputSoundcard(i)); + //} + OutputSoundcards->Items->EndUpdate(); if( Font->Charset != SHIFTJIS_CHARSET ){ @@ -135,7 +194,7 @@ __fastcall TOptionDlg::TOptionDlg(TComponent* AOwner) TxPort->Items->Strings[0] = "Sound"; TxPort->Items->Strings[1] = "Sound + COM-TxD (FSK)"; - CBFix45->Caption = "Fixes 45.45 baud"; + CBFix45->Caption = "Fixes 45.45 baud"; SBIN1->Font->Name = sys.m_BtnFontName; SBIN1->Font->Charset = sys.m_BtnFontCharset; SBIN2->Font->Name = sys.m_BtnFontName; @@ -178,10 +237,10 @@ __fastcall TOptionDlg::TOptionDlg(TComponent* AOwner) //AA6YQ 1.66B moved here from TOptionDlg::DevNoDropDown - m_MMListW.QueryList("MMW"); - for( int i = 0; i < m_MMListW.GetCount(); i++ ){ - DevNo->Items->Add(m_MMListW.GetItemName(i)); - DevOutNo->Items->Add(m_MMListW.GetItemName(i)); + m_MMListW.QueryList("MMW"); + for( int i = 0; i < m_MMListW.GetCount(); i++ ){ + DevNo->Items->Add(m_MMListW.GetItemName(i)); + DevOutNo->Items->Add(m_MMListW.GetItemName(i)); } } @@ -282,8 +341,8 @@ void __fastcall TOptionDlg::UpdateUI(void) int dd; f = (sscanf(AnsiString(DevNo->Text).c_str(), "%d", &dd) == 1 ); //JA7UDE 0428 GB4->Enabled = f; - SetGroupEnabled(GB4); - Source->Enabled = f; + SetGroupEnabled(GB4); + Source->Enabled = f; } //--------------------------------------------------------------------------- TSpeedButton *__fastcall TOptionDlg::GetSB(int n) @@ -324,9 +383,9 @@ void __fastcall TOptionDlg::UpdateMacro(void) int __fastcall TOptionDlg::IsSoundcard(LPCSTR t) { for( ; ; t++ ){ - if (*t=='\0') { - return 1; - } + if (*t=='\0') { + return 1; + } else if ((*t<'0')||(*t>'9')){ return 0; } @@ -470,21 +529,45 @@ int __fastcall TOptionDlg::Execute(CFSKDEM *fp, CFSKMOD *mp) DevOutNo->Text = sys.m_SoundOutDevice; } - //AA6YQ 1.66 + //AA6YQ 1.66 + //K6TU if (IsSoundcard (AnsiString(DevNo->Text).c_str())) { //JA7UDE 0428 - InputSoundcards->ItemIndex = atoi(AnsiString(DevNo->Text).c_str()); //AA6YQ 1.66 //JA7UDE 0428 - } - else { - InputSoundcards->ItemIndex =-1; - } + // Assuming that devices haven't been re-enumerated by Windows, + // we need to find the corresponding unit number in the map in order + // to select the right unit + int unitNum = atoi(AnsiString(DevNo->Text).c_str()); + int i; + for (i=0; i < 16; i++) { + if (InputDeviceMap[i] == unitNum) { + break; + } + } + InputSoundcards->ItemIndex = i != 16 ? i : -1; + // InputSoundcards->ItemIndex = atoi(AnsiString(DevNo->Text).c_str()); //AA6YQ 1.66 //JA7UDE 0428 + } + else { + InputSoundcards->ItemIndex =-1; + } - //AA6YQ 1.66 + //AA6YQ 1.66 + //K6TU if (IsSoundcard (AnsiString(DevOutNo->Text).c_str())) { //JA7UDE 0428 - OutputSoundcards->ItemIndex = atoi(AnsiString(DevOutNo->Text).c_str()); //AA6YQ 1.66 //JA7UDE 0428 - } - else { - OutputSoundcards->ItemIndex =-1; - } + // Assuming that devices haven't been re-enumerated by Windows, + // we need to find the corresponding unit number in the map in order + // to select the right unit + int unitNum = atoi(AnsiString(DevOutNo->Text).c_str()); + int i; + for (i=0; i < 16; i++) { + if (OutputDeviceMap[i] == unitNum) { + break; + } + } + OutputSoundcards->ItemIndex = i != 16 ? i : -1; + // OutputSoundcards->ItemIndex = atoi(AnsiString(DevOutNo->Text).c_str()); //AA6YQ 1.66 //JA7UDE 0428 + } + else { + OutputSoundcards->ItemIndex =-1; + } Source->ItemIndex = sys.m_SoundStereo; @@ -738,7 +821,9 @@ int __fastcall TOptionDlg::Execute(CFSKDEM *fp, CFSKMOD *mp) sys.m_SoundPriority = SoundPriority->ItemIndex; if( sscanf(AnsiString(DevNo->Text).c_str(), "%d", &dd) == 1 ){ //JA7UDE 0428 - sys.m_SoundDevice = dd; + // Find the unit number in the input map and update + sys.m_SoundDevice = InputDeviceMap[dd]; + // sys.m_SoundDevice = dd; } else { sys.m_SoundDevice = -2; @@ -747,7 +832,9 @@ int __fastcall TOptionDlg::Execute(CFSKDEM *fp, CFSKMOD *mp) //AA6YQ 1.66 if( sscanf(AnsiString(DevOutNo->Text).c_str(), "%d", &dd) == 1 ){ //JA7UDE 0428 - sys.m_SoundOutDevice = dd; + // Find the unit in the output map and update + sys.m_SoundOutDevice = OutputDeviceMap[dd]; + // sys.m_SoundOutDevice = dd; } else { sys.m_SoundOutDevice = -2; diff --git a/Option.dfm b/Option.dfm index 01f7a19..35ee220 100644 Binary files a/Option.dfm and b/Option.dfm differ diff --git a/UserPara.ini b/UserPara.ini index daaa4c1..6de49e4 100644 --- a/UserPara.ini +++ b/UserPara.ini @@ -1,739 +1,739 @@ -[Define0] -Name=Standard RTTY -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=0 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=0 -RXBPFTAP=56 -RXBPFAFC=1 -RXBPFFW=1.000000e+02 -RXlms=0 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXNotchTAP=72 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2136 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=0 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=4 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=60 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define1] -Name=Fluttered signals -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=0 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=1 -RXBPFTAP=56 -RXBPFAFC=1 -RXBPFFW=1.000000e+02 -RXlms=0 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXNotchTAP=72 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2136 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=0 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=4 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=90 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define7] -Name=23Hz RTTY (MTTY) -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=0 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=2.300000e+01 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=2.300000e+01 -RXBPF=1 -RXBPFTAP=80 -RXBPFAFC=1 -RXBPFFW=0.000000e+00 -RXlms=0 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXNotchTAP=72 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2210 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=2 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=3 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=20 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=4.000000e+01 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define2] -Name=Fluttered signals (FIR) -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=0 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=1 -RXBPFTAP=56 -RXBPFAFC=1 -RXBPFFW=1.000000e+02 -RXlms=0 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXNotchTAP=72 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2096 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=1 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=4 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=90 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define1025] -Name=Default -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=0 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=0 -SQ=0 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=0 -RXBPFTAP=56 -RXBPFAFC=1 -RXBPFFW=1.000000e+02 -RXlms=0 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXNotchTAP=72 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2210 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=0 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=4 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=60 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -LimitAGC=1 -TXLoop=1 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define1026] -Name=Return to the startup -Enabled=1 -AFC=0 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=0 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=1 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=0 -RXBPFTAP=64 -RXBPFAFC=1 -RXBPFFW=2.500000e+02 -RXlms=0 -RXlmsDelay=24 -RXlmsMU2=1.000000e-03 -RXlmsGM=9.998000e-01 -RXlmsAGC=1 -RXlmsInv=0 -RXlmsTAP=512 -RXNotchTAP=192 -RXlmsBPF=0 -RXlmsType=1 -RXlmsNotch=2210 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=1 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=3 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.500000e+01 -Smooz=3.000000e+02 -Tap=512 -IIRBW=60 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -LimitAGC=1 -TXLoop=1 -AA6YQ.Version=2 -AA6YQ.Enabled=1 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define3] -Name=Multi-path -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=1 -ATCTime=4 -Majority=1 -IgnoreFreamError=1 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=0 -RXBPFTAP=56 -RXBPFAFC=1 -RXBPFFW=1.000000e+02 -RXlms=0 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXNotchTAP=72 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2094 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=0 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=3 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=90 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -FFTTones=4 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define4] -Name=AA6YQ FIR512 -Enabled=1 -AFC=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -UOS=1 -TxNet=0 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -LimitAGC=1 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=1 -SQ=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXLoop=1 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=0 -RXBPFTAP=64 -RXBPFAFC=1 -RXBPFFW=2.500000e+02 -RXlms=0 -RXlmsDelay=24 -RXlmsMU2=1.000000e-03 -RXlmsGM=9.998000e-01 -RXlmsAGC=1 -RXlmsInv=0 -RXlmsTAP=512 -RXNotchTAP=192 -RXlmsBPF=0 -RXlmsType=1 -RXlmsNotch=2199 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=1 -BaudRate=4.545000e+01 -TTYBitLen=5 -TTYStopLen=3 -TTYParity=0 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.500000e+01 -Smooz=3.000000e+02 -Tap=512 -IIRBW=60 -FFTTones=4 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -AA6YQ.Version=2 -AA6YQ.Enabled=1 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define5] -Name=FFT demodulator -Enabled=1 -AFCFixShift=1 -AFCSQ=32 -AFCTime=8.000000e+00 -AFCSweep=1.000000e+00 -TxNet=1 -TxDisRev=0 -LimitDxGain=2.000000e+02 -LimitOverSampling=0 -ATC=0 -ATCTime=4 -Majority=1 -IgnoreFreamError=1 -SQLevel=6.000000e+02 -DefMarkFreq=2.125000e+03 -DefShift=1.700000e+02 -DefStopLen=0 -OutputGain=2.457600e+04 -TXECHO=0 -TXBPFTAP=48 -TXLPF=0 -TXLPFFreq=1.000000e+02 -TXWaitType=0 -TXCharWait=0 -TXDiddleWait=0 -TXCharWaitDiddle=0 -TXRandomDiddle=0 -TXWaitTimerDiddle=0 -Rev=0 -ShiftFreq=1.700000e+02 -RXBPF=1 -RXBPFTAP=64 -RXBPFAFC=1 -RXBPFFW=2.500000e+02 -RXlmsDelay=0 -RXlmsMU2=3.000000e-03 -RXlmsGM=9.999000e-01 -RXlmsAGC=0 -RXlmsInv=0 -RXlmsTAP=56 -RXlmsBPF=1 -RXlmsType=1 -RXlmsNotch=2203 -RXlmsNotch2=0 -RXlmsTwoNotch=0 -DEMTYPE=3 -BaudRate=4.545000e+01 -SmoozType=0 -SmoozOrder=5 -SmoozIIR=4.000000e+01 -Smooz=7.000000e+01 -Tap=72 -IIRBW=60 -pllVcoGain=3.000000e+00 -pllLoopOrder=2 -pllLoopFC=2.500000e+02 -pllOutOrder=4 -pllOutFC=2.000000e+02 -Diddle=2 -TxFixShift=0 -InvPTT=0 -TXUOS=1 -AFC=1 -UOS=1 -LimitAGC=1 -SQ=1 -TXLoop=1 -RXlms=0 -RXNotchTAP=72 -TTYBitLen=5 -TTYStopLen=4 -TTYParity=0 -FFTTones=4 -AA6YQ.Version=2 -AA6YQ.Enabled=0 -AA6YQ.TapsBPF=512 -AA6YQ.WidthBPF=3.500000e+01 -AA6YQ.TapsBEF=256 -AA6YQ.WidthBEF=1.500000e+01 -AA6YQ.afcERR=5.000000e+00 - -[Define6] -Enabled=0 - +[Define0] +Name=Standard RTTY +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=0 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=0 +RXBPFTAP=56 +RXBPFAFC=1 +RXBPFFW=1.000000e+02 +RXlms=0 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXNotchTAP=72 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2136 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=0 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=4 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=60 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define1] +Name=Fluttered signals +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=0 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=1 +RXBPFTAP=56 +RXBPFAFC=1 +RXBPFFW=1.000000e+02 +RXlms=0 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXNotchTAP=72 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2136 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=0 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=4 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=90 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define7] +Name=23Hz RTTY (MTTY) +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=0 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=2.300000e+01 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=2.300000e+01 +RXBPF=1 +RXBPFTAP=80 +RXBPFAFC=1 +RXBPFFW=0.000000e+00 +RXlms=0 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXNotchTAP=72 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2210 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=2 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=3 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=20 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=4.000000e+01 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define2] +Name=Fluttered signals (FIR) +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=0 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=1 +RXBPFTAP=56 +RXBPFAFC=1 +RXBPFFW=1.000000e+02 +RXlms=0 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXNotchTAP=72 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2096 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=1 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=4 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=90 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define1025] +Name=Default +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=0 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=0 +SQ=0 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=2 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=0 +RXBPFTAP=56 +RXBPFAFC=1 +RXBPFFW=1.000000e+02 +RXlms=0 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXNotchTAP=72 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2210 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=0 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=4 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=60 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +LimitAGC=1 +TXLoop=1 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define1026] +Name=Return to the startup +Enabled=1 +AFC=0 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=0 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=1 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=0 +RXBPFTAP=64 +RXBPFAFC=1 +RXBPFFW=2.500000e+02 +RXlms=0 +RXlmsDelay=24 +RXlmsMU2=1.000000e-03 +RXlmsGM=9.998000e-01 +RXlmsAGC=1 +RXlmsInv=0 +RXlmsTAP=512 +RXNotchTAP=192 +RXlmsBPF=0 +RXlmsType=1 +RXlmsNotch=2210 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=1 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=3 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.500000e+01 +Smooz=3.000000e+02 +Tap=512 +IIRBW=60 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +LimitAGC=1 +TXLoop=1 +AA6YQ.Version=2 +AA6YQ.Enabled=1 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define3] +Name=Multi-path +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=1 +ATCTime=4 +Majority=1 +IgnoreFreamError=1 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=0 +RXBPFTAP=56 +RXBPFAFC=1 +RXBPFFW=1.000000e+02 +RXlms=0 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXNotchTAP=72 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2094 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=0 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=3 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=90 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +FFTTones=4 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define4] +Name=AA6YQ FIR512 +Enabled=1 +AFC=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +UOS=1 +TxNet=0 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +LimitAGC=1 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=1 +SQ=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXLoop=1 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=0 +RXBPFTAP=64 +RXBPFAFC=1 +RXBPFFW=2.500000e+02 +RXlms=0 +RXlmsDelay=24 +RXlmsMU2=1.000000e-03 +RXlmsGM=9.998000e-01 +RXlmsAGC=1 +RXlmsInv=0 +RXlmsTAP=512 +RXNotchTAP=192 +RXlmsBPF=0 +RXlmsType=1 +RXlmsNotch=2199 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=1 +BaudRate=4.545000e+01 +TTYBitLen=5 +TTYStopLen=3 +TTYParity=0 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.500000e+01 +Smooz=3.000000e+02 +Tap=512 +IIRBW=60 +FFTTones=4 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +AA6YQ.Version=2 +AA6YQ.Enabled=1 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define5] +Name=FFT demodulator +Enabled=1 +AFCFixShift=1 +AFCSQ=32 +AFCTime=8.000000e+00 +AFCSweep=1.000000e+00 +TxNet=1 +TxDisRev=0 +LimitDxGain=2.000000e+02 +LimitOverSampling=0 +ATC=0 +ATCTime=4 +Majority=1 +IgnoreFreamError=1 +SQLevel=6.000000e+02 +DefMarkFreq=2.125000e+03 +DefShift=1.700000e+02 +DefStopLen=0 +OutputGain=2.457600e+04 +TXECHO=0 +TXBPFTAP=48 +TXLPF=0 +TXLPFFreq=1.000000e+02 +TXWaitType=0 +TXCharWait=0 +TXDiddleWait=0 +TXCharWaitDiddle=0 +TXRandomDiddle=0 +TXWaitTimerDiddle=0 +Rev=0 +ShiftFreq=1.700000e+02 +RXBPF=1 +RXBPFTAP=64 +RXBPFAFC=1 +RXBPFFW=2.500000e+02 +RXlmsDelay=0 +RXlmsMU2=3.000000e-03 +RXlmsGM=9.999000e-01 +RXlmsAGC=0 +RXlmsInv=0 +RXlmsTAP=56 +RXlmsBPF=1 +RXlmsType=1 +RXlmsNotch=2203 +RXlmsNotch2=0 +RXlmsTwoNotch=0 +DEMTYPE=3 +BaudRate=4.545000e+01 +SmoozType=0 +SmoozOrder=5 +SmoozIIR=4.000000e+01 +Smooz=7.000000e+01 +Tap=72 +IIRBW=60 +pllVcoGain=3.000000e+00 +pllLoopOrder=2 +pllLoopFC=2.500000e+02 +pllOutOrder=4 +pllOutFC=2.000000e+02 +Diddle=2 +TxFixShift=0 +InvPTT=0 +TXUOS=1 +AFC=1 +UOS=1 +LimitAGC=1 +SQ=1 +TXLoop=1 +RXlms=0 +RXNotchTAP=72 +TTYBitLen=5 +TTYStopLen=4 +TTYParity=0 +FFTTones=4 +AA6YQ.Version=2 +AA6YQ.Enabled=0 +AA6YQ.TapsBPF=512 +AA6YQ.WidthBPF=3.500000e+01 +AA6YQ.TapsBEF=256 +AA6YQ.WidthBEF=1.500000e+01 +AA6YQ.afcERR=5.000000e+00 + +[Define6] +Enabled=0 + diff --git a/VerDsp.cpp b/VerDsp.cpp index 99a7534..86a1b7b 100644 --- a/VerDsp.cpp +++ b/VerDsp.cpp @@ -46,6 +46,7 @@ __fastcall TVerDspDlg::TVerDspDlg(TComponent* AOwner) Version->Caption = VERTTL; LTNX->Caption = "------ Programming ------\r\n" + "Stu, K6TU (Updated 1.66A -> 1.70A)\r\n" "Dave, AA6YQ (updated 1.65D -> 1.66G)\r\n" "------ Help, FAQ and Remote mode, etc... ------\r\n" "Jan, KX2A Ken, VE5KC Bill, KB4IJ Andy, K3UK(KB2EOQ)\r\n" diff --git a/VerDsp.dfm b/VerDsp.dfm index 28d8115..0ae01f5 100644 Binary files a/VerDsp.dfm and b/VerDsp.dfm differ diff --git a/mmtty.cbproj b/mmtty.cbproj index 57bc5ae..ac12049 100644 --- a/mmtty.cbproj +++ b/mmtty.cbproj @@ -1,470 +1,473 @@ - - - {8A19E7D5-B824-4AED-A872-E0689B281994} - CppVCLApplication - mmtty.cpp - True - Debug - 14.6 - Application - VCL - Win32 - 1 - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - - - true - Base - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - 1041 - Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) - rtl.lib;vcl.lib;vclx.lib;dbrtl.lib;vcldb.lib;bdertl.lib;vcldbx.lib - vclx.bpi;rtl.bpi;vcl.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;bcbsmp.bpi;teeui.bpi;teedb.bpi;tee.bpi;ibsmp.bpi;inetdb.bpi;inet.bpi;$(PackageImports) - true - Windows - .\;$(BDS)\lib;$(BDS)\lib\obj;$(DCC_IncludePath) - $(BDS)\include;$(BDS)\include\vcl;$(BRCC_IncludePath) - true - $(BDS)\include;$(BDS)\include\vcl;$(BCC_IncludePath) - $(BDS)\include;$(BDS)\include\vcl;$(TASM_IncludePath) - . - exe - rtl.lib;vcl.lib;vclx.lib;dbrtl.lib;vcldb.lib;bdertl.lib;vcldbx.lib - None - /w2 - -M - JPHNE - .\;$(BDS)\lib;$(BDS)\lib\obj;$(DCC_UnitSearchPath) - $(BDS)\lib\obj;$(BDS)\lib;$(BDS)\lib\psdk;$(ILINK_LibraryPath) - - - $(BDS)\bin\default_app.manifest - true - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - $(BDSINCLUDE)\windows\vcl;$(IncludePath) - 1033 - -tWM -Vx -d -Ve - mmtty_Icon.ico - - - $(BDSINCLUDE)\windows\vcl;$(IncludePath) - mmtty_Icon.ico - - - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath);$(ILINK_LibraryPath) - DEBUG;$(DCC_Define);$(DCC_Define) - true - Debug_Build - true - true - true - true - Full - -M -V - true - true - false - - - false - false - false - false - None - true - 1033 - _DEBUG;$(BCC_Defines);$(BCC_Defines) - -tWM -Vx -d -Ve -k - - - _DEBUG;$(BCC_Defines);$(BCC_Defines) - - - Release_Build - -M -$O+ - $(BDS)\lib\release;$(ILINK_LibraryPath);$(ILINK_LibraryPath) - - - NDEBUG;$(BCC_Defines);$(BCC_Defines) - -tWM -Vx -d -Ve -r - - - NDEBUG;$(BCC_Defines);$(BCC_Defines) - - - - 9 -
ClockAdjDlg
- ClockAdj.h - 27 -
- - 44 - CLX.h - 14 - - - 31 - ComLib.h - 2 - - - 26 - Comm.h - 10 - - - 7 -
ConvDefDlg
- ConvDef.h - 23 -
- - 35 - country.h - 17 - - - 4 - cradio.h - 32 - - - 29 - ctnc.h - 1 - - - 41 -
EditDlgBox
- EditDlg.h - 11 -
- - 7 - Fft.h - 23 - - - 33 - fir.h - 3 - - - 38 -
FreqDispDlg
- FreqDisp.h - 20 -
- - 42 - Hamlog5.h - 13 - - - 36 -
InputWinDlg
- InputWin.h - 19 -
- - LogConv.h - 22 - - - 44 - LogFile.h - 14 - - - 37 - Loglink.h - 21 - - - 43 -
LogListDlg
- LogList.h - 15 -
- - 26 -
LogSetDlg
- LogSet.h - 10 -
- - 34 -
MacroKeyDlg
- MacroKey.h - 18 -
- - -1 -
MmttyWd
- Main.h - 1 -
- - 34 - mmcg.h - 18 - - - 36 -
MmcgDlgBox
- MmcgDlg.h - 19 -
- - 39 - 16 - - - 38 - MMlink.h - 20 - - - 40 - 12 - - - -1 - 0 - - - 40 - 12 - - - 41 - 11 - - - 9 -
OptionDlg
- Option.h - 27 -
- - 6 -
PlayDlgBox
- PlayDlg.h - 24 -
- - 39 -
QSODlgBox
- QsoDlg.h - 16 -
- - 33 -
RADIOSetDlg
- radioset.h - 3 -
- - 5 - Rtty.h - 28 - - - 8 -
TScope
- Scope.h - 25 -
- - 31 -
SendFileDlg
- SendFile.h - 2 -
- - 5 -
SetHelpBox
- SetHelp.h - 28 -
- - 8 -
ShortCutDlg
- ShortCut.h - 25 -
- - 4 - Sound.h - 32 - - - 42 -
TextEditDlg
- TextEdit.h - 13 -
- - 43 -
TH5LenDlg
- TH5Len.h - 15 -
- - 30 -
TNCSetDlg
- TncSet.h - 0 -
- - 35 -
TxdDlgBox
- TxdDlg.h - 17 -
- - 37 -
VerDspDlg
- VerDsp.h - 21 -
- - 6 - Wave.h - 24 - - - - - - - - - - - - - - - - - - - - - - - - - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - -
- - - - CPlusPlusBuilder.Personality.12 - CppVCLApplication - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1041 - 932 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - False - True - True - - - mmtty.cpp - - - - - True - False - - - 12 - -
+ + + {8A19E7D5-B824-4AED-A872-E0689B281994} + CppVCLApplication + mmtty.cpp + True + Debug + 16.1 + Application + VCL + Win32 + 1 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + mmtty + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + 1041 + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + rtl.lib;vcl.lib;vclx.lib;dbrtl.lib;vcldb.lib;bdertl.lib;vcldbx.lib + vclx.bpi;rtl.bpi;vcl.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;bcbsmp.bpi;teeui.bpi;teedb.bpi;tee.bpi;ibsmp.bpi;inetdb.bpi;inet.bpi;$(PackageImports) + true + Windows + .\;$(BDS)\lib;$(BDS)\lib\obj;$(DCC_IncludePath) + $(BDS)\include;$(BDS)\include\vcl;$(BRCC_IncludePath) + true + $(BDS)\include;$(BDS)\include\vcl;$(BCC_IncludePath) + $(BDS)\include;$(BDS)\include\vcl;$(TASM_IncludePath) + . + rtl.lib;vcl.lib;vclx.lib;dbrtl.lib;vcldb.lib;bdertl.lib;vcldbx.lib + None + /w2 + -M + JPHNE + .\;$(BDS)\lib;$(BDS)\lib\obj;$(DCC_UnitSearchPath) + $(BDS)\lib\obj;$(BDS)\lib;$(BDS)\lib\psdk;$(ILINK_LibraryPath) + + + exe + $(BDS)\bin\default_app.manifest + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + $(BDSINCLUDE)\windows\vcl;$(IncludePath) + 1033 + -tWM -Vx -d -Ve + mmtty_Icon.ico + + + $(BDSINCLUDE)\windows\vcl;$(IncludePath) + mmtty_Icon.ico + + + true + true + true + $(BDS)\lib\debug;$(ILINK_LibraryPath);$(ILINK_LibraryPath) + DEBUG;$(DCC_Define);$(DCC_Define) + true + Debug_Build + true + true + true + true + Full + -M -V + true + true + false + + + C:\Users\Public\Documents\Embarcadero\Studio\15.0\DCP\;$(BDS)\lib\win32\release\;$(ILINK_LibraryPath) + false + false + false + false + None + true + 1033 + _DEBUG;$(BCC_Defines);$(BCC_Defines) + -tWM -Vx -d -Ve -k + + + _DEBUG;$(BCC_Defines);$(BCC_Defines) + + + Release_Build + -M -$O+ + $(BDS)\lib\release;$(ILINK_LibraryPath);$(ILINK_LibraryPath) + + + NDEBUG;$(BCC_Defines);$(BCC_Defines) + -tWM -Vx -d -Ve -r + + + NDEBUG;$(BCC_Defines);$(BCC_Defines) + + + + 9 +
ClockAdjDlg
+ ClockAdj.h + 27 +
+ + 44 + CLX.h + 14 + + + 31 + ComLib.h + 2 + + + 26 + Comm.h + 10 + + + 7 +
ConvDefDlg
+ ConvDef.h + 23 +
+ + 35 + country.h + 17 + + + 4 + cradio.h + 32 + + + 29 + ctnc.h + 1 + + + 41 +
EditDlgBox
+ EditDlg.h + 11 +
+ + 7 + Fft.h + 23 + + + 33 + fir.h + 3 + + + 38 +
FreqDispDlg
+ FreqDisp.h + 20 +
+ + 42 + Hamlog5.h + 13 + + + 36 +
InputWinDlg
+ InputWin.h + 19 +
+ + LogConv.h + 22 + + + 44 + LogFile.h + 14 + + + 37 + Loglink.h + 21 + + + 43 +
LogListDlg
+ LogList.h + 15 +
+ + 26 +
LogSetDlg
+ LogSet.h + 10 +
+ + 34 +
MacroKeyDlg
+ MacroKey.h + 18 +
+ + -1 +
MmttyWd
+ Main.h + 1 +
+ + 34 + mmcg.h + 18 + + + 36 +
MmcgDlgBox
+ MmcgDlg.h + 19 +
+ + 39 + 16 + + + 38 + MMlink.h + 20 + + + 40 + 12 + + + -1 + 0 + + + 40 + 12 + + + 41 + 11 + + + 9 +
OptionDlg
+ Option.h + 27 +
+ + 6 +
PlayDlgBox
+ PlayDlg.h + 24 +
+ + 39 +
QSODlgBox
+ QsoDlg.h + 16 +
+ + 33 +
RADIOSetDlg
+ radioset.h + 3 +
+ + 5 + Rtty.h + 28 + + + 8 +
TScope
+ Scope.h + 25 +
+ + 31 +
SendFileDlg
+ SendFile.h + 2 +
+ + 5 +
SetHelpBox
+ SetHelp.h + 28 +
+ + 8 +
ShortCutDlg
+ ShortCut.h + 25 +
+ + 4 + Sound.h + 32 + + + 42 +
TextEditDlg
+ TextEdit.h + 13 +
+ + 43 +
TH5LenDlg
+ TH5Len.h + 15 +
+ + 30 +
TNCSetDlg
+ TncSet.h + 0 +
+ + 35 +
TxdDlgBox
+ TxdDlg.h + 17 +
+ + 37 +
VerDspDlg
+ VerDsp.h + 21 +
+ + 6 + Wave.h + 24 + + + + + + + + + + + + + + + + + + + + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + +
+ + + + CPlusPlusBuilder.Personality.12 + CppVCLApplication + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1041 + 932 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + False + True + True + False + + + mmtty.cpp + + + + + True + False + + + 12 + +
diff --git a/mmtty.cbproj.local b/mmtty.cbproj.local index b3811b7..d576f03 100644 --- a/mmtty.cbproj.local +++ b/mmtty.cbproj.local @@ -1,2 +1,2 @@ - - + + diff --git a/mmtty.map b/mmtty.map index 8442e54..107cce8 100644 --- a/mmtty.map +++ b/mmtty.map @@ -1,6 +1,6 @@ - - Start Length Name Class - 0001:00401000 00037F46CH _TEXT CODE - 0002:00781000 00003A5DCH _DATA DATA - 0003:007BB5DC 0000320D0H _BSS BSS - 0004:00000000 0000000F8H _TLS TLS + + Start Length Name Class + 0001:00401000 0003BF6C4H _TEXT CODE + 0002:007C1000 00003B620H _DATA DATA + 0003:007FC620 000032568H _BSS BSS + 0004:00000000 0000000F8H _TLS TLS diff --git a/mmtty.tds b/mmtty.tds index b05fc1f..05131ea 100644 Binary files a/mmtty.tds and b/mmtty.tds differ diff --git a/radioset.cpp b/radioset.cpp index 910c63a..2f39292 100644 --- a/radioset.cpp +++ b/radioset.cpp @@ -33,7 +33,7 @@ LPCSTR __MK[]={ "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 - "Kenwood, Elecraft ", // , MakerIndex=5 + "Kenwood, Elecraft, FlexRadio ", // , MakerIndex=5 "JRC JST-245", // , MakerIndex=6 "Clear", // , MakerIndex=6 NULL, // , MakerIndex=8 @@ -94,7 +94,7 @@ const POLLDEF __VT4[]={ }; const POLLDEF __VT5[]={ { "NONE", 0 }, - { "Kenwood, Elecraft", RADIO_POLLKENWOOD }, + { "Kenwood, Elecraft, FlexRadio", RADIO_POLLKENWOOD }, { "Kenwood, Elecraft (use auto info)", RADIO_POLLKENWOODN }, { NULL, 0 }, }; @@ -394,7 +394,7 @@ int __fastcall TRADIOSetDlg::IsCompatible(int PollType, int MakerIndex) } else if (PollType == RADIO_POLLFT9000) { return 1; - } + } else if (PollType == RADIO_POLLFT2000) { return 1; }