diff --git a/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini b/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini index a3e5c8c..4332ee3 100644 --- a/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini +++ b/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini @@ -225,6 +225,63 @@ lenProvider=52 #[dtv_cmdb_2.bin:3525205] +# H.P. ChangHong / Chiq L32H7N V1.1.6 +[dtv_cmdb_2.bin:4525017] +offChannelBitmap=8 +lenChannelBitmap=0x274 +offChannelRecord=0x27C +lenChannelRecord=664 +numChannelRecord=5000 +offTransponderBitmap=0x0032ab3c +lenTransponderBitmap=376 +offTransponderRecord=0x0032acb4 +lenTransponderRecord=392 +numTransponderRecord=3000 +offSatelliteBitmap=0x0044d428 +lenSatelliteBitmap=32 +offSatelliteRecord=0x0044d448 +lenSatelliteRecord=56 +numSatelliteRecord=254 + +[dvbsChannel:664] +offEncrypted=13 +maskEncrypted=0x10 +offSkip=13 +maskSkip=0x20 +offLocked=13 +maskLocked=0x40 +offChannelType=15 +offServiceType=16 +offFav=18 +maskFav=1 +offTransponderIndex=22 +offPmtPid=24 +offPcrPid=28 +offVideoPid=30 +offProgramNr=34 +offServiceId=36 +offAudioPid=62 +offName=250 +lenName=66 +offProvider=316 +lenProvider=270 + +[dvbsTransponder:392] +offSatelliteIndex=0 +offTransportStreamId=6 +offOriginalNetworkId=8 +offNetworkId=10 +offTransponderIndex=14 +offFreqInMhz=16 +offSymbolRate=28 + +[dvbsSatellite:56] +offName=2 +lenName=22 +offOrbitalPos=38 + + + # blackbox - 4532 KB [dtv_cmdb_2.bin:4640189] diff --git a/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/dtv_cmdb_2-bin.h b/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/dtv_cmdb_2-bin.h index 17d889a..70203c1 100644 --- a/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/dtv_cmdb_2-bin.h +++ b/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/dtv_cmdb_2-bin.h @@ -200,6 +200,93 @@ public struct dtv_cmdb_2_4532 }; +#undef channelSize +#define channelSize 664 +#undef transponderSize +#define transponderSize 392 +#undef satelliteSize +#define satelliteSize 56 + +struct Channel_4419 +{ + var off0 = current_offset; + word channelIndex; + byte u1[11]; + Flags flags; + byte u2; + ChannelType channelType; + word serviceType; + word fav; + byte u2b[2]; + word transponderIndex; + DvbId pmtPid; + word u3; + DvbId pcrPid; + DvbId videoPid; + word u4; + word programNr; + word serviceId; + byte u5[24]; + DvbId audioPid; + byte u6[186]; + char name[66]; + char provider[270]; + byte unk[channelSize - 4 - (current_offset - off0)]; + dword bytesum; +}; + +struct Transponder_4419 +{ + var off0 = current_offset; + word satelliteIndex; + word u1[2]; + word tsid; + word onid; + word nid_maybe; + word u2; + word transpoderNumber; + word freqInMhz; + byte u3[10]; + word symrate; + byte unk[transponderSize - (current_offset - off0)]; +}; + +struct Satellite_4419 +{ + var off0 = current_offset; + byte u[2]; + char name[22]; + word lowFreq; + word highFreq; + byte u3[10]; + byte oribtalPos; + byte unk[satelliteSize - (current_offset - off0)]; +}; + +public struct dtv_cmdb_2_4419 +{ + char magic[4]; + word u1; + word u2; + byte channelBitmap[0x274]; + Channel_4419 channels[5000]; + + byte transponderBitmap[376]; + Transponder_4419 transponder[3000]; + + byte unknownBitmap[32]; + struct { + word u1; + word onid; + byte unknownData[50]; + } unknown[254]; + + byte satelliteBitmap[32]; + Satellite_4419 satellites[254]; + + byte _0x30; +}; + #undef channelSize #define channelSize 256 diff --git a/source/changelog.md b/source/changelog.md index 84af5ab..80e1144 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -1,6 +1,9 @@ ChanSort Change Log =================== +2022-04-11 +- added ChangHong/Chiq L32H7N dtv_cmdb_2.bin format (4419 KB size) + 2022-03-20 - Philips \*Table and \*.dat format: now showing "Encrypted" information - added ChangHong LED40D3000ISX dtv_cmdb_2.bin format (1489 KB size) diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd index 319344c..3d0ffdb 100644 --- a/source/makeDistribZip.cmd +++ b/source/makeDistribZip.cmd @@ -6,7 +6,7 @@ cd /d %~dp0 set languages=cs de es hu pl pt ro ru tr set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2% set target=%cd%\..\..\ChanSort_%curdate% -set DXversion=21.1 +set DXversion=21.2 mkdir "%target%" 2>nul rem del /s /q "%target%\*" xcopy /idy debug\ChanSort.exe* "%target%"