mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2024 Dennis Sheirer
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -32,7 +32,6 @@ import java.util.ArrayList;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
@@ -136,7 +135,7 @@ public class PlottableEntityModel extends AbstractTableModel implements Listener
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOGGER.warn("Received plottable decode event that does not contain a FROM identifier - cannot plot");
|
// LOGGER.warn("Received plottable decode event that does not contain a FROM identifier - cannot plot");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2024 Dennis Sheirer
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -895,7 +895,7 @@ public class DMRDecoderState extends TimeslotDecoderState
|
|||||||
{
|
{
|
||||||
//Log when a CSBK that is not the Unknown CSBK is processed, to detect when new opcodes are added
|
//Log when a CSBK that is not the Unknown CSBK is processed, to detect when new opcodes are added
|
||||||
//that are not ChannelGrant subclass implementations.
|
//that are not ChannelGrant subclass implementations.
|
||||||
if(!(csbk instanceof UnknownCSBKMessage))
|
if(!(csbk instanceof UnknownCSBKMessage) && csbk.isValid())
|
||||||
{
|
{
|
||||||
mLog.error("Unrecognized DMR channel grant CSBK ignored: " + csbk.getClass());
|
mLog.error("Unrecognized DMR channel grant CSBK ignored: " + csbk.getClass());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -81,7 +81,7 @@ public class PacketSequenceMessageFactory
|
|||||||
case SHORT_DATA:
|
case SHORT_DATA:
|
||||||
return createDefinedShortData(packetSequence, packet);
|
return createDefinedShortData(packetSequence, packet);
|
||||||
default:
|
default:
|
||||||
mLog.info("Unknown Packet SAP: " + primaryHeader.getServiceAccessPoint() + " - returning unknown packet");
|
// mLog.info("Unknown Packet SAP: " + primaryHeader.getServiceAccessPoint() + " - returning unknown packet");
|
||||||
return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet,
|
return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet,
|
||||||
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
|
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
|
||||||
}
|
}
|
||||||
@@ -204,9 +204,9 @@ public class PacketSequenceMessageFactory
|
|||||||
{
|
{
|
||||||
if(packetSequence.getProprietaryDataHeader() != null)
|
if(packetSequence.getProprietaryDataHeader() != null)
|
||||||
{
|
{
|
||||||
mLog.info("Unknown Proprietary Packet Header Type - creating unknown packet. Data Packet Format: " +
|
// mLog.info("Unknown Proprietary Packet Header Type - creating unknown packet. Data Packet Format: " +
|
||||||
packetSequence.getPacketSequenceHeader().getDataPacketFormat() + " Proprietary Header: " +
|
// packetSequence.getPacketSequenceHeader().getDataPacketFormat() + " Proprietary Header: " +
|
||||||
packetSequence.getProprietaryDataHeader().getClass());
|
// packetSequence.getProprietaryDataHeader().getClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet,
|
return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet,
|
||||||
@@ -230,7 +230,7 @@ public class PacketSequenceMessageFactory
|
|||||||
return new DMRPacketMessage(packetSequence, new IPV4Packet(packet, 0), packet,
|
return new DMRPacketMessage(packetSequence, new IPV4Packet(packet, 0), packet,
|
||||||
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
|
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
|
||||||
default:
|
default:
|
||||||
mLog.info("Unrecognized IP Packet Version: " + version + " - returning unknown packet");
|
// mLog.info("Unrecognized IP Packet Version: " + version + " - returning unknown packet");
|
||||||
return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet,
|
return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet,
|
||||||
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
|
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -92,9 +92,9 @@ public class UDTShortMessageService extends DMRMessage
|
|||||||
case VENDOR_PROPRIETARY_9:
|
case VENDOR_PROPRIETARY_9:
|
||||||
case MIXED_FORMAT:
|
case MIXED_FORMAT:
|
||||||
case UNKNOWN:
|
case UNKNOWN:
|
||||||
LOGGER.warn("Unrecognized UDT Short Data Format: " + mHeader.getFormat() +
|
// LOGGER.warn("Unrecognized UDT Short Data Format: " + mHeader.getFormat() +
|
||||||
" - Please send this to the sdrtrunk developer - Hex:" + getMessage().toHexString() +
|
// " - Please send this to the sdrtrunk developer - Hex:" + getMessage().toHexString() +
|
||||||
" As String:" + new String(getMessage().getBytes()));
|
// " As String:" + new String(getMessage().getBytes()));
|
||||||
mSMS = "Error:" + new String(getMessage().getBytes());
|
mSMS = "Error:" + new String(getMessage().getBytes());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user