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

#6 DMR Decoder (#947)

Browse Source 
* #6 DMR decoder feature - work in progress

* #6 DMR Decoder.

* #6 DMR Decoder.  Code review updates.

Co-authored-by: Zhenyu Mao <maozhenyu@foxmail.com>
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-10-12 04:57:59 -04:00
committed by GitHub
parent b061db1189
commit 7eec82deee
436 changed files with 36258 additions and 2409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/dsheirer/module/decode/ltrnet/LTRNetDecoderState.java
View File

@@ -664,7 +664,7 @@ public class LTRNetDecoderState extends DecoderState
{
switch(event.getEvent())
{
case RESET:
case REQUEST_RESET:
resetState();
break;
default:

15
src/main/java/io/github/dsheirer/module/decode/ltrnet/identifier/SiteIdentifier.java → src/main/java/io/github/dsheirer/module/decode/ltrnet/identifier/LtrSiteIdentifier.java
View File

@@ -20,17 +20,14 @@
package io.github.dsheirer.module.decode.ltrnet.identifier;
import io.github.dsheirer.identifier.Form;
import io.github.dsheirer.identifier.IdentifierClass;
import io.github.dsheirer.identifier.Role;
import io.github.dsheirer.identifier.integer.IntegerIdentifier;
import io.github.dsheirer.identifier.site.SiteIdentifier;
import io.github.dsheirer.protocol.Protocol;
public class SiteIdentifier extends IntegerIdentifier
public class LtrSiteIdentifier extends SiteIdentifier
{
public SiteIdentifier(int site)
public LtrSiteIdentifier(int site)
{
super(site, IdentifierClass.NETWORK, Form.SITE, Role.BROADCAST);
super(site);
}
@Override
@@ -39,8 +36,8 @@ public class SiteIdentifier extends IntegerIdentifier
return Protocol.LTR_NET;
}
public static SiteIdentifier create(int site)
public static LtrSiteIdentifier create(int site)
{
return new SiteIdentifier(site);
return new LtrSiteIdentifier(site);
}
}

12
src/main/java/io/github/dsheirer/module/decode/ltrnet/message/osw/SiteId.java
View File

@@ -22,7 +22,7 @@ package io.github.dsheirer.module.decode.ltrnet.message.osw;
import io.github.dsheirer.bits.CorrectedBinaryMessage;
import io.github.dsheirer.identifier.Identifier;
import io.github.dsheirer.module.decode.ltrnet.LtrNetMessageType;
import io.github.dsheirer.module.decode.ltrnet.identifier.SiteIdentifier;
import io.github.dsheirer.module.decode.ltrnet.identifier.LtrSiteIdentifier;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +32,7 @@ import java.util.List;
*/
public class SiteId extends LtrNetOswMessage
{
private SiteIdentifier mSiteIdentifier;
private LtrSiteIdentifier mLtrSiteIdentifier;
private List<Identifier> mIdentifiers;
/**
@@ -57,14 +57,14 @@ public class SiteId extends LtrNetOswMessage
return sb.toString();
}
public SiteIdentifier getSiteID()
public LtrSiteIdentifier getSiteID()
{
if(mSiteIdentifier == null)
if(mLtrSiteIdentifier == null)
{
mSiteIdentifier = SiteIdentifier.create(getMessage().getInt(23, 32));
mLtrSiteIdentifier = LtrSiteIdentifier.create(getMessage().getInt(23, 32));
}
return mSiteIdentifier;
return mLtrSiteIdentifier;
}