GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 01:57:39 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1899 radio reference API version 18 and update site editor to use new 'tdma_cc' flag to distinguish P25 Phase 2 FDMA vs TDMA control channel sites. (#1900)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-04-27 10:32:46 -04:00
committed by GitHub
parent 7e709d9d6f
commit aa8d449140
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -1,8 +1,6 @@
import java.text.SimpleDateFormat
/* /*
* ***************************************************************************** * *****************************************************************************
* Copyright (C) 2014-2023 Dennis Sheirer * Copyright (C) 2014-2024 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -19,6 +17,10 @@ import java.text.SimpleDateFormat
* **************************************************************************** * ****************************************************************************
*/ */
import java.text.SimpleDateFormat
/** /**
* Instructions for building/compiling the sdrtrunk application. * Instructions for building/compiling the sdrtrunk application.
* *
@@ -103,7 +105,7 @@ dependencies {
implementation 'com.mpatric:mp3agic:0.9.1' implementation 'com.mpatric:mp3agic:0.9.1'
implementation 'commons-io:commons-io:2.11.0' implementation 'commons-io:commons-io:2.11.0'
implementation 'eu.hansolo:charts:1.0.5' implementation 'eu.hansolo:charts:1.0.5'
implementation 'io.github.dsheirer:radio-reference-api:15.1.9' implementation 'io.github.dsheirer:radio-reference-api:18.0.0'
implementation 'javax.usb:usb-api:1.0.2' implementation 'javax.usb:usb-api:1.0.2'
implementation 'net.coderazzi:tablefilter-swing:5.5.4' implementation 'net.coderazzi:tablefilter-swing:5.5.4'
implementation 'org.apache.commons:commons-compress:1.21' implementation 'org.apache.commons:commons-compress:1.21'

2
src/main/java/io/github/dsheirer/gui/playlist/radioreference/EnrichedSite.java
View File

@@ -149,7 +149,7 @@ public class EnrichedSite implements Comparable<EnrichedSite>
{ {
if(mSite != null) if(mSite != null)
{ {
return mSite.getDescription(); return mSite.getDescription() + (mSite.getTdmaControlChannel() > 0 ? " (TDMA CC)" : "");
} }
return null; return null;

3
src/main/java/io/github/dsheirer/gui/playlist/radioreference/SiteEditor.java
View File

@@ -379,7 +379,8 @@ public class SiteEditor extends GridPane
getP25ControlLabel().setVisible(true); getP25ControlLabel().setVisible(true);
getTdmaControlToggleButton().setVisible(true); getTdmaControlToggleButton().setVisible(true);
getFdmaControlToggleButton().setVisible(true); getFdmaControlToggleButton().setVisible(true);
if(site.getSite().getModulation() != null && site.getSite().getModulation().contains(PHASE_2_TDMA_MODULATION))
if(site.getSite().getTdmaControlChannel() > 0) //Value is 0 for FDMA or 1 for TDMA
{ {
getTdmaControlToggleButton().setSelected(true); getTdmaControlToggleButton().setSelected(true);
} }