Resolved issue with LJ-1200 producing inverted bit output.

This commit is contained in:
dennis.sheirer
2014-11-17 01:41:28 +00:00
parent 5ef806ef02
commit ea9741d510
4 changed files with 10 additions and 13 deletions

View File

@@ -41,10 +41,10 @@ public enum SyncPattern
LJ1200( new boolean[] LJ1200( new boolean[]
{ {
true, false, true, false, false, true, false,true,
true, false, true, false, false, true, false,true,
true, true, true, true, false, false, false, false,
false, false, false, false true, true, true, true
}), }),
/** /**

View File

@@ -80,7 +80,7 @@ public class LJ1200Decoder extends Decoder implements Instrumentable
mDecimationFilter.setListener( mBandPassFilter ); mDecimationFilter.setListener( mBandPassFilter );
mFSKDecoder = new FSK2Decoder( DECIMATED_SAMPLE_RATE, mFSKDecoder = new FSK2Decoder( DECIMATED_SAMPLE_RATE,
SYMBOL_RATE, Output.NORMAL ); SYMBOL_RATE, Output.INVERTED );
mBandPassFilter.setListener( mFSKDecoder ); mBandPassFilter.setListener( mFSKDecoder );
mMessageFramer = new MessageFramer( mMessageFramer = new MessageFramer(

View File

@@ -19,7 +19,6 @@ package decode.lj1200;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.BitSet; import java.util.BitSet;
import java.util.Date;
import map.Plottable; import map.Plottable;
import message.Message; import message.Message;
@@ -91,14 +90,14 @@ public class LJ1200Message extends Message
return true; return true;
} }
public int getVRC() public String getVRC()
{ {
return mMessage.getInt( VRC ); return mMessage.getHex( VRC, 2 );
} }
public int getLRC() public String getLRC()
{ {
return mMessage.getInt( LRC ); return mMessage.getHex( LRC, 2 );
} }
public int getFunction() public int getFunction()
@@ -119,7 +118,7 @@ public class LJ1200Message extends Message
sb.append( "VRC: " + getVRC() ); sb.append( "VRC: " + getVRC() );
sb.append( " LRC: " + getLRC() ); sb.append( " LRC: " + getLRC() );
sb.append( " FUNCTION: " + getFunction() ); sb.append( " FUNCTION: " + getFunction() );
sb.append( "ADDRESS:" + getAddress() ); sb.append( " ADDRESS:" + getAddress() );
return sb.toString(); return sb.toString();
} }

View File

@@ -17,8 +17,6 @@
******************************************************************************/ ******************************************************************************/
package eventlog; package eventlog;
import gui.SDRTrunk;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;