added support for LG PN series

This commit is contained in:
hbeham
2013-08-21 00:19:26 +02:00
parent 27f2f6181a
commit f1d9dcb3b3
10 changed files with 446 additions and 11 deletions

View File

@@ -88,6 +88,35 @@
offServiceType = 158
offAudioPid2 = 202
[ACTChannelDataMapping:212PN]
; PN series
reorderChannelData = 0
lenName = 40
offSignalSource = 8
offChannelTransponder = 10, 110, 141, 148
offProgramNr = 12, 144
offFavorites = 22
offPcrPid = 24, 196
offAudioPid = 26
offVideoPid =
offName = 44, 156
offNameLength = 84, 155
offServiceId = 86, 152
offFrequencyLong = 112
offOriginalNetworkId = 118
offTransportStreamId = 120
offFavorites2 = 150
offDeleted = 150
maskDeleted = 0x42
offLock = 151
maskLock = 0x01
offSkip = 151
maskSkip = 0x02
offHide = 151
maskHide = 0x04
offServiceType = 154
offAudioPid2 = 198
[ACTChannelDataMapping:192]
; LM series with Firmware 4.x (all except LM611S and LM340S)
reorderChannelData = 0
@@ -265,7 +294,7 @@
offServiceType = 115
offAudioPid2 = 158
[ACTChannelDataMapping:LH3000]
[ACTChannelDataMapping:164LH3000]
; LH3000
reorderChannelData = 1
lenName = 40

View File

@@ -278,9 +278,12 @@ namespace ChanSort.Loader.LG
if (channelCount == 0) return;
recordSize = GetActChannelRecordSize(off, blockSize, channelCount);
var key = (Path.GetFileNameWithoutExtension(this.FileName) ?? "").ToUpper().StartsWith("XXLH3000")
? "LH3000"
: recordSize.ToString();
var key = recordSize.ToString();
string basename = (Path.GetFileNameWithoutExtension(this.FileName) ?? "").ToUpper();
if (basename.StartsWith("XXLH3000"))
key += "LH3000";
else if (basename.StartsWith("XXPN"))
key += "PN";
var actMapping = this.actMappings.GetMapping(key);
this.reorderPhysically = actMapping.Settings.GetInt("reorderChannelData") != 0;

View File

