mirror
/
spdxl
kopia lustrzana https://github.com/sp9skp/spdxl
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

fix for DFM QRG

pull/1/head
SP9SKP 2018-02-12 11:10:51 +01:00
rodzic 55c7b9366c
commit 245d5880ec
4 zmienionych plików z 17 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/Makefile
Wyświetl plik

@ -236,7 +236,7 @@ gps2digipos: $(OBJ_GPS2DIGIPOS) $(OBJ_COMMON)
$(STRIP) gps2digipos $(STRIPFLAGS)
sondemod: $(OBJ_SONDEMOD) $(OBJ_COMMON)
$(CC) $(LFLAGS) -o sondemod $(OBJ_COMMON) $(OBJ_SONDEMOD) -lm -L/usr/lib/i386-linux-gnu -lssl -lcrypto -lcurl
$(CC) $(LFLAGS) -o sondemod $(OBJ_COMMON) $(OBJ_SONDEMOD) -lm -L/usr/lib/i386-linux-gnu -lssl -lcrypto -lcurl -fsigned-char
$(STRIP) sondemod $(STRIPFLAGS)
sondeudp: $(OBJ_SONDEUDP) $(OBJ_COMMON)

1
src/sdrtest.c
Wyświetl plik

@ -1024,7 +1024,6 @@ extern int main(int argc, char **argv)
if (sdr_startsdr(url, 1001ul, port, 1001ul, iqrate, samphz, reconn)) {
rdconfig();
updateChanT();
// file_is_modified(parmfn);
sndw = 0UL;
fd = osi_OpenWrite(soundfn, 1001ul);
if (fd>=0L) {

21
src/sondeudp.c
Wyświetl plik

@ -3257,20 +3257,25 @@ static char sendDFM(uint32_t m){
tmp[4] = chan[m].freq[4];
tmp[5] = chan[m].freq[5];
tmp[6] = 0;
strcat(s,tmp);
if(strlen(tmp)>2)
strcat(s,tmp);
else
strcat(s,"000000");
float t = get_Temp(chan[m].dfm6.meas24);
if (t > -270.0) sprintf(tmp,"%04.0f", (t+273)*10);
float t = get_Temp(chan[m].dfm6.meas24);
if (t > -270.0) {
sprintf(tmp,"%04.0f", (t+273)*10);
tmp[4]=0;
}
else sprintf(tmp,"0000");
strcat(s,tmp);
if ((chan[m].dfm6.sonde_typ & 0xFF) == 9) {
sprintf(tmp,"%04.0f", chan[m].dfm6.status[0]*100); // u
if ((chan[m].dfm6.sonde_typ & 0xFF) == 9) {
sprintf(tmp,"%04.0f", chan[m].dfm6.status[0]*100);
tmp[4]=0;
strcat(s,tmp);
sprintf(tmp,"%05.0f", chan[m].dfm6.status[1]*100); // t
sprintf(tmp,"%05.0f", chan[m].dfm6.status[1]*100);
tmp[5]=0;
strcat(s,tmp);
}
else sprintf(tmp,"000000000");
strcat(s,tmp);
@ -3278,7 +3283,7 @@ static char sendDFM(uint32_t m){
tmp[16]=0;
strcat(s,tmp);
printf("%s\r\n",s);
alludp(chan[m].udptx, 88, s, 88);
}

5
www/sondy.php
Wyświetl plik

@ -7,7 +7,7 @@
<body>
<div align="center">
<table width="700" border="1" cellpadding="3" cellspacing="0">
<tr><th> Name </th><th> Latitude </th> <th> Longitude </th> <th> Altitude </th><th>Speed [m/s]/[km/h]</th> <th> Climb </th> <th> Dir </th><th> Freq </th><th>Last frame </th><th>Dist[km]</th></tr>
<tr><th> Name </th><th> Database </th><th> Latitude </th> <th> Longitude </th> <th> Altitude </th><th>Speed [m/s]/[km/h]</th> <th> Climb </th> <th> Dir </th><th> Freq </th><th>Lat frame </th><th>Dist[km]</th></tr>
<?php
include 'SET.php';
@ -45,7 +45,8 @@ if (($handle = fopen("/tmp/sonde.csv", "r")) !== FALSE) {
$row++;
$speed=$data[4]." / ".intval($data[4]*3.6);
$data[4]=$speed;
echo"<td><a href=\"https://www.google.pl/maps/place/".$data[1].",".$data[2]."\">".$data[0]."</a>&nbsp;<a target=\"_blank\" href=\"https://skp.wodzislaw.pl/sondy/sinfo.php?n=".$data[0]."\">(SKP)</a></td>";
echo"<td align=center><a href=\"https://www.google.pl/maps/place/".$data[1].",".$data[2]."\" target=\"_blank\">".$data[0]."</a></td><td> <a target=\"_blank\" href=\"https://skp.wodzislaw.pl/sondy/sinfo.php?n=".$data[0]."\">SKP</a>/".
"<a target=\"_blank\" href=\"https://aprs.fi/#!call=a%2F".$data[0]."&timerange=3600&tail=3600\">APRS</a>/<a target=\"_blank\" href=\"https://radiosondy.info/sonde_archive.php?sondenumber=".$data[0]."\">KXY</a></td>";
for ($c=1; $c < $num-1; $c++) {
echo "<td align=center>" . $data[$c] . "</td>";
}