added analog+DVB-C/T mapping for LG xxLB580V

This commit is contained in:
hbeham
2014-06-08 22:40:40 +02:00
parent bddbf67dd5
commit eb4d507d37
4 changed files with 66 additions and 34 deletions

View File

@@ -1,6 +1,39 @@
; FileConfigurationX: overall file and DVB-S data layout
; ACTChannelDataMappingX: analog, DVB-C and DVB-T channel data mapping for data length X
[ACTChannelDataMapping:280]
; LB580V
reorderChannelData = 0
lenName = 40
offSignalSource = 8
offChannelTransponder = 10, 136, 186, 192
offProgramNr = 12, 188
offProgramNrPreset = 14, 190
offFavorites = 20
offPcrPid = 24, 252
offAudioPid = 26
offVideoPid = 28
offName = 44, 200
offNameLength = 84, 199
offServiceId = 86, 196
offFrequencyLong = 140
offOriginalNetworkId = 150
offTransportStreamId = 152
offFavorites2 = 194
offDeleted = 194
maskDeleted = 0x42
offLock = 195
maskLock = 0x01
offSkip = 195
maskSkip = 0x02
offHide = 195
maskHide = 0x04
offProgNrCustomized = 195
maskProgNrCustomized = 0x40
offServiceType = 198
offAudioPid2 = 254
[ACTChannelDataMapping:244]
; LB550U, LB561V
reorderChannelData = 0

View File

@@ -25,7 +25,7 @@ namespace ChanSort.Ui
{
public partial class MainForm : XtraForm
{
public const string AppVersion = "v2014-05-30";
public const string AppVersion = "v2014-06-08.2";
private const int MaxMruEntries = 10;
@@ -354,7 +354,7 @@ namespace ChanSort.Ui
string upperFileName = (Path.GetFileName(inputFileName) ??"").ToUpper();
foreach (var plugin in this.plugins)
{
foreach (var filter in plugin.FileFilter.ToUpper().Split('|'))
foreach (var filter in plugin.FileFilter.ToUpper().Split(';'))
{
var regex = filter.Replace(".", "\\.").Replace("*", ".*").Replace("?", ".");
if (System.Text.RegularExpressions.Regex.IsMatch(upperFileName, regex))

View File

@@ -20,7 +20,7 @@ typedef TLL52_Lnb TLL_Lnb;
#include "tll-satellite.h"
struct LB244_AnalogChannel
struct LB280_AnalogChannel
{
byte t1[8];
TLL_SignalSource SignalSource;
@@ -35,7 +35,7 @@ struct LB244_AnalogChannel
word APID1;
byte ChannelNumberInBand;
byte ChannelBand;
byte t3[18];
byte t3[14];
char CH_Name1[40];
byte CH_NameLength1;
byte t4;
@@ -49,9 +49,8 @@ struct LB244_AnalogChannel
byte t6[6];
word ONID;
word TSID;
byte t7[19];
byte t7[32];
word ChannelTransponder3;
byte t7b;
word ProgramNr2;
word LogicalProgramNr2;
word ChannelTransponder4;
@@ -61,22 +60,22 @@ struct LB244_AnalogChannel
byte ServiceType;
byte CH_NameLength2;
char CH_Name2[40];
byte t10[0];
byte t10[12];
word Frequency2Div50;
word APID2;
word u1;
word u2;
byte t11[8];
byte t11[20];
};
struct LB244_AnalogBlock
struct LB280_AnalogBlock
{
dword BlockSize;
dword ChannelCount;
LB244_AnalogChannel Channels[ChannelCount];
LB280_AnalogChannel Channels[ChannelCount];
};
struct LB244_HotelSettings
struct LB280_HotelSettings
{
byte HotelModeActive;
byte PowerOnStatus;
@@ -106,15 +105,15 @@ struct LB244_HotelSettings
byte AccessCode[4];
};
struct LB244_FirmwareBlock
struct LB280_FirmwareBlock
{
dword BlockSize;
byte u[17808];
// LB244_HotelSettings HotelSettings;
// byte Data[BlockSize - 38251 - sizeof(LB244_HotelSettings)];
byte u[0x9B00];
// LB280_HotelSettings HotelSettings;
// byte Data[BlockSize - 38251 - sizeof(LB280_HotelSettings)];
};
struct LB244_DvbCtChannel
struct LB280_DvbCtChannel
{
byte t1[8];
TLL_SignalSource SignalSource;
@@ -129,7 +128,7 @@ struct LB244_DvbCtChannel
word APID1;
byte t2c[8];
word VPID1;
byte t3[6];
byte t3[2];
char CH_Name1[40];
byte CH_NameLength1;
byte t4;
@@ -145,9 +144,8 @@ struct LB244_DvbCtChannel
word TSID;
word NID;
dword SpecialData;
byte t7[13];
byte t7[26];
word ChannelTransponder3;
byte t7b;
word ProgramNr2;
word LogicalProgramNr2;
word ChannelTransponder4;
@@ -157,19 +155,19 @@ struct LB244_DvbCtChannel
byte ServiceType;
byte CH_NameLength2;
char CH_Name2[40];
byte t10[0];
byte t10[12];
word PcrPid2;
word APID2;
word u1;
word u2;
byte t11[8];
byte t11[20];
};
struct LB244_DvbCTBlock
struct LB280_DvbCTBlock
{
dword BlockSize;
dword ChannelCount;
LB244_DvbCtChannel Channels[ChannelCount];
LB280_DvbCtChannel Channels[ChannelCount];
};
struct TLL48_Satellite // ok
@@ -243,13 +241,13 @@ struct TLL52_Lnb
};
public struct LB244
public struct LB280
{
byte Header[4];
LB244_AnalogBlock Analog;
LB244_FirmwareBlock Firmware;
LB244_DvbCTBlock DvbCT;
LB280_AnalogBlock Analog;
LB280_FirmwareBlock Firmware;
LB280_DvbCTBlock DvbCT;
TLL_DvbSBlock DvbS;
TLL_SettingsBlock Settings;
};

View File

@@ -1,12 +1,7 @@
Version v2014-05-30 =======================================================
Version v2014-06-08.2 =====================================================
Changes:
- fixed issues with LG "GlobalClone" XML file format
- supports LG LB55xx and LB56xx xxLB*.TLL channel lists
- supports LG LB58xx*.TLL channel lists
(satellite channels ONLY due to lack of DVB-C/T test files)
- supports LG *Clone*.TLL channel lists (e.g. LA8xxx, LB6xxx, LB7xxx models)
(deleting channels is not yet implemented)
- added support for LG xxLB580V analog and DVB-C/T channel lists
The complete change log can be found at the end of this document
@@ -120,6 +115,12 @@ OTHER DEALINGS IN THE SOFTWARE.
Change log ================================================================
2014-06-08.2
- added support for LG xxLB580V analog and DVB-C/T channel lists
2014-06-08
- fixed loading of Panasonic svl.db / svl.bin files
2014-05-30
- fixed issues with LG "GlobalClone" XML file format