From f6f4b076235dfbe5b92ac5463cb42c0ce8d460a1 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sat, 22 Nov 2025 06:00:00 -0500 Subject: [PATCH] #2281 Updates P25 Adjacent Site Status logging format between TSBK and AMBTC formats (#2310) Co-authored-by: denny --- .../osp/AMBTCAdjacentStatusBroadcast.java | 10 +++--- .../standard/osp/AdjacentStatusBroadcast.java | 32 ++++++++----------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCAdjacentStatusBroadcast.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCAdjacentStatusBroadcast.java index cf61f387..6ca88970 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCAdjacentStatusBroadcast.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCAdjacentStatusBroadcast.java @@ -1,7 +1,6 @@ /* - * ****************************************************************************** - * sdrtrunk - * Copyright (C) 2014-2019 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 @@ -15,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see - * ***************************************************************************** + * **************************************************************************** */ package io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.osp; @@ -32,7 +31,6 @@ import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceive import io.github.dsheirer.module.decode.p25.phase1.message.pdu.PDUSequence; import io.github.dsheirer.module.decode.p25.phase1.message.pdu.ambtc.AMBTCMessage; import io.github.dsheirer.module.decode.p25.phase1.message.pdu.block.UnconfirmedDataBlock; - import java.util.ArrayList; import java.util.List; @@ -71,7 +69,7 @@ public class AMBTCAdjacentStatusBroadcast extends AMBTCMessage implements IFrequ sb.append(" LRA:").append(getLocationRegistrationArea()); sb.append(" RFSS:").append(getRfss()); sb.append(" SITE:").append(getSite()); - sb.append(" CHAN:").append(getChannel()); + sb.append(" CHANNEL:").append(getChannel()); return sb.toString(); } diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/AdjacentStatusBroadcast.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/AdjacentStatusBroadcast.java index 9d5c421c..4e9b463a 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/AdjacentStatusBroadcast.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/AdjacentStatusBroadcast.java @@ -1,23 +1,20 @@ /* + * ***************************************************************************** + * Copyright (C) 2014-2025 Dennis Sheirer * - * * ****************************************************************************** - * * Copyright (C) 2014-2019 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 - * * the Free Software Foundation, either version 3 of the License, or - * * (at your option) any later version. - * * - * * This program is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU General Public License for more details. - * * - * * You should have received a copy of the GNU General Public License - * * along with this program. If not, see - * * ***************************************************************************** + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see + * **************************************************************************** */ package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.osp; @@ -34,7 +31,6 @@ import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID; import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBandReceiver; import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage; import io.github.dsheirer.module.decode.p25.reference.SystemServiceClass; - import java.util.ArrayList; import java.util.List; @@ -77,10 +73,10 @@ public class AdjacentStatusBroadcast extends OSPMessage implements IFrequencyBan StringBuilder sb = new StringBuilder(); sb.append(getMessageStub()); sb.append(" SYSTEM:").append(getSystem()); + sb.append(" LRA:").append(getLocationRegistrationArea()); sb.append(" RFSS:").append(getRfss()); sb.append(" SITE:").append(getSite()); sb.append(" CHANNEL:").append(getChannel()); - sb.append(" LRA:").append(getLocationRegistrationArea()); sb.append(" FLAGS ").append(getSiteFlags()); sb.append(" SERVICES ").append(getSystemServiceClass()); return sb.toString();