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

Updated Call Event handling/display for all decoders and updated channel display values for all decoders.

Browse Source 
- Call events now show start-stop timestamps.  (or START-In Progress if call is ongoing )
 - Call start/stop events are now on the same event line.
 - Channel panels now display site and/or channel info
 - LTR call events are limited to CALLs on the current LCN, in order to cut down on false call events resulting from noise.
 - Passport display channels now show site/channel.
 - Changed default window used by the DFTProcessor to Cosine, which doesn't have as much FFT bin leakage.
This commit is contained in:
dennis.sheirer
2014-09-15 00:42:20 +00:00
parent 0f43c7ed22
commit ad456d81a3
18 changed files with 949 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/controller/activity/CallEvent.java
View File

@@ -26,7 +26,8 @@ import decode.DecoderType;
public abstract class CallEvent
{
protected long mEventTime = System.currentTimeMillis();
protected long mEventStart = System.currentTimeMillis();
protected long mEventEnd;
private SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd','HHmmss" );
@@ -52,6 +53,11 @@ public abstract class CallEvent
mDetails = details;
}
public void setEnd( long end )
{
mEventEnd = end;
}
public DecoderType getDecoderType()
{
return mDecoderType;
@@ -77,9 +83,14 @@ public abstract class CallEvent
return mAliasList != null;
}
public long getEventTime()
public long getEventStartTime()
{
return mEventTime;
return mEventStart;
}
public long getEventEndTime()
{
return mEventEnd;
}
public String getFromID()
@@ -122,7 +133,8 @@ public abstract class CallEvent
public static String getCSVHeader()
{
return "DATE,TIME,DECODER,EVENT,FROM,FROM_ALIAS,TO,TO_ALIAS,"
return "START_DATE,START_TIME,END_DATE,END_TIME,"
+ "DECODER,EVENT,FROM,FROM_ALIAS,TO,TO_ALIAS,"
+ "CHANNEL,FREQUENCY,DETAILS";
}
@@ -131,7 +143,16 @@ public abstract class CallEvent
StringBuilder sb = new StringBuilder();
sb.append( "'" );
sb.append( mSDF.format( new Date( getEventTime() ) ) );
sb.append( mSDF.format( new Date( getEventStartTime() ) ) );
sb.append( "','" );
if( mEventEnd != 0 )
{
sb.append( mSDF.format( new Date( getEventEndTime() ) ) );
}
else
{
sb.append( "','" );
}
sb.append( "','" );
sb.append( getDecoderType().toString() );
sb.append( "','" );
@@ -189,11 +210,11 @@ public abstract class CallEvent
public enum CallEventType
{
ACKNOWLEDGE( "Acknowledge" ),
CALL_DETECT( "Call Detect" ),
CALL_START( "Call Start" ),
CALL_START_UNIQUE_ID( "Call Start" ),
CALL_START_NO_TUNER( "Call - No Tuner" ),
CALL( "Call" ),
CALL_END( "Call End" ),
CALL_DETECT( "Call Detect" ),
CALL_UNIQUE_ID( "UID Call" ),
CALL_NO_TUNER( "Call - No Tuner" ),
CALL_TIMEOUT( "Call Timeout" ),
EMERGENCY( "EMERGENCY" ),
GPS( "GPS" ),
@@ -205,7 +226,8 @@ public abstract class CallEvent
REQUEST( "Request" ),
SDM( "SDM" ),
STATUS( "Status" ),
UNKNOWN( "Unknown" );
UNKNOWN( "Unknown" ),
INVALID( "Invalid" );
private String mLabel;