From d5a5f2bd0998d584877ae00e281871bd7216962e Mon Sep 17 00:00:00 2001 From: Alistair Buxton Date: Thu, 23 Feb 2012 20:59:48 +0000 Subject: [PATCH] Divide rank by passrank to equalise finders. Also new finder for ITV. --- finders.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/finders.py b/finders.py index 7d38955..ba606cd 100755 --- a/finders.py +++ b/finders.py @@ -111,7 +111,7 @@ def find(self, packet): if self.r == self.row: rank += 5 rank += self.calculaterank(self.packet&0x7f) - return rank if (rank > self.passrank) else 0 + return rank/self.passrank if (rank > self.passrank) else 0 def fixup(self): self.packet[0:2] = makemrag(self.m, self.row) @@ -147,6 +147,10 @@ def check_page_info(self): "HHHHHHHHHHeeeeeeemhheeDAYe39eMONee"+"29e59e59", name="BBC Old Packet 0", row=0) +Central = Finder(" Central 217 Wed 25 Dec 18:29/53", + "HHHHHHHHHHeeeeeeeppmhhpDAYp39pMONp29e59p59", + name="Central Packet 0", row=0) + TeletextLtd = Finder(" \x04\x1d\x03Teletext\x07 \x1c100 May05\x0318:29:53", "HHHHHHHHHHe"+"e"+"e"+"eeeeeeeee"+"ee"+"mhheMON39e"+"29e59e59", name="Teletext Ltd Packet 0", row=0) @@ -155,7 +159,7 @@ def check_page_info(self): "HHHHHHHHHHeeeeeemhheDAYe39eMONe"+"eee"+"29e59e59", name="4Tel Packet 0", row=0) -all_headers = [BBC, BBCOld, TeletextLtd, FourTel] +all_headers = [BBC, BBCOld, Central, TeletextLtd, FourTel] # there are two types of broadcast packet. one has 8/4 PDC data and the other # has no encoding (not even parity). the latter is almost impossible to