Commit Graph

88 Commits

Author SHA1 Message Date
denny
45f0e09d5a wip #34 - updated tuner configurations to include unique id and assigned
flag, so that we can get rid of tuner configuration assignment objects.
2016-03-17 22:01:31 -04:00
denny
f518c15a06 wip #34
34: Redesign Channel Management 

Task-Url: http://github.com/DSheirer/sdrtrunk/issues/issue/34
2016-03-17 21:16:21 -04:00
denny
6eade2b7ea wip: #34 2016-03-13 20:06:26 -04:00
denny
86816228c2 wip #34 - adds enable/disable to tuner editor components and frequency
control
2016-03-13 08:43:55 -04:00
denny
0605760fcd wip #34 - removed some wrapper methods from tuner since the tuner
controller is now exposed (frequency, sample rate, channel count, etc)
2016-03-13 07:38:29 -04:00
denny
415f95ec89 wip #34: refactored tuners to take a tuner controller as an argument.
Removed frequency change listener framework from tuner so that the tuner
controller handles all frequency change interaction.

Updated tuner view to allow selecting tuners for main spectral display
and/or launching a new spectral display by clicking in the tuner table
cell.
2016-03-13 07:09:26 -04:00
denny
1078bdc4fd wip: #34 - adds tuner spectral display manager to handle requests to
show a tuner in the main spectral display or to show the tuner in a new
spectral display
2016-03-12 13:11:06 -05:00
denny
218eeb1848 WIP #34 - more work on tuner model and view. Includes new tuner
configuration and tuner configuration assignment editors.  Beginning of
tuner editor panel rework.   Removes most of the remaining JTree
configuration pieces.  Updates the settings manager to load and save
tuners and refactors all of the tuner configuration management out into
the tuner configuration model.
2016-03-12 12:54:48 -05:00
denny
9d4afb8c1f WIP #34 - updates tuners and tuner model to provide details on
frequency, sample rate, sourced channels, and spectral display in the
tuner view tab.
2016-03-11 07:16:29 -05:00
denny
6fa3089bc9 WIP #34 - adds tuner model and view tab, preparing to remove the
configuration panel from the controller view.
2016-03-07 20:43:43 -05:00
denny
2394ac2fa9 WIP #34: added channel map manager and new editor window. Removed a
number of unused classes.  Removed playlist manager from a number of
classes and replaced with the alias, channel and channel map models.
Updated playlist manager to no longer retain a playlist except for when
loading to models or when storing from models.  Extracted version 1 to
version 2 playlist conversion and changed playlist manager to keep the
original version 1 playlist and create a new version 2 (playlist_v2.xml)
file.  On startup, try to load a v2, and if not, look for a v1 to
convert.  Otherwise, don't create a playlist and one will be created
once the user adds items to the models.
2016-03-06 07:48:14 -05:00
denny
8aebdd1c26 Changes default channel source to be a tuner. 2016-03-05 08:25:22 -05:00
denny
63cea60c42 Merges master CF2C0CA, EEAD22F, 5F2D8C8, 22D3871, and 6F2A7E8 - updates
libusb transfer processing and shutdown/cancel management of transfers
in progress.
2016-02-27 09:45:47 -05:00
denny
62851351a4 Merges master 399d164 - default tuner configurations issue #57 2016-02-27 08:58:47 -05:00
denny
a807ff5c07 Resolves issue with RTL2832 tuner where we attempt to cancel transfers
that have not yet been initialized.
2016-02-22 20:47:40 -05:00
denny
f7f6c2fc3e Merges changes from master branch to resolve issue with CPU and memory
and constraints on scheduled thread pool saturation.  Adds a new
scheduled thread pool for each processing chain that the components in
the chain can share, versus the single shared pool exposed by the
threadpoolmanager class.
2016-02-15 15:47:14 -05:00
denny
e2a0451bfb Resolves issue with scheduled thread pool overtasking. Removes tuner
channel source decimation processing over to its own thread pool.
2016-02-15 08:42:29 -05:00
denny
1f654b5b9c Rebase channel/alias model redesign branch on current master
(v0.2.0.beta5)
2016-02-14 11:45:43 -05:00
denny
1d7f255784 Revert "Merges master onto development branch"
This reverts commit 2420bc901c63ad9d41e7c99ac95a426f826182ff.
2016-02-13 15:07:53 -05:00
denny
da924e8b3a Updates playlist editor with Add, Copy/Clone and Delete channel
functionality
2016-02-13 14:58:51 -05:00
denny
7d1ec344de Work in progress - updates channel component editors and changes
functionality so that the editor starts up without a channel displayed
and as each channel row is selected in the channels table, the editor is
updated with the channel configuration.

