w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 20:28:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integrate-77bit' of https://bitbucket.org/k1jt/wsjtx into integrate-77bit

Browse Source
This commit is contained in:
Joe Taylor 2018-07-06 19:29:17 -04:00
commit cdbf523452
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ft8/genft8.f90
View File

@ -1,4 +1,4 @@
subroutine genft8(msg37,mygrid,bcontest,i3,n3,isync,msgsent37,msgbits,itone) subroutine genft8(msg37,mygrid,bcontest,i3,n3,isync,msgsent37,msgbits77,itone)
! Encode an FT8 message, producing array itone(). ! Encode an FT8 message, producing array itone().

1
lib/ft8/genft8_174_91.f90
View File

@ -2,7 +2,6 @@ subroutine genft8_174_91(msg,mygrid,bcontest,i3,n3,msgsent,msgbits,itone)
! Encode an FT8 message, producing array itone(). ! Encode an FT8 message, producing array itone().
use packjt
use packjt77 use packjt77
include 'ft8_params.f90' include 'ft8_params.f90'
character msg*37,msgsent*37 character msg*37,msgsent*37

5
mainwindow.cpp
View File

@ -77,7 +77,7 @@ extern "C" {
fortran_charlen_t); fortran_charlen_t);
void genft8_(char* msg, char* MyGrid, bool* bcontest, int* i3, int* n3, int* isync, char* msgsent, void genft8_(char* msg, char* MyGrid, bool* bcontest, int* i3, int* n3, int* isync, char* msgsent,
char ft8msgbits[], int itone[], fortran_charlen_t, fortran_charlen_t, int ft8msgbits[], int itone[], fortran_charlen_t, fortran_charlen_t,
fortran_charlen_t); fortran_charlen_t);
void parse77_(char* msg, int* i3, int* n3, fortran_charlen_t); void parse77_(char* msg, int* i3, int* n3, fortran_charlen_t);
@ -3502,8 +3502,9 @@ void MainWindow::guiUpdate()
if(m_config.bGenerate77()) m_isync=2; if(m_config.bGenerate77()) m_isync=2;
qDebug() << "itype=" << itype << "i3, n3:"<< m_i3 << m_n3 << "isync="<< m_isync << ui->tx6->text(); qDebug() << "itype=" << itype << "i3, n3:"<< m_i3 << m_n3 << "isync="<< m_isync << ui->tx6->text();
char ft8msgbits[75 + 12]; //packed 75 bit ft8 message plus 12-bit CRC char ft8msgbits[75 + 12]; //packed 75 bit ft8 message plus 12-bit CRC
int ft8msgbits[77];
genft8_(message, MyGrid, &bcontest, &m_i3, &m_n3, &m_isync, msgsent, genft8_(message, MyGrid, &bcontest, &m_i3, &m_n3, &m_isync, msgsent,
const_cast<char *> (ft8msgbits), const_cast<int *> (itone), 37, 6, 37); const_cast<int *> (ft8msgbits), const_cast<int *> (itone), 37, 6, 37);
if(m_config.bFox()) { if(m_config.bFox()) {
//Fox must generate the full Tx waveform, not just an itone[] array. //Fox must generate the full Tx waveform, not just an itone[] array.