@@ -25,7 +25,7 @@ namespace ChanSort.Ui
{
public partial class MainForm : XtraForm
{
public const string AppVersion = "v2013-08-19";
public const string AppVersion = "v2013-08-21";
private const int MaxMruEntries = 5;

View File

@@ -0,0 +1,164 @@
#include "tll-common.h"
struct PN212_AnalogChannel
{
byte t1[8];
TLL_SignalSource SignalSource;
byte t1b;
word ChannelTransponder1;
word ProgramNr;
word t2[3];
byte Favorites1;
byte t2d;
word Frequency1Div50;
word APID1;
byte ChannelNumberInBand;
byte ChannelBand;
byte t3[4];
char CH_Name1[40];
byte CH_NameLength1;
byte t4;
word SID1;
byte t5a[30];
word ChannelTransponder2;
dword Frequency;
byte t6[2];
word ONID;
word TSID;
byte t7[23];
word ChannelTransponder3;
byte t7b;
word ProgramNr2;
byte t8[2];
word ChannelTransponder4;
byte t8b[4];
byte Favorites2;
byte LockSkipHide;
word SID2;
byte ServiceType;
byte CH_NameLength2;
char CH_Name2[40];
word Frequency2Div50;
word APID2;
byte t11[8];
};
struct PN212_AnalogBlock
{
dword BlockSize;
dword ChannelCount;
PN212_AnalogChannel Channels[ChannelCount];
};
struct PN212_HotelSettings
{
byte HotelModeActive;
byte PowerOnStatus;
byte SetupMenuDisplay;
byte ProgramChange;
byte InputSourceChange;
byte MenuDisplay;
byte OsdDisplay;
byte LgIrOperation;
byte LocalKeyOp;
byte MaxVolume;
byte DtvChannelUpdate;
byte PowerOnDefault;
byte InputSource;
word Programme;
byte Volume;
byte AvSettings;
byte RadioVideoBlank;
// byte unknown1;
byte StartProgNr;
// byte unknown2;
byte NumberOfPrograms;
byte RadioNameDisplay;
byte unknown3[2];
byte AccessCode[4];
};
struct PN212_FirmwareBlock
{
dword BlockSize;
byte u1[13623];
PN212_HotelSettings HotelSettings;
byte Data[BlockSize - sizeof(HotelSettings) - 13623];
};
struct PN212_UnknownBlock
{
dword BlockSize;
byte Data[BlockSize];
};
struct PN212_DvbCtChannel
{
byte t1[8];
TLL_SignalSource SignalSource;
byte t1b;
word ChannelTransponder1;
word ProgramNr;
word LogicalChannelNr;
byte t2[6];
byte Favorites1;
byte t2d;
word PcrPID : 14;
word Unk : 2;
word APID1;
byte ChannelNumberInBand;
byte ChannelBand;
byte t3[14];
char CH_Name1[40];
byte CH_NameLength1;
byte t4;
word SID1;
byte t5a[21];
byte NIT_Version;
word ChannelTransponder2;
dword Frequency;
byte t6[2];
word ONID;
word TSID;
word NID;
byte t7[17];
word ChannelTransponder3;
byte t7b;
word ProgramNr2;
word LogicalChannelNr2;
word ChannelTransponder4;
byte t8b[0];
byte Favorites2;
byte LockSkipHide;
word SID2;
byte ServiceType;
byte CH_NameLength2;
char CH_Name2[40];
word PcrPID2 : 14;
word Unk2 : 2;
word APID2;
byte t11[12];
};
struct PN212_DvbCTBlock
{
dword BlockSize;
dword ChannelCount;
PN212_DvbCtChannel Channels[ChannelCount];
};
struct PN212_SettingsBlock
{
dword BlockSize;
byte Data[BlockSize];
};
public struct PN212
{
byte Header[4];
PN212_AnalogBlock Analog;
PN212_FirmwareBlock Firmware;
PN212_DvbCTBlock DvbCT;
PN212_SettingsBlock Settings;
};

View File

@@ -0,0 +1,16 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Test.Loader.LG
{
[TestClass]
public class TestPN : TestBase
{
[TestMethod]
public void TestPN6500_C212TR()
{
// "Backlit"
//this.GenerateTestFiles("PN/xxPN6500-ZB00001");
this.ExecuteTest("PN/xxPN6500-ZB00001");
}
}
}

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,223 @@
,1,,C-1537-24-2403-31,"TVP 1 HD",DCT0,
,2,,C-1537-24-2405-31,"TVP 2 HD",DCT0,
,3,,C-1537-24-2401-31,"TVN HD",DCT0,
,4,,C-1537-18-1802-18,"Polsat HD",DCT0,
,5,,C-1537-51-5103-01,"TVP Info (Katowice)",DCT0,
,6,,C-1537-28-2804-28,"TVN24 HD",DCT0,
,7,,C-1537-16-1601-16,"Polsat News",DCT0,
,8,,C-1537-4-405-04,"Superstacja",DCT0,
,9,,C-1537-3-310-03,"TTV",DCT0,
,10,,C-1537-29-2902-29,"TVN7 HD",DCT0,
,11,,C-1537-25-2505-25,"TVS HD",DCT0,
,12,,C-1537-29-2903-29,"TVN Style HD",DCT0,
,13,,C-1537-2-203-02,"Polsat Cafe",DCT0,
,14,,C-1537-4-407-04,"4fun.tv",DCT0,
,15,,C-1537-3-301-03,"ESKA TV",DCT0,
,16,,C-1537-26-2605-26,"MTV Live HD",DCT0,
,17,,C-1537-23-2305-23,"RBL.TV",DCT0,
,18,,C-1537-10-1007-10,"VIVA Polska",DCT0,
,19,,C-1537-17-1703-17,"Kino Polska Muzyka",DCT0,
,20,,C-1537-26-2603-26,"kuchnia+ HD",DCT0,
,21,,C-1537-20-2003-20,"TLC HD",DCT0,
,22,,C-1537-7-704-07,"CBS Reality",DCT0,
,23,,C-1537-9-910-09,"CBS Drama",DCT0,
,24,,C-1537-10-1006-10,"Comedy Central",DCT0,
,25,,C-1537-10-1005-10,"Comedy Central Family",DCT0,
,26,,C-1537-5-501-05,"CBS Europa",DCT0,
,27,,C-1537-11-1102-11,"CBS Action",DCT0,
,28,,C-1537-24-2402-24,"FOX Life HD",DCT0,
,29,,C-1537-6-606-06,"AXN",DCT0,
,30,,C-1537-7-703-07,"MiniMini+",DCT0,
,31,,C-1537-18-1804-18,"Animal Planet HD",DCT0,
,32,,C-1537-27-2708-27,"Travel Channel HD",DCT0,
,33,,C-1537-29-2904-29,"TVN Turbo HD",DCT0,
,34,,C-1537-14-1402-14,"National Geographic HD",DCT0,
,38,,C-1537-26-2601-26,"Discovery Channel HD",DCT0,
,39,,C-1537-6-602-06,"Discovery World",DCT0,
,40,,C-1537-6-601-06,"Discovery Science",DCT0,
,41,,C-1537-27-2701-27,"PLANETE+ HD",DCT0,
,43,,C-1537-3-303-03,"TVP Kultura",DCT0,
,44,,C-1537-2-208-02,"TVP Sport",DCT0,
,45,,C-1537-14-1401-14,"Polsat Sport HD",DCT0,
,46,,C-1537-20-2002-20,"Polsat Sport Extra HD",DCT0,
,48,,C-1537-3-302-03,"Polsat Sport News",DCT0,
,49,,C-1537-23-2303-23,"Orange Sport",DCT0,
,50,,C-1537-27-2703-27,"Eurosport HD",DCT0,
,51,,C-1537-25-2504-25,"Eurosport 2 HD",DCT0,
,52,,C-1537-11-1104-11,"SportKlub",DCT0,
,53,,C-1537-5-504-05,"Extreme Sports Channel",DCT0,
,54,,C-1537-27-2702-27,"ale kino+ HD",DCT0,
,55,,C-1537-5-506-05,"TCM",DCT0,
,56,,C-1537-9-906-09,"BBC World News",DCT0,
,57,,C-1537-17-1708-17,"TVN CNBC",DCT0,
,58,,C-1537-6-609-06,"CNN",DCT0,
,59,,C-1537-11-1106-11,"euronews",DCT0,
,60,,C-1537-7-710-07,"TVN Meteo",DCT0,
,61,,C-1537-10-1009-10,"Bloomberg",DCT0,
,64,,C-1537-25-2503-25,"Mezzo Live HD",DCT0,
,65,,C-1537-4-408-04,"TV Trwam",DCT0,
,66,,C-1537-51-5111-01,"TV Puls",DCT0,
,67,,C-1537-3-307-03,"Polo TV",DCT0,
,68,,C-1537-2-201-02,"TVP Seriale",DCT0,
,69,,C-1537-18-1807-18,"TVP HD",DCT0,
,70,,C-1537-3-309-03,"TVP Rozrywka",DCT0,
,71,,C-1537-3-308-03,"PULS 2",DCT0,
,72,,C-1537-9-908-09,"JimJam Polsat",DCT0,
,101,,C-1537-51-5101-01,"TVP 1",DCT0,
,102,,C-1537-51-5102-01,"TVP 2",DCT0,
,107,,C-1537-2-211-02,"Code Download",DCT0,H
,108,,C-1537-23-2309-23,"Test 932",DCT0,H
,109,,C-1537-8-809-08,"BBC Lifestyle",DCT0,
,111,,C-1537-8-808-08,"BBC Entertainment",DCT0,
,112,,C-1537-17-1701-17,"ID",DCT0,
,113,,C-1537-6-603-06,"TLC",DCT0,
,115,,C-1537-6-610-06,"Instrukcja obsøugi",DCT0,H
,116,,C-1537-11-1112-11,"TVN Style",DCT0,
,117,,C-1537-16-1606-16,"TVN Turbo",DCT0,
,118,,C-1537-2-212-02,"D4aCCL",DCT0,H
,119,,C-1537-4-402-04,"Tele 5",DCT0,
,120,,C-1537-9-909-09,"Fashion TV",DCT0,
,121,,C-1537-27-2704-27,"BBC HD",DCT0,
,122,,C-1537-8-811-08,"LOVE",DCT0,
,123,,C-1537-30-3001-30,"Test956",DCT0,H
,124,,C-1537-5-509-05,"E! Entertainment",DCT0,
,146,,C-1537-13-1308-13,"DOMO+",DCT0,
,147,,C-1537-26-2602-26,"DOMO+ HD",DCT0,
,148,,C-1537-21-2107-21,"COD 2.5 BBC App",DCT0,H
,149,,C-1537-23-2308-23,"Test 931",DCT0,H
,150,,C-1537-4-406-04,"Polsat 2",DCT0,
,155,,C-1537-3-306-03,"TV 6",DCT0,
,159,,C-1537-4-409-04,"TVR",DCT0,
,160,,C-1537-3-304-03,"ATM Rozrywka",DCT0,
,320,,C-1537-51-5107-01,"Polsat",DCT0,
,332,,C-1537-15-1510-15,"TVN 24",DCT0,
,333,,C-1537-51-5105-01,"TVN",DCT0,
,334,,C-1537-2-206-02,"Polsat Biznes",DCT0,
,336,,C-1537-4-411-04,"Galeria UPC",DCT0,
,341,,C-1537-51-5106-01,"TV 4",DCT0,
,347,,C-1537-18-1801-18,"Fashion TV HD",DCT0,
,350,,C-1537-51-5108-01,"TVP Info (KrakÂow)",DCT0,
,351,,C-1537-4-412-04,"TVS",DCT0,
,352,,C-1537-51-5110-01,"TVN 7",DCT0,
,353,,C-1537-51-5104-01,"TVP Polonia",DCT0,
,360,,C-1537-51-5109-01,"dlaCiebie.tv",DCT0,
,369,,C-1537-2-207-02,"National Geographic",DCT0,
,371,,C-1537-2-205-02,"Nat Geo Wild",DCT0,
,373,,C-1537-15-1511-15,"Crime & Investigation Polsat",DCT0,
,375,,C-1537-6-605-06,"Discovery Channel",DCT0,
,380,,C-1537-6-604-06,"Animal Planet",DCT0,
,382,,C-1537-5-502-05,"Travel Channel",DCT0,
,384,,C-1537-7-702-07,"PLANETE+",DCT0,
,387,,C-1537-19-1901-19,"Discovery Historia",DCT0,
,388,,C-1537-3-305-03,"TVP Historia",DCT0,
,389,,C-1537-13-1304-13,"History",DCT0,
,390,,C-1537-25-2502-25,"History HD",DCT0,
,391,,C-1537-20-2001-20,"Nat Geo Wild HD",DCT0,
,393,,C-1537-8-810-08,"BBC Knowledge",DCT0,
,443,,C-1537-8-804-08,"Canal+",DCT0,
,444,,C-1537-28-2801-28,"Canal+ HD",DCT0,
,445,,C-1537-8-806-08,"Canal+ Film",DCT0,
,446,,C-1537-28-2805-28,"Canal+ Film HD",DCT0,
,448,,C-1537-26-2606-26,"Canal+ Film2 HD",DCT0,
,449,,C-1537-8-805-08,"Canal+ Sport",DCT0,
,450,,C-1537-14-1403-14,"Canal+ Sport HD",DCT0,
,451,,C-1537-22-2202-22,"Canal+ Family",DCT0,
,452,,C-1537-28-2803-28,"Canal+ Family HD",DCT0,
,453,,C-1537-15-1512-15,"Canal+ Family2",DCT0,
,454,,C-1537-28-2802-28,"Canal+ Family2 HD",DCT0,
,456,,C-1537-9-903-09,"HBO",DCT0,
,457,,C-1537-14-1405-14,"HBO HD",DCT0,
,458,,C-1537-9-902-09,"HBO 2",DCT0,
,459,,C-1537-29-2901-29,"HBO2 HD",DCT0,
,460,,C-1537-9-901-09,"HBO Comedy",DCT0,
,461,,C-1537-20-2004-20,"HBO Comedy HD",DCT0,
,462,,C-1537-9-905-09,"Cinemax",DCT0,
,463,,C-1537-20-2005-20,"Cinemax HD",DCT0,
,464,,C-1537-9-904-09,"Cinemax 2",DCT0,
,465,,C-1537-25-2501-25,"Cinemax2 HD",DCT0,
,470,,C-1537-19-1903-19,"FilmBox",DCT0,
,471,,C-1537-18-1803-18,"FilmBox HD",DCT0,
,472,,C-1537-17-1705-17,"FilmBox Extra",DCT0,
,473,,C-1537-19-1902-19,"FilmBox Family",DCT0,
,474,,C-1537-15-1508-15,"Kino Polska",DCT0,
,477,,C-1537-16-1605-16,"AXN Spin",DCT0,
,479,,C-1537-6-608-06,"AXN Crime",DCT0,
,480,,C-1537-6-607-06,"AXN Sci-Fi",DCT0,
,481,,C-1537-11-1107-11,"13th STREET Universal",DCT0,
,482,,C-1537-8-801-08,"ale kino+",DCT0,
,486,,C-1537-10-1008-10,"Universal Channel",DCT0,
,488,,C-1537-10-1010-10,"FOX Life",DCT0,
,489,,C-1537-24-2402-31,"FOX Life HD",DCT0,
,493,,C-1537-17-1704-17,"Sundance Channel",DCT0,
,494,,C-1537-24-2404-24,"Sundance Channel HD",DCT0,
,495,,C-1537-7-705-07,"FOX",DCT0,
,496,,C-1537-14-1406-14,"FOX HD",DCT0,
,499,,C-1537-15-1507-15,"Polsat Film",DCT0,
,521,,C-1537-15-1504-15,"Nautical Channel",DCT0,
,523,,C-1537-15-1505-15,"The Player Channel",DCT0,
,557,,C-1537-2-204-02,"Polsat Sport Extra",DCT0,
,560,,C-1537-13-1306-13,"Polsat Play",DCT0,
,563,,C-1537-2-202-02,"Polsat Sport",DCT0,
,564,,C-1537-11-1101-11,"Eurosport",DCT0,
,566,,C-1537-7-701-07,"Eurosport 2",DCT0,
,572,,C-1537-11-1110-11,"Motors TV",DCT0,
,667,,C-1537-5-510-05,"Baby First TV",DCT0,
,669,,C-1537-10-1011-10,"Nickelodeon",DCT0,
,670,,C-1537-5-505-05,"Cartoon Network",DCT0,
,671,,C-1537-21-2103-21,"Disney Channel",DCT0,
,672,,C-1537-8-807-08,"Disney XD",DCT0,
,673,,C-1537-11-1103-11,"Disney Junior",DCT0,
,674,,C-1537-7-709-07,"Da Vinci Learning",DCT0,
,675,,C-1537-5-508-05,"Boomerang",DCT0,
,676,,C-1537-8-802-08,"teleTOON+",DCT0,
,770,,C-1537-3-312-03,"TVP Info RzeszÂow",DCT0,H
,771,,C-1537-10-1004-10,"MTV Polska",DCT0,
,772,,C-1537-15-1506-15,"TV.DISCO",DCT0,
,777,,C-1537-22-2204-22,"Strefa Filmowa",DCT0,H
,778,,C-1537-8-803-08,"kuchnia+",DCT0,
,779,,C-1537-10-1001-10,"MTV Rocks",DCT0,
,780,,C-1537-10-1003-10,"MTV Hits",DCT0,
,781,,C-1537-10-1002-10,"MTV Dance",DCT0,
,782,,C-1537-22-2209-22,"Test COD2.5 7D",DCT0,H
,783,,C-1537-15-1501-15,"VH 1",DCT0,
,785,,C-1537-23-2307-23,"Test 930",DCT0,H
,787,,C-1537-3-311-03,"TVP Info PoznaÂn",DCT0,H
,788,,C-1537-4-410-04,"religia.tv",DCT0,
,790,,C-1537-17-1706-17,"CzwÂorka Polskie Radio",DCT0,
,795,,C-1537-11-1105-11,"Mezzo",DCT0,
,807,,C-1537-11-1109-11,"RTR Planeta",DCT0,
,808,,C-1537-17-1707-17,"Russia Today",DCT0,
,814,,C-1537-13-1301-13,"Deutsche Welle",DCT0,
,817,,C-1537-13-1303-13,"TV5Monde",DCT0,
,818,,C-1537-13-1302-13,"France 24",DCT0,
,851,,C-1537-4-401-04,"Mango 24",DCT0,
,854,,C-1537-13-1305-13,"POLONIA 1",DCT0,
,856,,C-1537-4-404-04,"Edusat",DCT0,
,863,,C-1537-4-403-04,"iTV",DCT0,
,866,,C-1537-22-2205-22,"Kosmica TV",DCT0,
,901,,C-1537-11-1108-11,"Hustler TV",DCT0,
,902,,C-1537-15-1502-15,"Daring!TV",DCT0,
,903,,C-1537-15-1503-15,"Private Spice",DCT0,
,904,,C-1537-24-2401-24,"TVN HD",DCT0,
,905,,C-1537-24-2403-24,"TVP 1 HD",DCT0,
,906,,C-1537-24-2405-24,"TVP 2 HD",DCT0,
,907,,C-1537-24-2404-31,"Sundance Channel HD",DCT0,
,1,,C-1537-12-1221-12,"Polskie Radio Jedynka",DCR0,H
,2,,C-1537-12-1222-12,"Polskie Radio DwÂojka",DCR0,H
,3,,C-1537-12-1223-12,"Polskie Radio TrÂojka",DCR0,H
,4,,C-1537-12-1224-12,"Polskie Radio CzwÂorka",DCR0,H
,5,,C-1537-12-1226-12,"RMF Classic",DCR0,H
,6,,C-1537-12-1227-12,"RMF Maxxx",DCR0,H
,7,,C-1537-12-1234-12,"VOX FM",DCR0,H
,8,,C-1537-12-1235-12,"ESKA Rock",DCR0,H
,9,,C-1537-12-1236-12,"KOLOR 103 FM",DCR0,H
,10,,C-1537-12-1237-12,"Radio Zøote Przeboje",DCR0,H
,11,,C-1537-12-1238-12,"Radio ESKA",DCR0,H
,12,,C-1537-12-1239-12,"Radio Wawa",DCR0,H
,13,,C-1537-12-1231-12,"PIN",DCR0,H
,14,,C-1537-12-1228-12,"ZET",DCR0,H
,15,,C-1537-12-1233-12,"Radio ZET Gold",DCR0,H
,16,,C-1537-12-1229-12,"Antyradio",DCR0,H
,17,,C-1537-12-1230-12,"CHILLI ZET",DCR0,H
,18,,C-1537-12-1232-12,"TOK FM",DCR0,H
,19,,C-1537-12-1225-12,"RMF FM",DCR0,H

View File

@@ -85,6 +85,7 @@
<Compile Include="LW\TestLW.cs" />
<Compile Include="LX\TestLX.cs" />
<Compile Include="PM\TestPM.cs" />
<Compile Include="PN\TestPN.cs" />
<Compile Include="PT\TestPT.cs" />
<Compile Include="TestBase.cs" />
<Compile Include="LH\TestLH.cs" />

View File

@@ -1,11 +1,7 @@
Version v2013-08-19 ======================================================
Version v2013-08-21 ======================================================
Changes:
- Fixed loading Samsung B-series channel lists
- Changed file filter for LG to "xx*.TLL" to exclude the GlobalClone*.TLL
files of LA and LN series.
- Fixed "New version available" info screen
- Improved error handling
- Added support for LG PN Series (tested with PN6500)
The complete change log can be found at the end of this document
@@ -111,6 +107,9 @@ OTHER DEALINGS IN THE SOFTWARE.
Change log ================================================================
2013-08-21
- Added support for LG PN Series (tested with PN6500)
2013-08-19
- Fixed loading Samsung B-series channel lists
- Changed file filter for LG to "xx*.TLL" to exclude the GlobalClone*.TLL