mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 10:37:26 -05:00
Resolves #1130 - restores real time PPM measured frequency error broadcasts from DMR, P25P1 and P2 decoders. (#1131)
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
@@ -1,3 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2022 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 <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
|
|
||||||
package io.github.dsheirer.module.decode.dmr;
|
package io.github.dsheirer.module.decode.dmr;
|
||||||
|
|
||||||
import io.github.dsheirer.dsp.filter.FilterFactory;
|
import io.github.dsheirer.dsp.filter.FilterFactory;
|
||||||
@@ -42,7 +61,6 @@ public class DMRDecoder extends FeedbackDecoder implements ISourceEventListener,
|
|||||||
private Broadcaster<Dibit> mDibitBroadcaster = new Broadcaster<>();
|
private Broadcaster<Dibit> mDibitBroadcaster = new Broadcaster<>();
|
||||||
private DibitToByteBufferAssembler mByteBufferAssembler = new DibitToByteBufferAssembler(300);
|
private DibitToByteBufferAssembler mByteBufferAssembler = new DibitToByteBufferAssembler(300);
|
||||||
private DMRMessageProcessor mMessageProcessor;
|
private DMRMessageProcessor mMessageProcessor;
|
||||||
private Listener<SourceEvent> mSourceEventListener;
|
|
||||||
private ComplexFeedForwardGainControl mAGC = new ComplexFeedForwardGainControl(32);
|
private ComplexFeedForwardGainControl mAGC = new ComplexFeedForwardGainControl(32);
|
||||||
private Map<Double,float[]> mBasebandFilters = new HashMap<>();
|
private Map<Double,float[]> mBasebandFilters = new HashMap<>();
|
||||||
private ComplexFIRFilter2 mBasebandFilter;
|
private ComplexFIRFilter2 mBasebandFilter;
|
||||||
@@ -283,7 +301,7 @@ public class DMRDecoder extends FeedbackDecoder implements ISourceEventListener,
|
|||||||
@Override
|
@Override
|
||||||
public void setSourceEventListener(Listener<SourceEvent> listener)
|
public void setSourceEventListener(Listener<SourceEvent> listener)
|
||||||
{
|
{
|
||||||
mSourceEventListener = listener;
|
super.setSourceEventListener(listener);
|
||||||
mPowerMonitor.setSourceEventListener(listener);
|
mPowerMonitor.setSourceEventListener(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -293,7 +311,7 @@ public class DMRDecoder extends FeedbackDecoder implements ISourceEventListener,
|
|||||||
@Override
|
@Override
|
||||||
public void removeSourceEventListener()
|
public void removeSourceEventListener()
|
||||||
{
|
{
|
||||||
mSourceEventListener = null;
|
super.removeSourceEventListener();
|
||||||
mPowerMonitor.setSourceEventListener(null);
|
mPowerMonitor.setSourceEventListener(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -310,19 +328,6 @@ public class DMRDecoder extends FeedbackDecoder implements ISourceEventListener,
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Broadcasts the source event to an optional registered listener. This method should primarily be used to
|
|
||||||
* issue frequency correction requests to the channel source.
|
|
||||||
* @param sourceEvent to broadcast
|
|
||||||
*/
|
|
||||||
public void broadcast(SourceEvent sourceEvent)
|
|
||||||
{
|
|
||||||
if(mSourceEventListener != null)
|
|
||||||
{
|
|
||||||
mSourceEventListener.receive(sourceEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Listener interface to receive reusable complex buffers
|
* Listener interface to receive reusable complex buffers
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2022 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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 <http://www.gnu.org/licenses/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
*/
|
*/
|
||||||
package io.github.dsheirer.module.decode.p25.phase1;
|
package io.github.dsheirer.module.decode.p25.phase1;
|
||||||
|
|
||||||
@@ -58,12 +55,14 @@ public abstract class P25P1Decoder extends FeedbackDecoder implements ISourceEve
|
|||||||
@Override
|
@Override
|
||||||
public void setSourceEventListener(Listener<SourceEvent> listener )
|
public void setSourceEventListener(Listener<SourceEvent> listener )
|
||||||
{
|
{
|
||||||
|
super.setSourceEventListener(listener);
|
||||||
mPowerMonitor.setSourceEventListener(listener);
|
mPowerMonitor.setSourceEventListener(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeSourceEventListener()
|
public void removeSourceEventListener()
|
||||||
{
|
{
|
||||||
|
super.removeSourceEventListener();
|
||||||
mPowerMonitor.setSourceEventListener(null);
|
mPowerMonitor.setSourceEventListener(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2022 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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 <http://www.gnu.org/licenses/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
*/
|
*/
|
||||||
package io.github.dsheirer.module.decode.p25.phase2;
|
package io.github.dsheirer.module.decode.p25.phase2;
|
||||||
|
|
||||||
@@ -60,12 +57,14 @@ public abstract class P25P2Decoder extends FeedbackDecoder implements ISourceEve
|
|||||||
@Override
|
@Override
|
||||||
public void setSourceEventListener(Listener<SourceEvent> listener )
|
public void setSourceEventListener(Listener<SourceEvent> listener )
|
||||||
{
|
{
|
||||||
|
super.setSourceEventListener(listener);
|
||||||
mPowerMonitor.setSourceEventListener(listener);
|
mPowerMonitor.setSourceEventListener(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeSourceEventListener()
|
public void removeSourceEventListener()
|
||||||
{
|
{
|
||||||
|
super.removeSourceEventListener();
|
||||||
mPowerMonitor.setSourceEventListener(null);
|
mPowerMonitor.setSourceEventListener(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user