diff --git a/src/bits/SyncPattern.java b/src/bits/SyncPattern.java index df220d4e..aee63926 100644 --- a/src/bits/SyncPattern.java +++ b/src/bits/SyncPattern.java @@ -41,10 +41,10 @@ public enum SyncPattern LJ1200( new boolean[] { - true, false, true, false, - true, false, true, false, - true, true, true, true, - false, false, false, false + false, true, false,true, + false, true, false,true, + false, false, false, false, + true, true, true, true }), /** diff --git a/src/decode/lj1200/LJ1200Decoder.java b/src/decode/lj1200/LJ1200Decoder.java index c3a96f82..9fd541e4 100644 --- a/src/decode/lj1200/LJ1200Decoder.java +++ b/src/decode/lj1200/LJ1200Decoder.java @@ -80,7 +80,7 @@ public class LJ1200Decoder extends Decoder implements Instrumentable mDecimationFilter.setListener( mBandPassFilter ); mFSKDecoder = new FSK2Decoder( DECIMATED_SAMPLE_RATE, - SYMBOL_RATE, Output.NORMAL ); + SYMBOL_RATE, Output.INVERTED ); mBandPassFilter.setListener( mFSKDecoder ); mMessageFramer = new MessageFramer( diff --git a/src/decode/lj1200/LJ1200Message.java b/src/decode/lj1200/LJ1200Message.java index 505de7d7..f4661216 100644 --- a/src/decode/lj1200/LJ1200Message.java +++ b/src/decode/lj1200/LJ1200Message.java @@ -19,7 +19,6 @@ package decode.lj1200; import java.text.SimpleDateFormat; import java.util.BitSet; -import java.util.Date; import map.Plottable; import message.Message; @@ -91,14 +90,14 @@ public class LJ1200Message extends Message 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() @@ -119,7 +118,7 @@ public class LJ1200Message extends Message sb.append( "VRC: " + getVRC() ); sb.append( " LRC: " + getLRC() ); sb.append( " FUNCTION: " + getFunction() ); - sb.append( "ADDRESS:" + getAddress() ); + sb.append( " ADDRESS:" + getAddress() ); return sb.toString(); } diff --git a/src/eventlog/EventLogger.java b/src/eventlog/EventLogger.java index 9a04c14e..5e761a3c 100644 --- a/src/eventlog/EventLogger.java +++ b/src/eventlog/EventLogger.java @@ -17,8 +17,6 @@ ******************************************************************************/ package eventlog; -import gui.SDRTrunk; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream;