GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

French MPT1327 fixes. Discovered that entire bit stream is inverted, and system is using SYNC (0xB433) and SYNT (0x4BCC) sync patterns.

Browse Source
This commit is contained in:
dennis.sheirer
2014-08-06 01:24:26 +00:00
parent 63de9c6d7d
commit 0eddada70e
4 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/decode/mpt1327/MPT1327Decoder.java
View File

@@ -127,8 +127,22 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
, 2.0 ); //Gain
mDecimationFilter.setListener( mLowPassFilter );
/* 2FSK Decoder with output inverted */
mFSKDecoder = new FSK2Decoder( 24000, 1200, Output.INVERTED );
/**
* Normal: 2FSK Decoder with inverted output
* French: 2FSK Decoder with normal output
*/
if( sync == Sync.NORMAL )
{
mFSKDecoder = new FSK2Decoder( 24000, 1200, Output.INVERTED );
}
else if( sync == Sync.FRENCH )
{
mFSKDecoder = new FSK2Decoder( 24000, 1200, Output.NORMAL );
}
else
{
throw new IllegalArgumentException( "MPT1327 Decoder - unrecognized Sync type" );
}
mLowPassFilter.setListener( mFSKDecoder );
mSymbolBroadcaster = new Broadcaster<Boolean>();
@@ -290,7 +304,7 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
SyncPattern.MPT1327_TRAFFIC ),
FRENCH( "French",
SyncPattern.MPT1327_CONTROL_FRENCH,
SyncPattern.MPT1327_TRAFFIC );
SyncPattern.MPT1327_TRAFFIC_FRENCH );
private String mLabel;
private SyncPattern mControlSyncPattern;

2
src/decode/mpt1327/MPT1327Message.java
View File

@@ -109,7 +109,7 @@ public class MPT1327Message extends Message
checkParity( 1, BLOCK_2_START, BLOCK_3_START );
checkParity( 2, BLOCK_3_START, BLOCK_4_START );
checkParity( 3, BLOCK_4_START, BLOCK_5_START );
checkParity( 3, BLOCK_5_START, BLOCK_5_END );
checkParity( 4, BLOCK_5_START, BLOCK_5_END );
break;
case ACK:
case ACKB: