diff -Nru w-scan-20111011/char-coding.c w-scan-20111203/char-coding.c --- w-scan-20111011/char-coding.c 2011-10-11 16:04:14.000000000 +0000 +++ w-scan-20111203/char-coding.c 2011-12-03 14:26:09.000000000 +0000 @@ -253,10 +253,11 @@ for (i = 0; i < nsrc; i++) { switch((uint8_t) *(psrc + i)) { - case 0x20 ... 0x7E: - case 0xA0 ... 0xFF: + //case 0x20 ... 0x7E: + //case 0xA0 ... 0xFF: // printable chars ISO-6937-2 // Figure A.1: Character code table 00 - Latin alphabet + case 0x01 ... 0xFF: // 20121202: don't touch anything; leave it as it is. *(pdest + pos++) = *(psrc + i); default:; } diff -Nru w-scan-20111011/config.h w-scan-20111203/config.h --- w-scan-20111011/config.h 2011-10-11 16:19:07.000000000 +0000 +++ w-scan-20111203/config.h 2011-12-03 15:26:17.000000000 +0000 @@ -60,13 +60,13 @@ #define PACKAGE_NAME "w_scan" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "w_scan 20111011" +#define PACKAGE_STRING "w_scan 20111203" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "w_scan" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20111011" +#define PACKAGE_VERSION "20111203" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -94,7 +94,7 @@ /* Version number of package */ -#define VERSION "20111011" +#define VERSION "20111203" /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff -Nru w-scan-20111011/configure w-scan-20111203/configure --- w-scan-20111011/configure 2011-10-11 16:19:14.000000000 +0000 +++ w-scan-20111203/configure 2011-12-03 15:26:14.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for w_scan 20111011. +# Generated by GNU Autoconf 2.63 for w_scan 20111203. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='w_scan' PACKAGE_TARNAME='w_scan' -PACKAGE_VERSION='20111011' -PACKAGE_STRING='w_scan 20111011' +PACKAGE_VERSION='20111203' +PACKAGE_STRING='w_scan 20111203' PACKAGE_BUGREPORT='' ac_unique_file="scan.c" @@ -1283,7 +1283,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures w_scan 20111011 to adapt to many kinds of systems. +\`configure' configures w_scan 20111203 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1349,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of w_scan 20111011:";; + short | recursive ) echo "Configuration of w_scan 20111203:";; esac cat <<\_ACEOF @@ -1435,7 +1435,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -w_scan configure 20111011 +w_scan configure 20111203 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1449,7 +1449,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by w_scan $as_me 20111011, which was +It was created by w_scan $as_me 20111203, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2301,7 +2301,7 @@ # Define the identity of the package. PACKAGE='w_scan' - VERSION='20111011' + VERSION='20111203' cat >>confdefs.h <<_ACEOF @@ -5951,7 +5951,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by w_scan $as_me 20111011, which was +This file was extended by w_scan $as_me 20111203, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6014,7 +6014,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -w_scan config.status 20111011 +w_scan config.status 20111203 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru w-scan-20111011/configure.in w-scan-20111203/configure.in --- w-scan-20111011/configure.in 2011-10-11 16:17:49.000000000 +0000 +++ w-scan-20111203/configure.in 2011-12-03 15:25:34.000000000 +0000 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([w_scan], [20111011]) +AC_INIT([w_scan], [20111203]) AC_CONFIG_SRCDIR([scan.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE diff -Nru w-scan-20111011/countries.c w-scan-20111203/countries.c --- w-scan-20111011/countries.c 2011-10-11 16:04:14.000000000 +0000 +++ w-scan-20111203/countries.c 2011-12-03 13:23:05.000000000 +0000 @@ -319,13 +319,14 @@ default: return SKIP_CHANNEL; } case DVBT_DE: //GERMANY - case DVBT_FR: //FRANCE, +/- offset + case DVBT_FR: //FRANCE, +/- offset 166kHz & +offset 332kHz & +offset 498kHz case DVBT_GB: //UNITED KINGDOM, +/- offset switch (channel) { - case 5 ... 12: return 142500000; + case 5 ... 12: return 142500000; // VHF unused in FRANCE, skip those in offset loop case 21 ... 69: return 306000000; default: return SKIP_CHANNEL; } + case DVBC_QAM: //EUROPE switch (channel) { case 0 ... 1: @@ -442,6 +443,20 @@ } } case DVBT_FR: + switch (channel) { + // see http://tvignaud.pagesperso-orange.fr/tv/canaux.htm + case 5 ... 12: //VHF channels not used in FR + return STOP_OFFSET_LOOP; + default: //UHF channels. - 0,166 MHz /+ 0,166 MHz /+ 0,332 MHz /+ 0,498 MHz + switch (index) { + case NO_OFFSET: return 0; //center freq + case POS_OFFSET: return +166000; //center+offset 166kHz + case NEG_OFFSET: return -166000; //center-offset 166kHz + case POS_OFFSET_1: return +332000; //center+offset 332kHz + case POS_OFFSET_2: return +498000; //center+offset 498kHz + default: return STOP_OFFSET_LOOP; + } + } case DVBT_GB: switch (channel) { case 5 ... 12: //VHF channels diff -Nru w-scan-20111011/countries.h w-scan-20111203/countries.h --- w-scan-20111011/countries.h 2011-10-11 16:04:14.000000000 +0000 +++ w-scan-20111203/countries.h 2011-12-03 13:02:55.000000000 +0000 @@ -55,6 +55,8 @@ NO_OFFSET = 0, POS_OFFSET = 1, NEG_OFFSET = 2, + POS_OFFSET_1 = 3, + POS_OFFSET_2 = 4, STOP_OFFSET_LOOP = -1 }; diff -Nru w-scan-20111011/debian/changelog w-scan-20111203/debian/changelog --- w-scan-20111011/debian/changelog 2011-10-29 11:40:13.000000000 +0000 +++ w-scan-20111203/debian/changelog 2011-12-11 15:09:27.000000000 +0000 @@ -1,3 +1,9 @@ +w-scan (20111203-1) unstable; urgency=low + + * New upstream release + + -- Tobias Grimm Sun, 11 Dec 2011 16:08:56 +0100 + w-scan (20111011-1) unstable; urgency=low * New upstream release diff -Nru w-scan-20111011/scan.c w-scan-20111203/scan.c --- w-scan-20111011/scan.c 2011-10-11 16:04:14.000000000 +0000 +++ w-scan-20111203/scan.c 2011-12-03 13:08:35.000000000 +0000 @@ -107,8 +107,8 @@ static unsigned int modulation_max = 1; // initialization of modulation loop. QAM256 if FE_QAM static unsigned int dvbc_symbolrate_min = 0; // initialization of symbolrate loop. 6900 static unsigned int dvbc_symbolrate_max = 1; // initialization of symbolrate loop. 6875 -static unsigned int freq_offset_min = 0; // initialization of freq offset loop. 0 == offset (0), 1 == offset(+), 2 == offset(-) -static unsigned int freq_offset_max = 2; // initialization of freq offset loop. +static unsigned int freq_offset_min = 0; // initialization of freq offset loop. 0 == offset (0), 1 == offset(+), 2 == offset(-), 3 == offset1(+), 4 == offset2(+) +static unsigned int freq_offset_max = 4; // initialization of freq offset loop. static int this_channellist = DVBT_DE; // w_scan uses by default DVB-t static unsigned int ATSC_type = ATSC_VSB; // 20090227: flag type vars shouldnt be signed. static unsigned int no_ATSC_PSIP = 0; // 20090227: initialization was missing, signed -> unsigned @@ -256,8 +256,8 @@ } break; default: - // 500kHz - if (diff < 500000) { + // 750kHz + if (diff < 750000) { debug("f1 = %u is same TP as f2 = %u (diff=%d)\n", f1, f2, diff); return 1; } diff -Nru w-scan-20111011/version.h w-scan-20111203/version.h --- w-scan-20111011/version.h 2011-10-11 16:17:49.000000000 +0000 +++ w-scan-20111203/version.h 2011-12-03 14:26:26.000000000 +0000 @@ -1,6 +1,6 @@ /* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */ #ifndef W_SCAN_VERSION_H #define W_SCAN_VERSION_H -uint version=20111011; +uint version=20111203; #endif Binary files /tmp/QadziRbAzl/w-scan-20111011/w_scan and /tmp/9sZHq5OKrJ/w-scan-20111203/w_scan differ diff -Nru w-scan-20111011/w_scan_start.sh w-scan-20111203/w_scan_start.sh --- w-scan-20111011/w_scan_start.sh 2011-10-11 16:18:16.000000000 +0000 +++ w-scan-20111203/w_scan_start.sh 2011-12-03 14:26:49.000000000 +0000 @@ -38,7 +38,7 @@ DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710 W_SCAN=$(which w_scan 2>/dev/null) UDEVSTART=$(which udevstart) -SCRIPT_VERSION=20111011 +SCRIPT_VERSION=20111203 W_SCAN_VERSION=$($W_SCAN -V 2>&1)