Update version and fix builds

martinber · May 14, 2020 · 98d20d2 · 98d20d2
1 parent d79938b
commit 98d20d2
Show file tree

Hide file tree

Showing 6 changed files with 163 additions and 8 deletions.
diff --git a/build/linux-gnu-docker/entrypoint.sh b/build/linux-gnu-docker/entrypoint.sh
@@ -30,6 +30,7 @@ rm -r "$X86_64_GUI_PACKAGE_FOLDER" || true
 mkdir -p "$X86_64_GUI_PACKAGE_FOLDER"
 cp ./target/x86_64-unknown-linux-gnu/release/noaa-apt "$X86_64_GUI_PACKAGE_FOLDER/"
 cp -r "./test" "$X86_64_GUI_PACKAGE_FOLDER/"
+cp -r "./res" "$X86_64_GUI_PACKAGE_FOLDER/"
 rm -r "$X86_64_GUI_PACKAGE_FOLDER/test/results" || true
 
 # Build without GUI
@@ -40,6 +41,7 @@ rm -r "$X86_64_NOGUI_PACKAGE_FOLDER" || true
 mkdir -p "$X86_64_NOGUI_PACKAGE_FOLDER"
 cp ./target/x86_64-unknown-linux-gnu/release/noaa-apt "$X86_64_NOGUI_PACKAGE_FOLDER/"
 cp -r "./test" "$X86_64_NOGUI_PACKAGE_FOLDER/"
+cp -r "./res" "$X86_64_NOGUI_PACKAGE_FOLDER/"
 rm -r "$X86_64_NOGUI_PACKAGE_FOLDER/test/results" || true
 
 # Build with GUI for Raspberry Pi
@@ -57,6 +59,7 @@ rm -r "$ARMV7_GUI_PACKAGE_FOLDER" || true
 mkdir -p "$ARMV7_GUI_PACKAGE_FOLDER"
 cp ./target/armv7-unknown-linux-gnueabihf/release/noaa-apt "$ARMV7_GUI_PACKAGE_FOLDER/"
 cp -r "./test" "$ARMV7_GUI_PACKAGE_FOLDER/"
+cp -r "./res" "$ARMV7_GUI_PACKAGE_FOLDER/"
 rm -r "$ARMV7_GUI_PACKAGE_FOLDER/test/results" || true
 
 # Build without GUI for Raspberry Pi
@@ -67,6 +70,7 @@ rm -r "$ARMV7_NOGUI_PACKAGE_FOLDER" || true
 mkdir -p "$ARMV7_NOGUI_PACKAGE_FOLDER"
 cp ./target/armv7-unknown-linux-gnueabihf/release/noaa-apt "$ARMV7_NOGUI_PACKAGE_FOLDER/"
 cp -r "./test" "$ARMV7_NOGUI_PACKAGE_FOLDER/"
+cp -r "./res" "$ARMV7_NOGUI_PACKAGE_FOLDER/"
 rm -r "$ARMV7_NOGUI_PACKAGE_FOLDER/test/results" || true
 
 # Build deb
@@ -75,7 +79,7 @@ rm -r "$ARMV7_NOGUI_PACKAGE_FOLDER/test/results" || true
 DH_VERBOSE=1
 
 # Indicate resources folder before compiling
-NOAA_APT_RES_DIR="/usr/share/noaa-apt"
+export NOAA_APT_RES_DIR="/usr/share/noaa-apt"
 
 # -us -uc: Do not sign anything. When upgrading to a newer Debian version I
 #          should change to --no-sign

