caiyu/gps-sdr-sim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29 from sgk/linux-minor-fix

Browse Source 
Linux minor fix
This commit is contained in:
OSQZSS 2016-01-23 08:38:02 +09:00
commit 887079b309
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -5,8 +5,8 @@ all: gps-sdr-sim
SHELL=/bin/bash SHELL=/bin/bash
CC=gcc CC=gcc
CFLAGS=-fopenmp -O3 -Wall CFLAGS=-O3 -Wall
LDFLAGS=-lm -fopenmp LDFLAGS=-lm
gps-sdr-sim: gpssim.o gps-sdr-sim: gpssim.o
${CC} $< ${LDFLAGS} -o $@ ${CC} $< ${LDFLAGS} -o $@
@ -15,5 +15,6 @@ clean:
rm -f gpssim.o gps-sdr-sim *.bin rm -f gpssim.o gps-sdr-sim *.bin
time: gps-sdr-sim time: gps-sdr-sim
time ./gps-sdr-sim -e brdc3540.14n -u circle.csv -b 1
time ./gps-sdr-sim -e brdc3540.14n -u circle.csv -b 8 time ./gps-sdr-sim -e brdc3540.14n -u circle.csv -b 8
time ./gps-sdr-sim -e brdc3540.14n -u circle.csv -b 16 time ./gps-sdr-sim -e brdc3540.14n -u circle.csv -b 16

5
gpssim.c
View File

@ -1558,7 +1558,6 @@ int main(int argc, char *argv[])
double llh[3]; double llh[3];
int i; int i;
int nsat;
channel_t chan[MAX_CHAN]; channel_t chan[MAX_CHAN];
double elvmask = 0.0; // in degree double elvmask = 0.0; // in degree
@ -1903,7 +1902,7 @@ int main(int argc, char *argv[])
grx = g0; grx = g0;
// Allocate visible satellites // Allocate visible satellites
nsat = allocateChannel(chan, eph[ieph], grx, xyz[0], elvmask); allocateChannel(chan, eph[ieph], grx, xyz[0], elvmask);
for(i=0; i<MAX_CHAN; i++) for(i=0; i<MAX_CHAN; i++)
{ {
@ -2060,7 +2059,7 @@ int main(int argc, char *argv[])
generateNavMsg(grx, &chan[i], 0); generateNavMsg(grx, &chan[i], 0);
// Update channel allocation // Update channel allocation
nsat = allocateChannel(chan, eph[ieph], grx, xyz[iumd], elvmask); allocateChannel(chan, eph[ieph], grx, xyz[iumd], elvmask);
// Show ditails about simulated channels // Show ditails about simulated channels
if (verb) if (verb)