mirror
/
RS-tracker
kopia lustrzana https://github.com/rs1729/RS
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

RS41: buffer=0 for post-processing

dump
Zilog80 2016-11-02 15:53:39 +01:00
rodzic 3c90ac8599
commit c1d2bb1317
2 zmienionych plików z 12 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
rs41/rs41.c
Wyświetl plik

@ -43,7 +43,7 @@ typedef struct {
int week; int gpssec; int week; int gpssec;
int jahr; int monat; int tag; int jahr; int monat; int tag;
int wday; int wday;
int std; int min; int sek; int std; int min; float sek;
double lat; double lon; double alt; double lat; double lon; double alt;
double vN; double vE; double vU; double vN; double vE; double vU;
double vH; double vD; double vD2; double vH; double vD; double vD2;
@ -535,7 +535,7 @@ int get_GPStime() {
ui8_t gpstime_bytes[4]; ui8_t gpstime_bytes[4];
int gpstime = 0, // 32bit int gpstime = 0, // 32bit
day; day;
int ms;
int crclen; int crclen;
int crcdat; int crcdat;
int crcpos = pos_Htow; int crcpos = pos_Htow;
@ -556,7 +556,7 @@ int get_GPStime() {
} }
memcpy(&gpstime, gpstime_bytes, 4); memcpy(&gpstime, gpstime_bytes, 4);
//ms = gpstime % 1000; ms = gpstime % 1000;
gpstime /= 1000; gpstime /= 1000;
gpx.gpssec = gpstime; gpx.gpssec = gpstime;
@ -568,7 +568,7 @@ int get_GPStime() {
gpx.wday = day; gpx.wday = day;
gpx.std = gpstime / 3600; gpx.std = gpstime / 3600;
gpx.min = (gpstime % 3600) / 60; gpx.min = (gpstime % 3600) / 60;
gpx.sek = gpstime % 60; gpx.sek = gpstime % 60 + ms/1000.0;
return 0; return 0;
} }
@ -794,7 +794,7 @@ int print_position() {
fprintf(stdout, "[%5d] ", gpx.frnr); fprintf(stdout, "[%5d] ", gpx.frnr);
fprintf(stdout, "(%s) ", gpx.id); fprintf(stdout, "(%s) ", gpx.id);
fprintf(stdout, "%s ", weekday[gpx.wday]); fprintf(stdout, "%s ", weekday[gpx.wday]);
fprintf(stdout, "%04d-%02d-%02d %02d:%02d:%02d", fprintf(stdout, "%04d-%02d-%02d %02d:%02d:%06.3f",
gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek); gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek);
if (option_verbose == 3) fprintf(stdout, " (W %d)", gpx.week); if (option_verbose == 3) fprintf(stdout, " (W %d)", gpx.week);
fprintf(stdout, " "); fprintf(stdout, " ");
@ -842,8 +842,8 @@ int main(int argc, char *argv[]) {
#ifdef CYGWIN #ifdef CYGWIN
_setmode(fileno(stdin), _O_BINARY); // _fileno(stdin) _setmode(fileno(stdin), _O_BINARY); // _fileno(stdin)
setbuf(stdout, NULL);
#endif #endif
setbuf(stdout, NULL);
fpname = argv[0]; fpname = argv[0];
++argv; ++argv;

12
rs41/rs41ecc.c
Wyświetl plik

@ -61,7 +61,7 @@ typedef struct {
int week; int gpssec; int week; int gpssec;
int jahr; int monat; int tag; int jahr; int monat; int tag;
int wday; int wday;
int std; int min; int sek; int std; int min; float sek;
double lat; double lon; double alt; double lat; double lon; double alt;
double vN; double vE; double vU; double vN; double vE; double vU;
double vH; double vD; double vD2; double vH; double vD; double vD2;
@ -523,7 +523,7 @@ int get_GPStime() {
ui8_t gpstime_bytes[4]; ui8_t gpstime_bytes[4];
int gpstime = 0, // 32bit int gpstime = 0, // 32bit
day; day;
int ms;
int crclen; int crclen;
int crcdat; int crcdat;
int crcpos = pos_Htow; int crcpos = pos_Htow;
@ -544,7 +544,7 @@ int get_GPStime() {
} }
memcpy(&gpstime, gpstime_bytes, 4); memcpy(&gpstime, gpstime_bytes, 4);
//ms = gpstime % 1000; ms = gpstime % 1000;
gpstime /= 1000; gpstime /= 1000;
gpx.gpssec = gpstime; gpx.gpssec = gpstime;
@ -556,7 +556,7 @@ int get_GPStime() {
gpx.wday = day; gpx.wday = day;
gpx.std = gpstime / 3600; gpx.std = gpstime / 3600;
gpx.min = (gpstime % 3600) / 60; gpx.min = (gpstime % 3600) / 60;
gpx.sek = gpstime % 60; gpx.sek = gpstime % 60 + ms/1000.0;
return 0; return 0;
} }
@ -823,7 +823,7 @@ int print_position() {
fprintf(stdout, "[%5d] ", gpx.frnr); fprintf(stdout, "[%5d] ", gpx.frnr);
fprintf(stdout, "(%s) ", gpx.id); fprintf(stdout, "(%s) ", gpx.id);
fprintf(stdout, "%s ", weekday[gpx.wday]); fprintf(stdout, "%s ", weekday[gpx.wday]);
fprintf(stdout, "%04d-%02d-%02d %02d:%02d:%02d", fprintf(stdout, "%04d-%02d-%02d %02d:%02d:%06.3f",
gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek); gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek);
if (option_verbose == 3) fprintf(stdout, " (W %d)", gpx.week); if (option_verbose == 3) fprintf(stdout, " (W %d)", gpx.week);
fprintf(stdout, " "); fprintf(stdout, " ");
@ -891,8 +891,8 @@ int main(int argc, char *argv[]) {
#ifdef CYGWIN #ifdef CYGWIN
_setmode(fileno(stdin), _O_BINARY); // _fileno(stdin) _setmode(fileno(stdin), _O_BINARY); // _fileno(stdin)
setbuf(stdout, NULL);
#endif #endif
setbuf(stdout, NULL);
fpname = argv[0]; fpname = argv[0];
++argv; ++argv;