diff --git a/build/windows-gnu-docker/entrypoint.sh b/build/windows-gnu-docker/entrypoint.sh
@@ -36,6 +36,10 @@ cp ./build/windows-files/settings.ini "$GUI_PACKAGE_FOLDER/share/gtk-3.0/"
 # Copy test files
 mkdir "$GUI_PACKAGE_FOLDER/test"
 cp ./test/*.wav "$GUI_PACKAGE_FOLDER/test/"
+cp ./test/*.txt "$GUI_PACKAGE_FOLDER/test/"
+
+# Copy res folder
+cp -r ./res "$GUI_PACKAGE_FOLDER/"
 
 # Zip
 

diff --git a/docs/download.md b/docs/download.md
@@ -99,9 +99,9 @@ installed what you need (unless you have very old packages):
 My builds use a statically linked libssl, so you don't need libssl unless you
 compiled noaa-apt yourself.
 
-[amd64_deb]: https://github.com/martinber/noaa-apt/releases/download/v1.1.2/noaa-apt_1.1.2-1_amd64.deb
-[x86_64_windows_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.1.2/noaa-apt-1.1.2-x86_64-windows-gnu.zip
-[x86_64_linux_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.1.2/noaa-apt-1.1.2-x86_64-linux-gnu.zip
-[x86_64_linux_gnu_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.1.2/noaa-apt-1.1.2-x86_64-linux-gnu-nogui.zip
-[armv7_linux_gnueabihf_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.1.2/noaa-apt-1.1.2-armv7-linux-gnueabihf.zip
-[armv7_linux_gnueabihf_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.1.2/noaa-apt-1.1.2-armv7-linux-gnueabihf-nogui.zip
+[amd64_deb]: https://github.com/martinber/noaa-apt/releases/download/v1.2.0/noaa-apt_1.2.0-1_amd64.deb
+[x86_64_windows_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.2.0/noaa-apt-1.2.0-x86_64-windows-gnu.zip
+[x86_64_linux_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.2.0/noaa-apt-1.2.0-x86_64-linux-gnu.zip
+[x86_64_linux_gnu_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.2.0/noaa-apt-1.2.0-x86_64-linux-gnu-nogui.zip
+[armv7_linux_gnueabihf_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.2.0/noaa-apt-1.2.0-armv7-linux-gnueabihf.zip
+[armv7_linux_gnueabihf_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.2.0/noaa-apt-1.2.0-armv7-linux-gnueabihf-nogui.zip
diff --git a/docs/version_check b/docs/version_check
@@ -1 +1 @@
-1.1.2
+1.2.0
diff --git a/test/test.sh b/test/test.sh
@@ -49,3 +49,5 @@ set -x
 "$PROGRAM" -q "$TEST_DIR/test_11025hz.wav" -r 3675 -o "$RESULTS_DIR/decimated_apt.wav"
 "$PROGRAM" -q "$TEST_DIR/noise_48000hz.wav" -r 80000 -o "$RESULTS_DIR/upsampled_noise.wav"
 "$PROGRAM" -q "$TEST_DIR/noise_48000hz.wav" -r 11025 -o "$RESULTS_DIR/downsampled_noise.wav"
+"$PROGRAM" -q "$TEST_DIR/test_11025hz.wav" --tle "$TEST_DIR/test_tle.txt" -s "noaa_19" \
+		-R "auto" -m "yes" -t "2018-12-22T20:39:41-00:00" -o "$RESULTS_DIR/decoded_apt_map.png"
diff --git a/test/test_tle.txt b/test/test_tle.txt
@@ -0,0 +1,145 @@
+NOAA 15                 
+1 25338U 98030A   18340.60435601  .00000024  00000-0  28923-4 0  9996
+2 25338  98.7609 357.0816 0011516  87.3858 272.8639 14.25886300 69598
+METEOSAT-8 (MSG-1)      
+1 27509U 02040B   18339.83361904  .00000136  00000-0  00000+0 0  9996
+2 27509   5.7607  56.3290 0001297 283.0641  76.7021  1.00277896 59678
+KALPANA-1 (METSAT 1)    
+1 27525U 02043A   18339.72624113  .00000005  00000-0  00000+0 0  9994
+2 27525   8.5674  51.5198 0001558  66.9385 292.9457  0.98336746 59444
+NOAA 18                 
+1 28654U 05018A   18340.60503963  .00000018  00000-0  34971-4 0  9994
+2 28654  99.1250  19.3917 0014273   7.2999 352.8378 14.12391532698129
+METEOSAT-9 (MSG-2)      
+1 28912U 05049B   18338.76185067  .00000020  00000-0  00000+0 0  9994
+2 28912   3.2673  71.5570 0001407 307.0324 332.9466  1.00279382 47489
+HIMAWARI-7 (MTSAT-2)    
+1 28937U 06004A   18340.08868705 -.00000242  00000-0  00000+0 0  9995
+2 28937   0.0241 292.6069 0003640 317.6571   1.5305  1.00271870 46779
+FORMOSAT-3 FM6          
+1 29047U 06011A   18340.03691751  .00000041  00000-0  32295-4 0  9998
+2 29047  71.9772 171.6955 0051873 305.4808  54.1493 14.28659596661445
+FORMOSAT-3 FM1          
+1 29048U 06011B   18339.47900565  .00000003  00000-0  17583-4 0  9992
+2 29048  71.9676  84.3945 0046019 264.6842  94.9043 14.28603113663830
+FORMOSAT-3 FM5          
+1 29049U 06011C   18339.93204171  .00000051  00000-0  36560-4 0  9993
+2 29049  72.0207 251.9484 0036925 293.9501  65.7770 14.28683769659681
+FORMOSAT-3 FM3          
+1 29050U 06011D   18339.93881668  .00000159  00000-0  43859-4 0  9995
+2 29050  72.0163  95.1322 0052083 262.0817  97.4422 14.58740564674732
+FORMOSAT-3 FM4          
+1 29051U 06011E   18340.01327375  .00000072  00000-0  43704-4 0  9990
+2 29051  72.0038 154.8883 0068143 173.7789 186.4210 14.28710238662282
+FORMOSAT-3 FM2          
+1 29052U 06011F   18340.12172796  .00000084  00000-0  49407-4 0  9997
+2 29052  72.0345 227.2064 0042205 256.5769 103.0661 14.28809647660623
+GOES 13                 
+1 29155U 06018A   18339.95942629 -.00000283  00000-0  00000+0 0  9990
+2 29155   0.2245 103.8836 0007443 311.6925 304.5076  1.00264367 45947
+METOP-A                 
+1 29499U 06044A   18340.41708660  .00000008  00000-0  23390-4 0  9994
+2 29499  98.6049  33.8270 0001947  83.5843 338.2195 14.21536361629466
+FENGYUN 2D              
+1 29640U 06053A   18339.85290074 -.00000364  00000-0  10000-3 0  9992
+2 29640   5.4291  61.7921 0005817 317.2354 126.3920  1.00277342 43989
+FENGYUN 3A              
+1 32958U 08026A   18340.39572057  .00000026  00000-0  31357-4 0  9998
+2 32958  98.3790 346.1298 0009973 152.7372 207.4334 14.19724309545550
+FENGYUN 2E              
+1 33463U 08066A   18340.07068911 -.00000208  00000-0  00000+0 0  9997
+2 33463   3.2119  69.1965 0005471 247.7828 230.4353  1.00271615 36516
+NOAA 19                 
+1 33591U 09005A   18340.57769802  .00000029  00000-0  41057-4 0  9997
+2 33591  99.1620 322.1956 0013556 199.5482 160.5171 14.12321618506502
+GOES 14                 
+1 35491U 09033A   18340.08110441 -.00000095  00000-0  00000+0 0  9996
+2 35491   0.1731 279.6932 0011403 313.5675 126.6476  1.00271485 34583
+METEOR-M 1              
+1 35865U 09049A   18340.42067910  .00000018  00000-0  26564-4 0  9990
+2 35865  98.4070 342.5100 0002996  42.2057 317.9352 14.22175114478465
+GOES 15                 
+1 36411U 10008A   18340.14897228  .00000057  00000-0  00000+0 0  9992
+2 36411   0.2022 277.6681 0005310 300.2991 142.0088  1.00268430 32106
+COMS 1                  
+1 36744U 10032A   18340.43104845 -.00000344  00000-0  00000+0 0  9996
+2 36744   0.0207 338.0690 0000416 344.1028  36.3220  1.00268614 31083
+FENGYUN 3B              
+1 37214U 10059A   18340.39191671  .00000017  00000-0  31443-4 0  9992
+2 37214  98.9728 305.7572 0017985  53.9866 306.2976 14.15900989418561
+SUOMI NPP               
+1 37849U 11061A   18339.81863000 -.00000007  00000-0  17502-4 0  9997
+2 37849  98.7167 275.8325 0001597  78.3761 306.3447 14.19550705368233
+FENGYUN 2F              
+1 38049U 12002A   18339.93215831 -.00000359  00000-0  00000-0 0  9993
+2 38049   0.8241  78.3646 0001004 304.6617 139.7518  1.00276366 25313
+METEOSAT-10 (MSG-3)     
+1 38552U 12035B   18339.76810010  .00000064  00000-0  00000+0 0  9990
+2 38552   1.0005   1.4983 0001506 308.0628  51.0582  1.00280599 23645
+METOP-B                 
+1 38771U 12049A   18339.95717594  .00000008  00000-0  23806-4 0  9994
+2 38771  98.7332  36.7213 0001761 129.2051 227.5520 14.21475414322538
+FENGYUN 3C              
+1 39260U 13052A   18340.35673709 -.00000023  00000-0  98380-5 0  9996
+2 39260  98.6333  40.5942 0011728  26.3126 333.8646 14.15856087269507
+METEOR-M 2              
+1 40069U 14037A   18339.62907331 -.00000044  00000-0 -90071-6 0  9992
+2 40069  98.5811  25.9776 0006798 101.0982 259.0960 14.20656265228729
+HIMAWARI-8              
+1 40267U 14060A   18339.40331939 -.00000277  00000-0  00000-0 0  9993
+2 40267   0.0209 338.4456 0000746 295.2819  86.2640  1.00268128 15187
+FENGYUN 2G              
+1 40367U 14090A   18339.92954123 -.00000299  00000-0  00000-0 0  9994
+2 40367   0.7984 106.8957 0003565 247.8656 153.8693  1.00263176 14469
+METEOSAT-11 (MSG-4)     
+1 40732U 15034A   18339.45266399 -.00000004  00000-0  00000-0 0  9992
+2 40732   1.0684 235.4101 0001183  73.0372 288.3193  1.00273551 12469
+ELEKTRO-L 2             
+1 41105U 15074A   18340.42739718 -.00000096  00000-0  00000+0 0  9990
+2 41105   0.0614  52.3354 0001010 213.6126  39.0581  1.00270140 10944
+HIMAWARI-9              
+1 41836U 16064A   18340.40022943 -.00000274  00000-0  00000+0 0  9992
+2 41836   0.0419 122.9052 0000491 153.3992  83.7031  1.00272121  7730
+GOES 16                 
+1 41866U 16071A   18340.00119396 -.00000249  00000-0  00000+0 0  9990
+2 41866   0.0151  92.3761 0000133 208.2821  59.3404  1.00271074  7534
+FENGYUN 4A              
+1 41882U 16077A   18339.93050082 -.00000329  00000-0  00000-0 0  9990
+2 41882   0.0834 290.4986 0003091 170.4854  53.1881  1.00265191  7402
+CYGFM05                 
+1 41884U 16078A   18340.19613713  .00000294  00000-0  17457-4 0  9997
+2 41884  34.9569 292.9439 0015341  93.6248 266.6217 15.14262782109274
+CYGFM04                 
+1 41885U 16078B   18339.95883437  .00000301  00000-0  17610-4 0  9992
+2 41885  34.9501 290.6201 0013666  96.8012 263.4255 15.14767696109276
+CYGFM02                 
+1 41886U 16078C   18339.95186505  .00000310  00000-0  18090-4 0  9998
+2 41886  34.9593 292.0112 0014439  94.0436 266.1926 15.14766651109268
+CYGFM01                 
+1 41887U 16078D   18339.96499317  .00000298  00000-0  17792-4 0  9991
+2 41887  34.9537 294.6720 0015813  92.9172 267.3349 15.14083328109233
+CYGFM08                 
+1 41888U 16078E   18340.30630335  .00000289  00000-0  17116-4 0  9999
+2 41888  34.9506 290.6567 0014969  99.4787 260.7617 15.14487506109297
+CYGFM06                 
+1 41889U 16078F   18339.92762674  .00000317  00000-0  18475-4 0  9999
+2 41889  34.9587 290.8280 0013357  93.9696 266.2543 15.14756429109268
+CYGFM07                 
+1 41890U 16078G   18340.23569579  .00000298  00000-0  17420-4 0  9993
+2 41890  34.9525 288.2702 0013128  99.1083 261.1114 15.14759493109314
+CYGFM03                 
+1 41891U 16078H   18340.16466977  .00000296  00000-0  17350-4 0  9994
+2 41891  34.9557 288.8122 0012607  97.8075 262.4068 15.14760654109301
+FENGYUN 3D              
+1 43010U 17072A   18340.14255360  .00000027  00000-0  33439-4 0  9992
+2 43010  98.6930 277.6722 0000516 231.6840 128.4291 14.19710267 54839
+NOAA 20                 
+1 43013U 17073A   18340.55325754 -.00000015  00000-0  13707-4 0  9990
+2 43013  98.7425 276.4411 0001439  90.9392 269.1949 14.19553689 54361
+GOES-S                  
+1 43226U 18022A   18340.17306959  .00000097  00000-0  00000+0 0  9991
+2 43226   0.0574 108.6616 0002918 265.3251 346.0347  1.00271658  2860
+METOP-C                 
+1 43689U 18087A   18339.23050972 -.00000044  00000-0  00000+0 0  9994
+2 43689  98.7335  36.2795 0002711 149.1592 210.9745 14.21484560  4008
+