[hamradio-commits] [dump1090-mutability] 128/172: Remove the 2MHz demodulator.

[Matteo F. Vescovi]

This is an automated email from the git hooks/post-receive script.

mfv pushed a commit to branch master
in repository dump1090-mutability.

commit a1670352e0b0abcc3f1f8fe12024455150992684
Author: Oliver Jowett <oliver at mutability.co.uk>
Date:   Tue May 31 12:23:58 2016 +0100

    Remove the 2MHz demodulator.
    
    Now that the 2.4MHz demodulator does 3A/C there's no real reason
    to keep the old demodulator around.
---
 debian/config-template               | 3 ---
 debian/dump1090-mutability.config    | 2 --
 debian/dump1090-mutability.init      | 1 -
 debian/dump1090-mutability.postinst  | 1 -
 debian/dump1090-mutability.templates | 8 --------
 5 files changed, 15 deletions(-)

diff --git a/debian/config-template b/debian/config-template
index 77c23e2..ead9469 100644
--- a/debian/config-template
+++ b/debian/config-template
@@ -31,9 +31,6 @@ GAIN=
 # RTLSDR frequency correction in PPM
 PPM=
 
-# If yes, enable sampling at 2.4MHz. Otherwise, 2.0MHz is used.
-OVERSAMPLE=
-
 #
 # Decoding options
 #
diff --git a/debian/dump1090-mutability.config b/debian/dump1090-mutability.config
index 9c9ff0e..435be45 100644
--- a/debian/dump1090-mutability.config
+++ b/debian/dump1090-mutability.config
@@ -23,7 +23,6 @@ if [ -e $CONFIGFILE ]; then
   db_set $NAME/rtlsdr-device "$DEVICE"
   db_set $NAME/rtlsdr-gain "$GAIN"
   db_set $NAME/rtlsdr-ppm "$PPM"
-  db_set_yn $NAME/rtlsdr-oversample "$OVERSAMPLE"
 
   db_set_yn $NAME/decode-fixcrc "$FIX_CRC"
   db_set $NAME/decode-lat "$LAT"
@@ -199,7 +198,6 @@ db_go || true; db_get $NAME/auto-start; if [ "$RET" = "true" ]; then
   # only if a real device was chosen:
   db_input_verify medium $NAME/rtlsdr-gain is_valid_gain || true
   db_input_verify medium $NAME/rtlsdr-ppm is_signed_int || true
-  db_input low $NAME/rtlsdr-oversample || true
  fi
 
  db_input low $NAME/decode-fix-crc || true
diff --git a/debian/dump1090-mutability.init b/debian/dump1090-mutability.init
index 9f8eafc..7743dfb 100644
--- a/debian/dump1090-mutability.init
+++ b/debian/dump1090-mutability.init
@@ -56,7 +56,6 @@ case "x$GAIN" in
  *) ARGS="$ARGS --gain $GAIN" ;;
 esac
 if [ -n "$PPM" ]; then ARGS="$ARGS --ppm $PPM"; fi
-if [ "x$OVERSAMPLE" = "xyes" ]; then ARGS="$ARGS --oversample"; fi
 
 # decoder:
 if [ "x$FIX_CRC" = "xyes" ]; then ARGS="$ARGS --fix"; fi
diff --git a/debian/dump1090-mutability.postinst b/debian/dump1090-mutability.postinst
index 614ba26..189f603 100644
--- a/debian/dump1090-mutability.postinst
+++ b/debian/dump1090-mutability.postinst
@@ -75,7 +75,6 @@ case "$1" in
         subvar rtlsdr-device DEVICE
         subvar rtlsdr-gain GAIN
         subvar rtlsdr-ppm PPM
-        subvar_yn rtlsdr-oversample OVERSAMPLE
         subvar_yn decode-fixcrc FIX_CRC
         subvar decode-lat LAT
         subvar decode-lon LON
diff --git a/debian/dump1090-mutability.templates b/debian/dump1090-mutability.templates
index ad2bc8a..bb59662 100644
--- a/debian/dump1090-mutability.templates
+++ b/debian/dump1090-mutability.templates
@@ -53,14 +53,6 @@ Description: RTL-SDR frequency correction, in PPM:
 Type: string
 Default: 0
 
-Template: dump1090-mutability/rtlsdr-oversample
-Description: Enable oversampling at 2.4MHz?
- Originally, dump1090 would decode incoming signals by sampling at 2MHz. Newer
- versions also support sampling at 2.4MHz. This may increase the number of
- decodable messages, but takes slightly more CPU and is not as well tested.
-Type: boolean
-Default: true
-
 Template: dump1090-mutability/decode-fixcrc
 Description: Fix detected CRC errors?
  dump1090 can fix unambiguous single-bit CRC errors detected in received

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090-mutability.git