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

#2122 Removes extraneous logging from DMR processing. (#2123)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2025-01-01 10:05:20 -05:00
committed by GitHub
parent 694ea83a80
commit 9b71508d49
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/dsheirer/map/PlottableEntityModel.java
View File

@@ -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
* 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.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -136,7 +135,7 @@ public class PlottableEntityModel extends AbstractTableModel implements Listener
}
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");
}
});
}

4
src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java
View File

@@ -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
* 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
//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());
}

12
src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/PacketSequenceMessageFactory.java
View File

@@ -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
* it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@ public class PacketSequenceMessageFactory
case SHORT_DATA:
return createDefinedShortData(packetSequence, packet);
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,
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
}
@@ -204,9 +204,9 @@ public class PacketSequenceMessageFactory
{
if(packetSequence.getProprietaryDataHeader() != null)
{
mLog.info("Unknown Proprietary Packet Header Type - creating unknown packet. Data Packet Format: " +
packetSequence.getPacketSequenceHeader().getDataPacketFormat() + " Proprietary Header: " +
packetSequence.getProprietaryDataHeader().getClass());
// mLog.info("Unknown Proprietary Packet Header Type - creating unknown packet. Data Packet Format: " +
// packetSequence.getPacketSequenceHeader().getDataPacketFormat() + " Proprietary Header: " +
// packetSequence.getProprietaryDataHeader().getClass());
}
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,
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
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,
packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp());
}

8
src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/UDTShortMessageService.java
View File

@@ -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
* 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 MIXED_FORMAT:
case UNKNOWN:
LOGGER.warn("Unrecognized UDT Short Data Format: " + mHeader.getFormat() +
" - Please send this to the sdrtrunk developer - Hex:" + getMessage().toHexString() +
" As String:" + new String(getMessage().getBytes()));
// LOGGER.warn("Unrecognized UDT Short Data Format: " + mHeader.getFormat() +
// " - Please send this to the sdrtrunk developer - Hex:" + getMessage().toHexString() +
// " As String:" + new String(getMessage().getBytes()));
mSMS = "Error:" + new String(getMessage().getBytes());
break;
}