Likewise, the channel editor is now a channel event listener on the
channel model and will maintain channel state if the user changes
channel configuration in any of the external channel controllers like
the spectral display or the channel list.
2016-02-13 14:57:13 -05:00
denny
4be63d4b95 Work in progress.
-Started work on new channel editor channel viewer/controller
-Removed a number of unused buffer package classes
-Moved automatic frequency control to be a module and removed special
handling
-Added IUnfilteredRealBufferListener & Provider interfaces
-Completely removed the ResourceManager class
2016-02-13 14:57:12 -05:00
denny
c405ddad96 Work in progress - program compiles and runs 2016-02-13 14:37:36 -05:00
Denny Sheirer
debdc39a5f Resolves threading issue in ChannelState.
Resolves issue in tuner controller where controller was not releasing
sourced tuner channels, preventing re-tuning to other frequencies.
Resolves issue with channel timeout on MPT1327 monitored traffic
channels
2016-02-01 09:17:56 +00:00
Denny Sheirer
6f76f6fca4 Resolves issue with Tuner retaining released TunerChannels, preventing
the tuner from sourcing additional out-of-band channels.
2016-01-30 16:58:52 +00:00
denny
f5fadc5004 Stores selected audio output mixer name and channels (mono/stereo) to
system properties so settings are loaded on startup.
2016-01-23 14:28:21 -05:00
denny
abca4ebbd7 Updated to use concurrent containers to avoid concurrent modification
exceptions.
2016-01-22 16:30:58 -05:00
denny
663378ad20 Logging cleanup 2016-01-15 09:50:10 -05:00
denny
2e56b4a27f Removed extra logging 2015-12-31 09:30:17 -05:00
denny
96a9ef8219 Updated R820T tuner center DC spike avoid buffer 2015-12-31 09:21:36 -05:00
denny
9c305b0732 Resolves issue with AFC and frequency change event handling,
specifically for P25 C4FM frequency tracking.

-Clarifies frequency change event naming and adds request/notitification
events for channel frequency correction type events

-Removes DC offset filter from P25 C4FM demodulator which was operating
independently of the AFC tracking component within the C4FM symbol
filter.

-Changed FCD tuner center DC spike buffer size after detecting that the
DC center spike was influencing the P25 C4FM filter frequency tracker
whenever the tuner's center frequency was changed to bring the channel
boundary within 3 kHz of the center spike -- set it to 5 kHz to provide
a better buffer.

-Updated spectral channel display to provide better indication of
automatic frequency control (yellow line) versus channel frequency
2015-12-31 09:08:26 -05:00
denny
a42e6e81ad Adds Lineary, Sensitivity and Custom mode options to airspy tuner. 2015-12-13 09:02:26 -05:00
denny
0951277915 Tuner Controller update to better handle automatic center frequency
calculation when additional channels are allocated.

Incorporates tuner specific definition of overall usable bandwidth, so
that tuners like airspy can specify 90% of 10 MHz (ie 9 MHz) is truly
usable and the fringe 10% is unusable rolloff.

Also includes tuner-specific defining of the width of the central spike,
or a value of 0 indicates that the entire range is usable (ie airspy).
2015-12-12 14:08:32 -05:00
denny
4caecaa476 Removed deemphasis experiment and replaced with a fixed, non-clipping
gain module for P25 IMBE audio.
2015-12-12 07:11:30 -05:00
denny
6763a4bdd6 Adds de-emphasis filter to P25 decoded IMBE audio output. 2015-12-11 13:34:20 -05:00
denny
d9fe979ccf Resolves issue with residual buffer decimation processing after dispose
is invoked on call teardown.
2015-12-02 19:10:38 -05:00
denny
ae10b5fc1c Airspy controller - changes method for adjusting center tuned frequency
when tuner channels are allocated by the airspy.  New method determines
the min/max requested frequency range and sets tuner center to the
center of that range, while limiting the total usable bandwidth to 90%
of the bandwidth, to account for rolloff of 5% at the upper/lower edges.

