From 1dc2e2d7397c6463f26b62e4cfdb6145bc71f9ab Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Wed, 9 Mar 2011 16:33:38 +0100
Subject: [PATCH] =?UTF-8?q?[tv]=20Mise=20=C3=A0=20jour=20des=20fr=C3=A9que?=
 =?UTF-8?q?nces=20pour=20le=20passage=20d=C3=A9finitif=20=C3=A0=20la=20TNT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: 636772d1bedecb565b90add22ff46fe2

darcs-hash:20110309153338-ffbb2-97105c5300c11b967ce70293a952ea60f4107566.gz
---
 tv/genconf/sat_base_ng.py | 10 +++++-----
 tv/genconf/sat_conf.py    | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tv/genconf/sat_base_ng.py b/tv/genconf/sat_base_ng.py
index 07dba581..7de4f5ac 100755
--- a/tv/genconf/sat_base_ng.py
+++ b/tv/genconf/sat_base_ng.py
@@ -181,23 +181,23 @@ class TNT_base(Card) :
 class TNT_R1_586000(TNT_base):
     pass
 
-class TNT_R2_474000(TNT_base):
+class TNT_R2_506000(TNT_base):
     pass
 
-class TNT_R3_522000(TNT_base):
+class TNT_R3_482000(TNT_base):
     # Canal+ : pas de diffusion la plupart du temps...
     timeout_no_diff=0
 
-class TNT_R4_498000(TNT_base):
+class TNT_R4_546000(TNT_base):
     pass
 
-class TNT_R5_538000(TNT_base):
+class TNT_R5_530000(TNT_base):
     pass
 
 class TNT_R6_562000(TNT_base):
     pass
 
-class TNT_R7_490000(TNT_base):
+class TNT_L8_570000(TNT_base):
     pass
 
 class SAT_UK_base(Card):
diff --git a/tv/genconf/sat_conf.py b/tv/genconf/sat_conf.py
index 7f3630c5..7adc3884 100755
--- a/tv/genconf/sat_conf.py
+++ b/tv/genconf/sat_conf.py
@@ -9,26 +9,26 @@ from socket import gethostname
 host = gethostname()
 
 transpondeurs = { 'canard' : [ SAT_10773h(0),
-                               SAT_10714h(1) ,
-                               #Hotbird_12597(2) ,
-                               #Hotbird_11604(3) ,
-                               TNT_R2_474000(4), # Cette carte est morte
+                               TNT_R2_506000(1), 
+                               SAT_10714h(2) ,
+                               #Hotbird_12597(3) ,
+                               #Hotbird_11604(4) ,
                                ],
                   'lapin' :  [ SAT_10714h(0) ,
                                #Hotbird_11727(1) , #Cette carte capte bizarrement, a vérifier
-                               TNT_R2_474000(2) ,
-                               TNT_R3_522000(3) ],
-                  'poulet' :  [ TNT_R3_522000(1) ], #la 0 est la carte sat + decodeur #serveur de test
+                               TNT_R5_530000(2) ,
+                               TNT_R3_482000(3) ],
+                  'poulet' :  [ TNT_R3_482000(1) ], #la 0 est la carte sat + decodeur #serveur de test
                   'dindon' :  [ TNT_R1_586000(0) ,
-                                TNT_R4_498000(1) ,
+                                TNT_R4_546000(1) ,
                                 TNT_R6_562000(2) ,  # La carte dual tuner de dindon est HS
-                                TNT_R3_522000(3) ], # ...
+                                TNT_R3_482000(3) ], # ...
                   'oie' : [    SAT_10773h(0),
                                TNT_R6_562000(1) , # les cartes d'oie ne supportent pas le multiplex R2.
                                #Hotbird_12111(2) ,
                                #Hotbird_11137(3) ,
                                SAT_11343v(4) ,
-                               TNT_R7_490000(5) ,
+                               TNT_L8_570000(5) ,
                                ]
                                }