Skip to content

Commit fa6d6db

Browse files
drowe67drowe67
committed
Merge branch 'master' into ms-unittest-disable
2 parents a84e3d5 + d6baa25 commit fa6d6db

File tree

9 files changed

+118
-110
lines changed

9 files changed

+118
-110
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CMake
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
env:
66
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

‎src/cohpsk.c‎

Lines changed: 59 additions & 52 deletions
Large diffs are not rendered by default.

‎src/cohpsk_demod.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
126126
fprintf(stderr, "\n");
127127
fprintf(stderr, " Default output file format is one byte per bit\n");
128128
fprintf(stderr, " -o OctaveLogFile Octave log file for testing\n");
129-
fprintf(stderr, " --nd non-diversity mode, output frames of %d bits\n", ND*COHPSK_BITS_PER_FRAME);
129+
fprintf(stderr, " --nd non-diversity mode, output frames of %d bits\n", COHPSK_ND*COHPSK_BITS_PER_FRAME);
130130
fprintf(stderr, " --sd soft decision output, one double per symbol\n");
131131
fprintf(stderr, " -v verbose mode\n");
132132
fprintf(stderr, "\n");
@@ -152,11 +152,11 @@ int main(int argc, char *argv[])
152152

153153
if (oct) {
154154
logframes = LOG_FRAMES;
155-
rx_amp_log = (float *)MALLOC(sizeof(float)*logframes*NSYMROW*COHPSK_NC*ND);
155+
rx_amp_log = (float *)MALLOC(sizeof(float)*logframes*NSYMROW*COHPSK_NC*COHPSK_ND);
156156
assert(rx_amp_log != NULL);
157-
rx_phi_log = (float *)MALLOC(sizeof(float)*logframes*NSYMROW*COHPSK_NC*ND);
157+
rx_phi_log = (float *)MALLOC(sizeof(float)*logframes*NSYMROW*COHPSK_NC*COHPSK_ND);
158158
assert(rx_phi_log != NULL);
159-
rx_symb_log = (COMP *)MALLOC(sizeof(COMP)*logframes*NSYMROW*COHPSK_NC*ND);
159+
rx_symb_log = (COMP *)MALLOC(sizeof(COMP)*logframes*NSYMROW*COHPSK_NC*COHPSK_ND);
160160
assert(rx_symb_log != NULL);
161161
cohpsk->rx_timing_log = (float*)MALLOC(sizeof(float)*SYNC_FRAMES*logframes*NSYMROWPILOT);
162162
assert(cohpsk->rx_timing_log != NULL);
@@ -213,10 +213,10 @@ int main(int argc, char *argv[])
213213

214214
if (oct) {
215215
for(r=0; r<NSYMROW; r++, log_data_r++) {
216-
for(c=0; c<COHPSK_NC*ND; c++) {
217-
rx_amp_log[log_data_r*COHPSK_NC*ND+c] = cohpsk->amp_[r][c];
218-
rx_phi_log[log_data_r*COHPSK_NC*ND+c] = cohpsk->phi_[r][c];
219-
rx_symb_log[log_data_r*COHPSK_NC*ND+c] = cohpsk->rx_symb[r][c];
216+
for(c=0; c<COHPSK_NC*COHPSK_ND; c++) {
217+
rx_amp_log[log_data_r*COHPSK_NC*COHPSK_ND+c] = cohpsk->amp_[r][c];
218+
rx_phi_log[log_data_r*COHPSK_NC*COHPSK_ND+c] = cohpsk->phi_[r][c];
219+
rx_symb_log[log_data_r*COHPSK_NC*COHPSK_ND+c] = cohpsk->rx_symb[r][c];
220220
}
221221
}
222222

@@ -242,9 +242,9 @@ int main(int argc, char *argv[])
242242
/* optionally dump Octave files */
243243

244244
if (foct != NULL) {
245-
octave_save_float(foct, "rx_amp_log_c", (float*)rx_amp_log, log_data_r, COHPSK_NC*ND, COHPSK_NC*ND);
246-
octave_save_float(foct, "rx_phi_log_c", (float*)rx_phi_log, log_data_r, COHPSK_NC*ND, COHPSK_NC*ND);
247-
octave_save_complex(foct, "rx_symb_log_c", (COMP*)rx_symb_log, log_data_r, COHPSK_NC*ND, COHPSK_NC*ND);
245+
octave_save_float(foct, "rx_amp_log_c", (float*)rx_amp_log, log_data_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
246+
octave_save_float(foct, "rx_phi_log_c", (float*)rx_phi_log, log_data_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
247+
octave_save_complex(foct, "rx_symb_log_c", (COMP*)rx_symb_log, log_data_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
248248
octave_save_float(foct, "rx_timing_log_c", (float*)cohpsk->rx_timing_log, 1, cohpsk->rx_timing_log_index, cohpsk->rx_timing_log_index);
249249
octave_save_float(foct, "f_est_log_c", f_est_log, 1, logframes, logframes);
250250
octave_save_float(foct, "ratio_log_c", ratio_log, 1, logframes, logframes);

‎src/cohpsk_internal.h‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
#define __COHPSK_INTERNAL__
3030

3131
#define NCT_SYMB_BUF (2*NSYMROWPILOT+2)
32-
#define ND 2 /* diversity factor ND 1 is no diveristy, ND we have orginal plus
32+
#define COHPSK_ND 2 /* diversity factor ND 1 is no diveristy, ND we have orginal plus
3333
one copy */
3434
#define NSW 4 /* number of sync window frames */
35-
#define COHPSK_ND 2 /* diversity factor */
3635
#define COHPSK_M 100 /* oversampling rate */
3736
#define COHPSK_NSYM 6
3837
#define COHPSK_NFILTER (COHPSK_NSYM*COHPSK_M)
@@ -45,19 +44,19 @@
4544
struct COHPSK {
4645
COMP ch_fdm_frame_buf[NSW*NSYMROWPILOT*COHPSK_M]; /* buffer of several frames of symbols from channel */
4746
float pilot2[2*NPILOTSFRAME][COHPSK_NC];
48-
float phi_[NSYMROWPILOT][COHPSK_NC*ND]; /* phase estimates for this frame of rx data symbols */
49-
float amp_[NSYMROW][COHPSK_NC*ND]; /* amplitude estimates for this frame of rx data symbols */
50-
COMP rx_symb[NSYMROWPILOT][COHPSK_NC*ND]; /* demodulated symbols */
47+
float phi_[NSYMROWPILOT][COHPSK_NC*COHPSK_ND]; /* phase estimates for this frame of rx data symbols */
48+
float amp_[NSYMROW][COHPSK_NC*COHPSK_ND]; /* amplitude estimates for this frame of rx data symbols */
49+
COMP rx_symb[NSYMROWPILOT][COHPSK_NC*COHPSK_ND]; /* demodulated symbols */
5150
float f_est;
52-
COMP rx_filter_memory[COHPSK_NC*ND][COHPSK_NFILTER];
53-
COMP ct_symb_buf[NCT_SYMB_BUF][COHPSK_NC*ND];
51+
COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER];
52+
COMP ct_symb_buf[NCT_SYMB_BUF][COHPSK_NC*COHPSK_ND];
5453
int ct; /* coarse timing offset in symbols */
5554
float rx_timing; /* fine timing for last symbol in frame */
5655
int nin; /* number of samples to input for next symbol */
5756
float f_fine_est;
5857
COMP ff_rect;
5958
COMP ff_phase;
60-
COMP ct_symb_ff_buf[NSYMROWPILOT+2][COHPSK_NC*ND];
59+
COMP ct_symb_ff_buf[NSYMROWPILOT+2][COHPSK_NC*COHPSK_ND];
6160
int sync;
6261
int sync_timer;
6362

@@ -104,7 +103,7 @@ struct COHPSK {
104103

105104
/* tx amplitude weights for each carrier for test/instrumentation */
106105

107-
float carrier_ampl[COHPSK_NC*ND];
106+
float carrier_ampl[COHPSK_NC*COHPSK_ND];
108107

109108
/* Flag enabling simple freq est mode */
110109
int freq_est_mode_reduced;
@@ -113,10 +112,10 @@ struct COHPSK {
113112
void bits_to_qpsk_symbols(COMP tx_symb[][COHPSK_NC*COHPSK_ND], int tx_bits[], int nbits);
114113
void qpsk_symbols_to_bits(struct COHPSK *coh, float rx_bits[], COMP ct_symb_buf[][COHPSK_NC*COHPSK_ND]);
115114
void tx_filter_and_upconvert_coh(COMP tx_fdm[], int Nc, const COMP tx_symbols[],
116-
COMP tx_filter_memory[COHPSK_NC][COHPSK_NSYM],
115+
COMP tx_filter_memory[][COHPSK_NSYM],
117116
COMP phase_tx[], COMP freq[],
118117
COMP *fbb_phase, COMP fbb_rect);
119-
void fdm_downconvert_coh(COMP rx_baseband[COHPSK_NC][COHPSK_M+COHPSK_M/P], int Nc, COMP rx_fdm[], COMP phase_rx[], COMP freq[], int nin);
118+
void fdm_downconvert_coh(COMP rx_baseband[][COHPSK_M+COHPSK_M/P], int Nc, COMP rx_fdm[], COMP phase_rx[], COMP freq[], int nin);
120119
void frame_sync_fine_freq_est(struct COHPSK *coh, COMP ch_symb[][COHPSK_NC*COHPSK_ND], int sync, int *next_sync);
121120
void fine_freq_correct(struct COHPSK *coh, int sync, int next_sync);
122121
int sync_state_machine(struct COHPSK *coh, int sync, int next_sync);

‎src/fdmdv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ void fdm_downconvert(COMP rx_baseband[NC+1][M_FAC+M_FAC/P], int Nc, COMP rx_fdm[
943943
944944
\*---------------------------------------------------------------------------*/
945945

946-
void rx_filter(COMP rx_filt[NC+1][P+1], int Nc, COMP rx_baseband[NC+1][M_FAC+M_FAC/P], COMP rx_filter_memory[NC+1][NFILTER], int nin)
946+
void rx_filter(COMP rx_filt[][P+1], int Nc, COMP rx_baseband[][M_FAC+M_FAC/P], COMP rx_filter_memory[][NFILTER], int nin)
947947
{
948948
int c, i,j,k,l;
949949
int n=M_FAC/P;
@@ -1234,8 +1234,8 @@ void down_convert_and_rx_filter(COMP rx_filt[NC+1][P+1], int Nc, COMP rx_fdm[],
12341234

12351235
float rx_est_timing(COMP rx_symbols[],
12361236
int Nc,
1237-
COMP rx_filt[NC+1][P+1],
1238-
COMP rx_filter_mem_timing[NC+1][NT*P],
1237+
COMP rx_filt[][P+1],
1238+
COMP rx_filter_mem_timing[][NT*P],
12391239
float env[],
12401240
int nin,
12411241
int m)

‎src/fdmdv_internal.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ float rx_est_freq_offset(struct FDMDV *f, COMP rx_fdm[], int nin, int do_fft);
179179
void lpf_peak_pick(float *foff, float *max, COMP pilot_baseband[], COMP pilot_lpf[], codec2_fft_cfg fft_pilot_cfg, COMP S[], int nin, int do_fft);
180180
void fdm_downconvert(COMP rx_baseband[NC+1][M_FAC+M_FAC/P], int Nc, COMP rx_fdm[], COMP phase_rx[], COMP freq[], int nin);
181181
void rxdec_filter(COMP rx_fdm_filter[], COMP rx_fdm[], COMP rxdec_lpf_mem[], int nin);
182-
void rx_filter(COMP rx_filt[NC+1][P+1], int Nc, COMP rx_baseband[NC+1][M_FAC+M_FAC/P], COMP rx_filter_memory[NC+1][NFILTER], int nin);
182+
void rx_filter(COMP rx_filt[][P+1], int Nc, COMP rx_baseband[][M_FAC+M_FAC/P], COMP rx_filter_memory[][NFILTER], int nin);
183183
void down_convert_and_rx_filter(COMP rx_filt[NC+1][P+1], int Nc, COMP rx_fdm[],
184184
COMP rx_fdm_mem[], COMP phase_rx[], COMP freq[],
185185
float freq_pol[], int nin, int dec_rate);
186186
float rx_est_timing(COMP rx_symbols[], int Nc,
187-
COMP rx_filt[NC+1][P+1],
188-
COMP rx_filter_mem_timing[NC+1][NT*P],
187+
COMP rx_filt[][P+1],
188+
COMP rx_filter_mem_timing[][NT*P],
189189
float env[],
190190
int nin,
191191
int m);

‎src/gp_interleaver.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ int choose_interleaver_b(int Nbits)
6565

6666
fprintf(stderr, "gp_interleaver: Nbits: %d, b not found!\n", Nbits);
6767
assert(0);
68+
return -1;
6869
}
6970

7071

‎unittest/compare_ints.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <stdlib.h>
66
#include <getopt.h>
77
#include <errno.h>
8+
#include <inttypes.h>
89

910
/* Declarations */
1011

@@ -126,7 +127,7 @@ int main(int argc, char *argv[]) {
126127
uint64_t err = llabs(data1 - data2);
127128
if (err > tol) {
128129
errors ++;
129-
printf("%d %lld %lld\n", count, data1, data2);
130+
printf("%d %" PRId64 " %" PRId64 "\n", count, data1, data2);
130131
if (numerrorstoexit != -1)
131132
if (errors > numerrorstoexit) {
132133
printf("reached errors: %d, bailing!", numerrorstoexit);

‎unittest/tcohpsk.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,25 @@ int main(int argc, char *argv[])
5858
{
5959
struct COHPSK *coh;
6060
int tx_bits[COHPSK_BITS_PER_FRAME];
61-
COMP tx_symb[NSYMROWPILOT][COHPSK_NC*ND];
61+
COMP tx_symb[NSYMROWPILOT][COHPSK_NC*COHPSK_ND];
6262
COMP tx_fdm_frame[COHPSK_M*NSYMROWPILOT];
6363
COMP ch_fdm_frame[COHPSK_M*NSYMROWPILOT];
6464
//COMP rx_fdm_frame_bb[M*NSYMROWPILOT];
65-
//COMP ch_symb[NSYMROWPILOT][COHPSK_NC*ND];
65+
//COMP ch_symb[NSYMROWPILOT][COHPSK_NC*COHPSK_ND];
6666
float rx_bits_sd[COHPSK_BITS_PER_FRAME];
6767
int rx_bits[COHPSK_BITS_PER_FRAME];
6868

6969
int tx_bits_log[COHPSK_BITS_PER_FRAME*FRAMES];
70-
COMP tx_symb_log[NSYMROWPILOT*FRAMES][COHPSK_NC*ND];
70+
COMP tx_symb_log[NSYMROWPILOT*FRAMES][COHPSK_NC*COHPSK_ND];
7171
COMP tx_fdm_frame_log[COHPSK_M*NSYMROWPILOT*FRAMES];
7272
COMP ch_fdm_frame_log[COHPSK_M*NSYMROWPILOT*FRAMES];
7373
COMP ch_fdm_frame_log_out[(COHPSK_M*NSYMROWPILOT+1)*FRAMES];
7474
//COMP rx_fdm_frame_bb_log[M*NSYMROWPILOT*FRAMES];
75-
//COMP ch_symb_log[NSYMROWPILOT*FRAMES][COHPSK_NC*ND];
76-
COMP ct_symb_ff_log[NSYMROWPILOT*FRAMES][COHPSK_NC*ND];
77-
float rx_amp_log[NSYMROW*FRAMES][COHPSK_NC*ND];
78-
float rx_phi_log[NSYMROW*FRAMES][COHPSK_NC*ND];
79-
COMP rx_symb_log[NSYMROW*FRAMES][COHPSK_NC*ND];
75+
//COMP ch_symb_log[NSYMROWPILOT*FRAMES][COHPSK_NC*COHPSK_ND];
76+
COMP ct_symb_ff_log[NSYMROWPILOT*FRAMES][COHPSK_NC*COHPSK_ND];
77+
float rx_amp_log[NSYMROW*FRAMES][COHPSK_NC*COHPSK_ND];
78+
float rx_phi_log[NSYMROW*FRAMES][COHPSK_NC*COHPSK_ND];
79+
COMP rx_symb_log[NSYMROW*FRAMES][COHPSK_NC*COHPSK_ND];
8080
int rx_bits_log[COHPSK_BITS_PER_FRAME*FRAMES];
8181

8282
FILE *fout;
@@ -85,14 +85,14 @@ int main(int argc, char *argv[])
8585
COMP foff_rect, phase_ch;
8686

8787
struct FDMDV *fdmdv;
88-
//COMP rx_filt[COHPSK_NC*ND][P+1];
88+
//COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1];
8989
//int rx_filt_log_col_index = 0;
9090
//float env[NT*P];
9191
//float __attribute__((unused)) rx_timing;
92-
COMP tx_onesym[COHPSK_NC*ND];
93-
//COMP rx_onesym[COHPSK_NC*ND];
92+
COMP tx_onesym[COHPSK_NC*COHPSK_ND];
93+
//COMP rx_onesym[COHPSK_NC*COHPSK_ND];
9494
//int rx_baseband_log_col_index = 0;
95-
//COMP rx_baseband_log[COHPSK_NC*ND][(M+M/P)*NSYMROWPILOT*FRAMES];
95+
//COMP rx_baseband_log[COHPSK_NC*COHPSK_ND][(M+M/P)*NSYMROWPILOT*FRAMES];
9696
float f_est_log[FRAMES], sig_rms_log[FRAMES], noise_rms_log[FRAMES];
9797
int f_est_samples;
9898

@@ -110,12 +110,12 @@ int main(int argc, char *argv[])
110110
/* these puppies are used for logging data in the bowels on the modem */
111111

112112
coh->rx_baseband_log_col_sz = (COHPSK_M+COHPSK_M/P)*NSYMROWPILOT*FRAMESL;
113-
coh->rx_baseband_log = (COMP *)malloc(sizeof(COMP)*COHPSK_NC*ND*coh->rx_baseband_log_col_sz);
113+
coh->rx_baseband_log = (COMP *)malloc(sizeof(COMP)*COHPSK_NC*COHPSK_ND*coh->rx_baseband_log_col_sz);
114114

115115
coh->rx_filt_log_col_sz = (P+1)*NSYMROWPILOT*FRAMESL;
116-
coh->rx_filt_log = (COMP *)malloc(sizeof(COMP)*COHPSK_NC*ND*coh->rx_filt_log_col_sz);
116+
coh->rx_filt_log = (COMP *)malloc(sizeof(COMP)*COHPSK_NC*COHPSK_ND*coh->rx_filt_log_col_sz);
117117

118-
coh->ch_symb_log_col_sz = COHPSK_NC*ND;
118+
coh->ch_symb_log_col_sz = COHPSK_NC*COHPSK_ND;
119119
coh->ch_symb_log = (COMP *)malloc(sizeof(COMP)*NSYMROWPILOT*FRAMESL*coh->ch_symb_log_col_sz);
120120

121121
coh->rx_timing_log = (float*)malloc(sizeof(float)*NSYMROWPILOT*FRAMESL);
@@ -146,9 +146,9 @@ int main(int argc, char *argv[])
146146
bits_to_qpsk_symbols(tx_symb, (int*)tx_bits, COHPSK_BITS_PER_FRAME);
147147

148148
for(r=0; r<NSYMROWPILOT; r++) {
149-
for(c=0; c<COHPSK_NC*ND; c++)
149+
for(c=0; c<COHPSK_NC*COHPSK_ND; c++)
150150
tx_onesym[c] = tx_symb[r][c];
151-
tx_filter_and_upconvert_coh(&tx_fdm_frame[r*COHPSK_M], COHPSK_NC*ND , tx_onesym, fdmdv->tx_filter_memory,
151+
tx_filter_and_upconvert_coh(&tx_fdm_frame[r*COHPSK_M], COHPSK_NC*COHPSK_ND , tx_onesym, fdmdv->tx_filter_memory,
152152
fdmdv->phase_tx, fdmdv->freq, &fdmdv->fbb_phase_tx, fdmdv->fbb_rect);
153153
}
154154
cohpsk_clip(tx_fdm_frame, COHPSK_CLIP, NSYMROWPILOT*COHPSK_M);
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
184184
memcpy(&ch_fdm_frame_log[COHPSK_M*NSYMROWPILOT*f], ch_fdm_frame, sizeof(COMP)*COHPSK_M*NSYMROWPILOT);
185185

186186
for(r=0; r<NSYMROWPILOT; r++, log_r++) {
187-
for(c=0; c<COHPSK_NC*ND; c++) {
187+
for(c=0; c<COHPSK_NC*COHPSK_ND; c++) {
188188
tx_symb_log[log_r][c] = tx_symb[r][c];
189189
}
190190
}
@@ -222,13 +222,13 @@ int main(int argc, char *argv[])
222222
if (coh->sync == 1) {
223223

224224
for(r=0; r<NSYMROWPILOT; r++, ff_log_r++) {
225-
for(c=0; c<COHPSK_NC*ND; c++) {
225+
for(c=0; c<COHPSK_NC*COHPSK_ND; c++) {
226226
ct_symb_ff_log[ff_log_r][c] = coh->ct_symb_ff_buf[r][c];
227227
}
228228
}
229229

230230
for(r=0; r<NSYMROW; r++, log_data_r++) {
231-
for(c=0; c<COHPSK_NC*ND; c++) {
231+
for(c=0; c<COHPSK_NC*COHPSK_ND; c++) {
232232
rx_amp_log[log_data_r][c] = coh->amp_[r][c];
233233
rx_phi_log[log_data_r][c] = coh->phi_[r][c];
234234
rx_symb_log[log_data_r][c] = coh->rx_symb[r][c];
@@ -259,18 +259,18 @@ int main(int argc, char *argv[])
259259
assert(fout != NULL);
260260
fprintf(fout, "# Created by tcohpsk.c\n");
261261
octave_save_int(fout, "tx_bits_log_c", tx_bits_log, 1, COHPSK_BITS_PER_FRAME*FRAMES);
262-
octave_save_complex(fout, "tx_symb_log_c", (COMP*)tx_symb_log, NSYMROWPILOT*FRAMES, COHPSK_NC*ND, COHPSK_NC*ND);
262+
octave_save_complex(fout, "tx_symb_log_c", (COMP*)tx_symb_log, NSYMROWPILOT*FRAMES, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
263263
octave_save_complex(fout, "tx_fdm_frame_log_c", (COMP*)tx_fdm_frame_log, 1, COHPSK_M*NSYMROWPILOT*FRAMES, COHPSK_M*NSYMROWPILOT*FRAMES);
264264
octave_save_complex(fout, "ch_fdm_frame_log_c", (COMP*)ch_fdm_frame_log_out, 1, nout-1, nout-1);
265265
//octave_save_complex(fout, "rx_fdm_frame_bb_log_c", (COMP*)rx_fdm_frame_bb_log, 1, M*NSYMROWPILOT*FRAMES, M*NSYMROWPILOT*FRAMES);
266-
octave_save_complex(fout, "rx_baseband_log_c", (COMP*)coh->rx_baseband_log, COHPSK_NC*ND, coh->rx_baseband_log_col_index, coh->rx_baseband_log_col_sz);
267-
octave_save_complex(fout, "rx_filt_log_c", (COMP*)coh->rx_filt_log, COHPSK_NC*ND, coh->rx_filt_log_col_index, coh->rx_filt_log_col_sz);
268-
octave_save_complex(fout, "ch_symb_log_c", (COMP*)coh->ch_symb_log, coh->ch_symb_log_r, COHPSK_NC*ND, COHPSK_NC*ND);
266+
octave_save_complex(fout, "rx_baseband_log_c", (COMP*)coh->rx_baseband_log, COHPSK_NC*COHPSK_ND, coh->rx_baseband_log_col_index, coh->rx_baseband_log_col_sz);
267+
octave_save_complex(fout, "rx_filt_log_c", (COMP*)coh->rx_filt_log, COHPSK_NC*COHPSK_ND, coh->rx_filt_log_col_index, coh->rx_filt_log_col_sz);
268+
octave_save_complex(fout, "ch_symb_log_c", (COMP*)coh->ch_symb_log, coh->ch_symb_log_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
269269
octave_save_float(fout, "rx_timing_log_c", (float*)coh->rx_timing_log, 1, coh->rx_timing_log_index, coh->rx_timing_log_index);
270-
octave_save_complex(fout, "ct_symb_ff_log_c", (COMP*)ct_symb_ff_log, NSYMROWPILOT*FRAMES, COHPSK_NC*ND, COHPSK_NC*ND);
271-
octave_save_float(fout, "rx_amp_log_c", (float*)rx_amp_log, log_data_r, COHPSK_NC*ND, COHPSK_NC*ND);
272-
octave_save_float(fout, "rx_phi_log_c", (float*)rx_phi_log, log_data_r, COHPSK_NC*ND, COHPSK_NC*ND);
273-
octave_save_complex(fout, "rx_symb_log_c", (COMP*)rx_symb_log, log_data_r, COHPSK_NC*ND, COHPSK_NC*ND);
270+
octave_save_complex(fout, "ct_symb_ff_log_c", (COMP*)ct_symb_ff_log, NSYMROWPILOT*FRAMES, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
271+
octave_save_float(fout, "rx_amp_log_c", (float*)rx_amp_log, log_data_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
272+
octave_save_float(fout, "rx_phi_log_c", (float*)rx_phi_log, log_data_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
273+
octave_save_complex(fout, "rx_symb_log_c", (COMP*)rx_symb_log, log_data_r, COHPSK_NC*COHPSK_ND, COHPSK_NC*COHPSK_ND);
274274
octave_save_int(fout, "rx_bits_log_c", rx_bits_log, 1, COHPSK_BITS_PER_FRAME*log_bits);
275275
octave_save_float(fout, "f_est_log_c", &f_est_log[1], 1, f_est_samples-1, f_est_samples-1);
276276
octave_save_float(fout, "sig_rms_log_c", sig_rms_log, 1, f_est_samples, f_est_samples-1);

0 commit comments

Comments
 (0)