When a new channel is requested, if the channel fits within the current
center frequency and usable bandwidth, the center tune frequency is not
adjusted, to minimize the number of retunes on a busy system.
2015-11-29 07:11:47 -05:00
denny
f04a6727b0 Resolved issue with channel label display in spectrum overlay panel
when a new tuner is added.

Cleanup of debugging messages.
2015-11-22 14:25:37 -05:00
denny
4025f88951 P25 and Airspy work in progress
Updated p25 decoder state to better track calls and call detects from
a trunked channel

Fixed issue with false detects on LDU2 encrypted call messages

Fixed Airspy channel allocation ... will allocate channels across the
entire bandwidth, minus 50 kHz on either end, and will not adjust the
center frequency if it's not needed.

Fixed traffic channel teardown -- traffic channels are immediately 
removed now, without a fade delay.

AudioMetadata - updated flag is now reset upon copying the metadata
2015-11-21 17:40:59 -05:00
denny
e27ca12ec8 Closes Issue #33.
Adds Spectral/Waterfall display zoom feature with mouse dragging and
zoom window indicator.

Resolves issues with correct display and spacing of frequency labels and
tick lines display in the overlay panel.
2015-11-14 11:51:05 -05:00
denny
ae85201343 Closes #25.
Resolves issue with tuning RTL2832 based tuners into the range of
799.555894 and 801.584395.  The pre-defined sample rates were slightly
off and causing issues with this tuning range.  I recalculated the 
sample rates and removed any that were not integral multiples of the 
48,000 Hz desired channel rate.

Updated the sample bit depth for RTL2832 and HackRF tuners.  Even though
the sample bit depth is 8 bits for each, the displayed noise floor was
off, so I increased the bit depth for each.
2015-11-08 11:42:24 -05:00
denny
2e2a8da13d Adds missing class for airspy tuner 2015-11-08 08:18:28 -05:00
denny
f0dc9452c8 Resolves issue with correct display and scaling of decibel values in
both the spectral and waterfall displays.

Resolves issue with gain loss in HilbertTransform.
2015-11-08 08:17:34 -05:00
denny
70e62ebb35 Adds airspy USB tuner support and updates the spectral display
component.

-Airspy supported with 10 and 2.5 MSps sample rates.  Additional
decimation may be added later.

-Spectral display updated to include smoothing and filtering options.

Note: the decimated output of a tuner channel from the airspy is
48,076.9 samples per second, versus the normal 48 kHz decimated rate.
This is 1.0015 times the normal rate and doesn't appear to impact the
decoders or audio processing.  Therefore, no fractional resampling has
been added.
2015-11-07 08:18:41 -05:00
denny
5a91630996 Updates p25 audio module to use version 0.3.0 of the jmbe audio library 2015-10-10 06:05:08 -04:00
denny
3e05a9eb03 Resolves issue #23.
Adds audio output display and management options supporting mono and 
stereo output options.

Provides audio output supporting prioritization by talkgroup and/or 
channel selection.

Supports muting all channels, or muting individual channels and
individual audio gain/volume controls.
2015-10-03 17:50:03 -04:00
denny
416cbdd105 work in progress 2015-09-14 21:48:30 -04:00
denny
c7227ca780 Work in progress 2015-09-14 21:31:26 -04:00
denny
0f85b7260a Adds event logging, code cleanup and some decoder issue resolution. 2015-09-02 19:41:44 -04:00
denny
f4d8ea281d Initial commit of redesigned internal processing and audio management.
Note: Several of the decoders are currently non-functioning in this
commit.  If you want the latest functioning codebase, please checkout
the commit prior to this one.  All decoders will eventually be updated
with this new architecture.

Currently broken:
- Logging and recording
- Aux decoders (Fleetsync/MDC/LoJack/Tait)
- LTR/Passport decoders

Changes in this commit:
- Module architecture for decoders and components with central
provisioning by the DecoderFactory
- Transition from Complex sample stream processing to float buffer
processing for improved memory management
- Redesigned filter structures - to support buffers and streams
- Resolved several memory leak issues
- Universal sharing of the thread pool manager
- Added centralized audio management with call/user prioritization and
new gui with mute/volume controls
- Embedded audio metadata for eventual streaming support
- Redesigned ProcessingChain to support independent re-use
- Added new TrafficChannelManager to handle traffic channel allocations
- Traffic Channel pool size and Call timeout available in P25 and
MPT1327 configs
- Redesigned channel and decoder gui components
2015-09-01 07:10:26 -04:00