GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#576 P25 Activity Summary Hex and Decimal Network Values (#638)

Browse Source 
* #576 Updates P25 activity summaries to list values in hex and decimal.  Resolves issue with P25 explicit channel uplink frequency calculations.  Resolves issue with Motorola base station id messages and traffic channel messages.  Resolves issue with RFSS link control message control channel frequency calculations.  Resolves issue with error when using recording tuners.
This commit is contained in:
Denny Sheirer
2020-01-11 05:33:38 -05:00
committed by GitHub
parent f54b4dfd0e
commit 26197e433c
10 changed files with 95 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/io/github/dsheirer/source/tuner/manager/PassThroughSourceManager.java
View File

@@ -1,18 +1,24 @@
/*******************************************************************************
* sdr-trunk
* 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.
* * ******************************************************************************
* * Copyright (C) 2014-2020 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/>
* * *****************************************************************************
*
* 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.source.tuner.manager;
@@ -62,7 +68,6 @@ public class PassThroughSourceManager extends ChannelSourceManager
PassThroughChannelSource channelSource = new PassThroughChannelSource(new SourceEventProxy(),
mTunerController, tunerChannel);
mLog.debug("Returning a pass through channel");
mTunerChannels.add(tunerChannel);
return channelSource;
@@ -77,16 +82,18 @@ public class PassThroughSourceManager extends ChannelSourceManager
if(event.hasSource() && event.getSource() instanceof PassThroughChannelSource)
{
mTunerController.addBufferListener((PassThroughChannelSource)event.getSource());
broadcast(SourceEvent.channelCountChange(mTunerChannels.size()));
}
break;
case REQUEST_STOP_SAMPLE_STREAM:
if(event.hasSource() && event.getSource() instanceof PassThroughChannelSource)
{
mTunerController.removeBufferListener((PassThroughChannelSource)event.getSource());
PassThroughChannelSource source = (PassThroughChannelSource)event.getSource();
mTunerController.removeBufferListener(source);
mTunerChannels.remove(source.getTunerChannel());
broadcast(SourceEvent.channelCountChange(mTunerChannels.size()));
}
break;
default:
mLog.debug("Got source event: " + event);
}
}

5
src/main/java/io/github/dsheirer/source/tuner/recording/RecordingTuner.java
View File

@@ -1,7 +1,7 @@
/*
*
* * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer
* * Copyright (C) 2014-2020 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
@@ -27,7 +27,6 @@ import io.github.dsheirer.source.SourceEvent;
import io.github.dsheirer.source.tuner.Tuner;
import io.github.dsheirer.source.tuner.TunerClass;
import io.github.dsheirer.source.tuner.TunerType;
import io.github.dsheirer.source.tuner.manager.ChannelSourceManager;
import io.github.dsheirer.source.tuner.manager.HeterodyneChannelSourceManager;
import io.github.dsheirer.source.tuner.manager.PassThroughSourceManager;
import io.github.dsheirer.source.tuner.manager.PolyphaseChannelSourceManager;
@@ -50,8 +49,6 @@ public class RecordingTuner extends Tuner
mUserPreferences = userPreferences;
ChannelSourceManager channelSourceManager = null;
if(getTunerController().getCurrentSampleRate() < 100000.0d)
{
setChannelSourceManager(new PassThroughSourceManager(getTunerController()));

4
src/main/java/io/github/dsheirer/source/tuner/recording/RecordingTunerController.java
View File

@@ -1,7 +1,7 @@
/*
*
* * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer
* * Copyright (C) 2014-2020 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
@@ -177,7 +177,7 @@ public class RecordingTunerController extends TunerController
}
catch(IOException ioe)
{
mLog.debug("Error loading recording tuner baseband recording: " + rtc.getPath(), ioe);
mLog.debug("Error loading recording tuner baseband recording [" + rtc.getPath() + "] Error: " + ioe.getLocalizedMessage());
}
}
}