From be5320bacfe8a62d1ca7214e79e8babe194476ce Mon Sep 17 00:00:00 2001 From: SP9SKP Date: Thu, 25 Jul 2019 18:54:23 +0200 Subject: [PATCH] dostosowanie do RS92 na 1.6GHz --- VER.txt | 2 +- doc/start/ROTATEH | 16 ++++++++++++++++ src/sondemod.c | 7 +++++++ www/CFG/H00.txt | 22 ++++++++++++++++++++++ www/CFG/H01.txt | 22 ++++++++++++++++++++++ www/CFG/H02.txt | 22 ++++++++++++++++++++++ www/CFG/H03.txt | 22 ++++++++++++++++++++++ www/CFG/H04.txt | 22 ++++++++++++++++++++++ www/CFG/H05.txt | 22 ++++++++++++++++++++++ www/CFG/H06.txt | 22 ++++++++++++++++++++++ www/CFG/H07.txt | 22 ++++++++++++++++++++++ www/CFG/H08.txt | 22 ++++++++++++++++++++++ www/CFG/H09.txt | 22 ++++++++++++++++++++++ www/CFG/H10.txt | 17 +++++++++++++++++ www/wf.php | 15 ++++++++++++--- 15 files changed, 273 insertions(+), 4 deletions(-) create mode 100755 doc/start/ROTATEH create mode 100644 www/CFG/H00.txt create mode 100644 www/CFG/H01.txt create mode 100644 www/CFG/H02.txt create mode 100644 www/CFG/H03.txt create mode 100644 www/CFG/H04.txt create mode 100644 www/CFG/H05.txt create mode 100644 www/CFG/H06.txt create mode 100644 www/CFG/H07.txt create mode 100644 www/CFG/H08.txt create mode 100644 www/CFG/H09.txt create mode 100644 www/CFG/H10.txt diff --git a/VER.txt b/VER.txt index 5bc5e19..b66b748 100644 --- a/VER.txt +++ b/VER.txt @@ -1 +1 @@ -17052019 \ No newline at end of file +25072019 \ No newline at end of file diff --git a/doc/start/ROTATEH b/doc/start/ROTATEH new file mode 100755 index 0000000..ac6f1b8 --- /dev/null +++ b/doc/start/ROTATEH @@ -0,0 +1,16 @@ +#!/bin/bash + +while [ 1 ] ; do + cp /var/www/html/CFG/H00.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H01.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H02.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H03.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H04.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H05.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H06.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H07.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H08.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H09.txt /tmp/sdrcfg2.txt && sleep 15 && \ + cp /var/www/html/CFG/H10.txt /tmp/sdrcfg2.txt && sleep 15 + +done diff --git a/src/sondemod.c b/src/sondemod.c index 31e19bf..7c7e8dd 100644 --- a/src/sondemod.c +++ b/src/sondemod.c @@ -1955,6 +1955,13 @@ static void decodeframe(uint8_t m, uint32_t ip, uint32_t fromport) if(ftoold) fclose(ftoold); } + if(mhz>467.0 && mhz<491.0){ + contextr9.lat=(50+contextr9.hp/1000)*1.7453292519943E-2; + contextr9.long0=(18+contextr9.hp/1000)*1.7453292519943E-2; + contextr9.posok=1; + } + + if (contextr9.posok && contextr9.lat!=0.0 && contextr9.long0!=0.0) { diff --git a/www/CFG/H00.txt b/www/CFG/H00.txt new file mode 100644 index 0000000..7b1bcd7 --- /dev/null +++ b/www/CFG/H00.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1668.60 100 0 0 0 50000 # +f 1668.70 100 0 0 0 50000 # +f 1668.80 100 0 0 0 50000 # +f 1668.90 100 0 0 0 50000 # +f 1669.00 100 0 0 0 50000 # +f 1669.10 100 0 0 0 50000 # +f 1669.20 100 0 0 0 50000 # +f 1669.30 100 0 0 0 50000 # +f 1669.40 100 0 0 0 50000 # +f 1669.50 100 0 0 0 50000 # +f 1669.60 100 0 0 0 50000 # +f 1669.70 100 0 0 0 50000 # +f 1669.80 100 0 0 0 50000 # +f 1669.90 100 0 0 0 50000 # +f 1670.00 100 0 0 0 50000 # +f 1670.10 100 0 0 0 50000 # +f 1670.20 100 0 0 0 50000 # +f 1670.30 100 0 0 0 50000 # +f 1670.40 100 0 0 0 50000 # +f 1670.50 100 0 0 0 50000 # diff --git a/www/CFG/H01.txt b/www/CFG/H01.txt new file mode 100644 index 0000000..a9eb61e --- /dev/null +++ b/www/CFG/H01.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1672.60 100 0 0 0 50000 # +f 1672.70 100 0 0 0 50000 # +f 1672.80 100 0 0 0 50000 # +f 1672.90 100 0 0 0 50000 # +f 1673.00 100 0 0 0 50000 # +f 1673.10 100 0 0 0 50000 # +f 1673.20 100 0 0 0 50000 # +f 1673.30 100 0 0 0 50000 # +f 1673.40 100 0 0 0 50000 # +f 1673.50 100 0 0 0 50000 # +f 1673.60 100 0 0 0 50000 # +f 1673.70 100 0 0 0 50000 # +f 1673.80 100 0 0 0 50000 # +f 1673.90 100 0 0 0 50000 # +f 1674.00 100 0 0 0 50000 # +f 1674.10 100 0 0 0 50000 # +f 1674.20 100 0 0 0 50000 # +f 1674.30 100 0 0 0 50000 # +f 1674.40 100 0 0 0 50000 # +f 1674.50 100 0 0 0 50000 # diff --git a/www/CFG/H02.txt b/www/CFG/H02.txt new file mode 100644 index 0000000..580253b --- /dev/null +++ b/www/CFG/H02.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1670.60 100 0 0 0 50000 # +f 1670.70 100 0 0 0 50000 # +f 1670.80 100 0 0 0 50000 # +f 1670.90 100 0 0 0 50000 # +f 1671.00 100 0 0 0 50000 # +f 1671.10 100 0 0 0 50000 # +f 1671.20 100 0 0 0 50000 # +f 1671.30 100 0 0 0 50000 # +f 1671.40 100 0 0 0 50000 # +f 1671.50 100 0 0 0 50000 # +f 1671.60 100 0 0 0 50000 # +f 1671.70 100 0 0 0 50000 # +f 1671.80 100 0 0 0 50000 # +f 1671.90 100 0 0 0 50000 # +f 1672.00 100 0 0 0 50000 # +f 1672.10 100 0 0 0 50000 # +f 1672.20 100 0 0 0 50000 # +f 1672.30 100 0 0 0 50000 # +f 1672.40 100 0 0 0 50000 # +f 1672.50 100 0 0 0 50000 # diff --git a/www/CFG/H03.txt b/www/CFG/H03.txt new file mode 100644 index 0000000..fead9e4 --- /dev/null +++ b/www/CFG/H03.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1674.60 100 0 0 0 50000 # +f 1674.70 100 0 0 0 50000 # +f 1674.80 100 0 0 0 50000 # +f 1674.90 100 0 0 0 50000 # +f 1675.00 100 0 0 0 50000 # +f 1675.10 100 0 0 0 50000 # +f 1675.20 100 0 0 0 50000 # +f 1675.30 100 0 0 0 50000 # +f 1675.40 100 0 0 0 50000 # +f 1675.50 100 0 0 0 50000 # +f 1675.60 100 0 0 0 50000 # +f 1675.70 100 0 0 0 50000 # +f 1675.80 100 0 0 0 50000 # +f 1675.90 100 0 0 0 50000 # +f 1676.00 100 0 0 0 50000 # +f 1676.10 100 0 0 0 50000 # +f 1676.20 100 0 0 0 50000 # +f 1676.30 100 0 0 0 50000 # +f 1676.40 100 0 0 0 50000 # +f 1676.50 100 0 0 0 50000 # diff --git a/www/CFG/H04.txt b/www/CFG/H04.txt new file mode 100644 index 0000000..bc4ee67 --- /dev/null +++ b/www/CFG/H04.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1676.60 100 0 0 0 50000 # +f 1676.70 100 0 0 0 50000 # +f 1676.80 100 0 0 0 50000 # +f 1676.90 100 0 0 0 50000 # +f 1677.00 100 0 0 0 50000 # +f 1677.10 100 0 0 0 50000 # +f 1677.20 100 0 0 0 50000 # +f 1677.30 100 0 0 0 50000 # +f 1677.40 100 0 0 0 50000 # +f 1677.50 100 0 0 0 50000 # +f 1677.60 100 0 0 0 50000 # +f 1677.70 100 0 0 0 50000 # +f 1677.80 100 0 0 0 50000 # +f 1677.90 100 0 0 0 50000 # +f 1678.00 100 0 0 0 50000 # +f 1678.10 100 0 0 0 50000 # +f 1678.20 100 0 0 0 50000 # +f 1678.30 100 0 0 0 50000 # +f 1678.40 100 0 0 0 50000 # +f 1678.50 100 0 0 0 50000 # diff --git a/www/CFG/H05.txt b/www/CFG/H05.txt new file mode 100644 index 0000000..761e573 --- /dev/null +++ b/www/CFG/H05.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1678.60 100 0 0 0 50000 # +f 1678.70 100 0 0 0 50000 # +f 1678.80 100 0 0 0 50000 # +f 1678.90 100 0 0 0 50000 # +f 1679.00 100 0 0 0 50000 # +f 1679.10 100 0 0 0 50000 # +f 1679.20 100 0 0 0 50000 # +f 1679.30 100 0 0 0 50000 # +f 1679.40 100 0 0 0 50000 # +f 1679.50 100 0 0 0 50000 # +f 1679.60 100 0 0 0 50000 # +f 1679.70 100 0 0 0 50000 # +f 1679.80 100 0 0 0 50000 # +f 1679.90 100 0 0 0 50000 # +f 1680.00 100 0 0 0 50000 # +f 1680.10 100 0 0 0 50000 # +f 1680.20 100 0 0 0 50000 # +f 1680.30 100 0 0 0 50000 # +f 1680.40 100 0 0 0 50000 # +f 1680.50 100 0 0 0 50000 # diff --git a/www/CFG/H06.txt b/www/CFG/H06.txt new file mode 100644 index 0000000..15c0977 --- /dev/null +++ b/www/CFG/H06.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1680.60 100 0 0 0 50000 # +f 1680.70 100 0 0 0 50000 # +f 1680.80 100 0 0 0 50000 # +f 1680.90 100 0 0 0 50000 # +f 1681.00 100 0 0 0 50000 # +f 1681.10 100 0 0 0 50000 # +f 1681.20 100 0 0 0 50000 # +f 1681.30 100 0 0 0 50000 # +f 1681.40 100 0 0 0 50000 # +f 1681.50 100 0 0 0 50000 # +f 1681.60 100 0 0 0 50000 # +f 1681.70 100 0 0 0 50000 # +f 1681.80 100 0 0 0 50000 # +f 1681.90 100 0 0 0 50000 # +f 1682.00 100 0 0 0 50000 # +f 1682.10 100 0 0 0 50000 # +f 1682.20 100 0 0 0 50000 # +f 1682.30 100 0 0 0 50000 # +f 1682.40 100 0 0 0 50000 # +f 1682.50 100 0 0 0 50000 # diff --git a/www/CFG/H07.txt b/www/CFG/H07.txt new file mode 100644 index 0000000..5ee6681 --- /dev/null +++ b/www/CFG/H07.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1682.60 100 0 0 0 50000 # +f 1682.70 100 0 0 0 50000 # +f 1682.80 100 0 0 0 50000 # +f 1682.90 100 0 0 0 50000 # +f 1683.00 100 0 0 0 50000 # +f 1683.10 100 0 0 0 50000 # +f 1683.20 100 0 0 0 50000 # +f 1683.30 100 0 0 0 50000 # +f 1683.40 100 0 0 0 50000 # +f 1683.50 100 0 0 0 50000 # +f 1683.60 100 0 0 0 50000 # +f 1683.70 100 0 0 0 50000 # +f 1683.80 100 0 0 0 50000 # +f 1683.90 100 0 0 0 50000 # +f 1684.00 100 0 0 0 50000 # +f 1684.10 100 0 0 0 50000 # +f 1684.20 100 0 0 0 50000 # +f 1684.30 100 0 0 0 50000 # +f 1684.40 100 0 0 0 50000 # +f 1684.50 100 0 0 0 50000 # diff --git a/www/CFG/H08.txt b/www/CFG/H08.txt new file mode 100644 index 0000000..2a4c6c9 --- /dev/null +++ b/www/CFG/H08.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1684.60 100 0 0 0 50000 # +f 1684.70 100 0 0 0 50000 # +f 1684.80 100 0 0 0 50000 # +f 1684.90 100 0 0 0 50000 # +f 1685.00 100 0 0 0 50000 # +f 1685.10 100 0 0 0 50000 # +f 1685.20 100 0 0 0 50000 # +f 1685.30 100 0 0 0 50000 # +f 1685.40 100 0 0 0 50000 # +f 1685.50 100 0 0 0 50000 # +f 1685.60 100 0 0 0 50000 # +f 1685.70 100 0 0 0 50000 # +f 1685.80 100 0 0 0 50000 # +f 1685.90 100 0 0 0 50000 # +f 1686.00 100 0 0 0 50000 # +f 1686.10 100 0 0 0 50000 # +f 1686.20 100 0 0 0 50000 # +f 1686.30 100 0 0 0 50000 # +f 1686.40 100 0 0 0 50000 # +f 1686.50 100 0 0 0 50000 # diff --git a/www/CFG/H09.txt b/www/CFG/H09.txt new file mode 100644 index 0000000..bd0f653 --- /dev/null +++ b/www/CFG/H09.txt @@ -0,0 +1,22 @@ +p 5 0 +p 8 1 +f 1686.60 100 0 0 0 50000 # +f 1686.70 100 0 0 0 50000 # +f 1686.80 100 0 0 0 50000 # +f 1686.90 100 0 0 0 50000 # +f 1687.00 100 0 0 0 50000 # +f 1687.10 100 0 0 0 50000 # +f 1687.20 100 0 0 0 50000 # +f 1687.30 100 0 0 0 50000 # +f 1687.40 100 0 0 0 50000 # +f 1687.50 100 0 0 0 50000 # +f 1687.60 100 0 0 0 50000 # +f 1687.70 100 0 0 0 50000 # +f 1687.80 100 0 0 0 50000 # +f 1687.90 100 0 0 0 50000 # +f 1688.00 100 0 0 0 50000 # +f 1688.10 100 0 0 0 50000 # +f 1688.20 100 0 0 0 50000 # +f 1688.30 100 0 0 0 50000 # +f 1688.40 100 0 0 0 50000 # +f 1688.50 100 0 0 0 50000 # diff --git a/www/CFG/H10.txt b/www/CFG/H10.txt new file mode 100644 index 0000000..7f000c0 --- /dev/null +++ b/www/CFG/H10.txt @@ -0,0 +1,17 @@ +p 5 0 +p 8 1 +f 1688.60 100 0 0 0 50000 # +f 1688.70 100 0 0 0 50000 # +f 1688.80 100 0 0 0 50000 # +f 1688.90 100 0 0 0 50000 # +f 1689.00 100 0 0 0 50000 # +f 1689.10 100 0 0 0 50000 # +f 1689.20 100 0 0 0 50000 # +f 1689.30 100 0 0 0 50000 # +f 1689.40 100 0 0 0 50000 # +f 1689.50 100 0 0 0 50000 # +f 1689.60 100 0 0 0 50000 # +f 1689.70 100 0 0 0 50000 # +f 1689.80 100 0 0 0 50000 # +f 1689.90 100 0 0 0 50000 # +f 1690.00 100 0 0 0 50000 # diff --git a/www/wf.php b/www/wf.php index aef092e..75827d4 100644 --- a/www/wf.php +++ b/www/wf.php @@ -38,7 +38,10 @@ function GreenYellowRed($number) { function printSDR($fil){ if (($handle = fopen($fil, "r")) !== FALSE) { $line = fgets($handle); - echo ""; + if($line{2}=='1') + echo "
Freq:".$line{2}.$line{3}.$line{4}.".".$line{5}.$line{6}.$line{7}." MHz
"; + else + echo "
Freq:".$line{2}.$line{3}.$line{4}.$line{5}.".".$line{6}.$line{7}." MHz
"; $line = fgets($handle); echo ""; $line = fgets($handle); @@ -49,9 +52,15 @@ function printSDR($fil){ $arr = explode(";",$line); echo ""; $p=ord($line{16}); - echo ""; + $off=0; + if($line{3}=='1'){ + echo ""; + $off=1; + } + else + echo ""; for($i=0;$i<16;$i++){ - $p=ord($line{$i+16}); + $p=ord($line{$i+16+$off}); echo ''; } echo "";
Freq:".$line{2}.$line{3}.$line{4}.".".$line{5}.$line{6}.$line{7}." MHzPPM:".$line{2}.$line{3}."
".$line{0}.$line{1}." : ".$line{3}.$line{4}.$line{5}.".".$line{6}.$line{7}.$line{8}." MHz".intval($arr[2])."kHz (".$p."dB)".$line{0}.$line{1}." : ".$line{3}.$line{4}.$line{5}.$line{6}.".".$line{7}.$line{8}." MHz".intval($arr[2])."kHz (".$p."dB)".$line{0}.$line{1}." : ".$line{3}.$line{4}.$line{5}.".".$line{6}.$line{7}.$line{8}." MHz".intval($arr[2])."kHz (".$p."dB)