op25
/
op25
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui update Thx Trip

This commit is contained in:
Max 2022-10-30 21:21:32 -04:00
parent 7bc0fb2c1b
commit 7b31ebd34e
3 changed files with 162 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
op25/gr-op25_repeater/www/www-static/index.html
View File

@ -185,10 +185,23 @@
<br>
</div>
</div>
<div id="div_presets" style="display: none;">
<button id="btnPreset1" onclick="this.blur(); doPreset(1);" style="width: 98px;" class="psbutton">Preset 1</button>
<button id="btnPreset2" onclick="this.blur(); doPreset(2);" style="width: 98px;" class="psbutton">Preset 2</button>
<button id="btnPreset3" onclick="this.blur(); doPreset(3);" style="width: 98px;" class="psbutton">Preset 3</button>
<button id="btnPreset4" onclick="this.blur(); doPreset(4);" style="width: 98px;" class="psbutton">Preset 4</button>
<button id="btnPreset5" onclick="this.blur(); doPreset(5);" style="width: 98px;" class="psbutton">Preset 5</button>
<button id="btnPreset6" onclick="this.blur(); doPreset(6);" style="width: 98px;" class="psbutton">Preset 6</button>
<button id="btnPreset7" onclick="this.blur(); doPreset(7);" style="width: 98px;" class="psbutton">Preset 7</button>
</div>
<div id="preload" style="display: none;"><img src="loading.gif" style="height: 20px;" id="loading-pre" alt="loading"></div>
<div id="babysitter" style="text-align: center; width: 720px;">
<span class="label"><br>OP25 EventSource not present. Waiting for data. Status: <span id="estat">OK</span><br><br><img src="loading.gif" style="height: 20px;" alt="loading"></span>
</div>
<!-- for testing / debug -->
<div id="div_s1" class="s1">
<!-- system freq and adjacent sites -->
@ -405,6 +418,29 @@
</table>
</td>
</tr>
<tr> <!-- Presets -->
<td colspan="3">
<span class="label"><b>Go To Presets</b></span><br><br>
<input type="checkbox" id="usePresets" onclick="presetTable();" checked><label for="usePresets"> <span></span> Use Go To Preset Controls</label> <br>
<div id="configPresets">
<br>
<table width="100%">
<tr><th>Preset</th><th>TGID</th><th>Button Tag</th><th>Color</th></tr>
<tr><td> 1 </td> <td> <input type="text" id="preset-tg1" value="1111"> </td> <td> <input type="text" id="preset-tag1" value="Preset 1"> </td><td> <input type="color" class="accColor" id="psc1" value="#00FFFF"> </td></tr>
<tr><td> 2 </td> <td> <input type="text" id="preset-tg2" value="2222"> </td> <td> <input type="text" id="preset-tag2" value="Preset 2"> </td><td> <input type="color" class="accColor" id="psc2" value="#00FFFF"> </td></tr>
<tr><td> 3 </td> <td> <input type="text" id="preset-tg3" value="3333"> </td> <td> <input type="text" id="preset-tag3" value="Preset 3"> </td><td> <input type="color" class="accColor" id="psc3" value="#00FFFF"> </td></tr>
<tr><td> 4 </td> <td> <input type="text" id="preset-tg4" value="4444"> </td> <td> <input type="text" id="preset-tag4" value="Preset 4"> </td><td> <input type="color" class="accColor" id="psc4" value="#00FFFF"> </td></tr>
<tr><td> 5 </td> <td> <input type="text" id="preset-tg5" value="5555"> </td> <td> <input type="text" id="preset-tag5" value="Preset 5"> </td><td> <input type="color" class="accColor" id="psc5" value="#00FFFF"> </td></tr>
<tr><td> 6 </td> <td> <input type="text" id="preset-tg6" value="6666"> </td> <td> <input type="text" id="preset-tag6" value="Preset 6"> </td><td> <input type="color" class="accColor" id="psc6" value="#00FFFF"> </td></tr>
<tr><td> 7 </td> <td> <input type="text" id="preset-tg7" value="7777"> </td> <td> <input type="text" id="preset-tag7" value="Preset 7"> </td><td> <input type="color" class="accColor" id="psc7" value="#00FFFF"> </td></tr>
</table>
</div>
</td>
</tr>
<tr>
<td colspan="3">
<span class="label">
@ -417,7 +453,10 @@
&nbsp;&nbsp;&nbsp;
<input type="checkbox" id="je_calls" checked> <label for="je_calls"> <span></span> Calls (00)</label>
&nbsp;&nbsp;&nbsp;
<input type="checkbox" id="je_deny" checked> <label for="je_deny"> <span></span> Denials (27. 2b)</label>
<input type="checkbox" id="je_deny" checked> <label for="je_deny"> <span></span> Denials (27. 2b)</label>
<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<input type="checkbox" id="je_extfunc" checked> <label for="je_extfunc"> <span></span> Extended Functions (24)</label>
<br>
<input type="checkbox" id="log_cf"> <label for="log_cf"> <span></span> Change Frequency</label> <br>
<input type="checkbox" id="log_tu"> <label for="log_tu"> <span></span> Trunk Update </label><br>

16
op25/gr-op25_repeater/www/www-static/main.css
View File

@ -467,7 +467,7 @@ hr {
width: 725px; /* 730 */
border: 0px solid var(--div-border-1);
vertical-align: top;
height: 178px;
height: 178px;
padding: 2px;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2), 0 3px 10px 0 rgba(0,0,0,0.19);
background: var(--status-grad-1); /* For browsers that do not support gradients */
@ -617,7 +617,7 @@ div.adjacent { /* adjacent sites container that holds the table */
.systgid { /* System and Talkgroup Text */
font-family: Arial, Helvetica, sans-serif;
color: var(--system-text);
/* color: var(--system-text); */
font-weight: bold;
font-size: 24px;
}
@ -696,6 +696,12 @@ div.adjacent { /* adjacent sites container that holds the table */
*/
}
.psbutton { /* Preset buttons */
width: 95px;
overflow: hidden;
white-space: nowrap;
text-overflow: "";
}
.nav-button {
@ -704,7 +710,7 @@ div.adjacent { /* adjacent sites container that holds the table */
color: var(--button-text-2);
width: 85px;
border: 0px;
padding: 20px;
padding: 8px; /* 20 */
display: block;
font-size: 14px;
font-weight: bold;
@ -716,7 +722,7 @@ div.adjacent { /* adjacent sites container that holds the table */
color: var(--button-text-2);
width: 15px;
border: 0px;
padding: 20px;
padding: 8px; /* 20 */
display: block;
font-size: 14px;
font-weight: bold;
@ -728,7 +734,7 @@ div.adjacent { /* adjacent sites container that holds the table */
color: var(--button-text-1);
width: 85px;
border: 0px;
padding: 20px;
padding: 8px; /* 20 */
display: block;
font-size: 14px;
font-weight: bold;

133
op25/gr-op25_repeater/www/www-static/main.js
View File

@ -18,7 +18,7 @@
// Software Foundation, Inc., 51 Franklin Street, Boston, MA
// 02110-1301, USA.
var lastUpdated = "04-Mar-2022";
var lastUpdated = "28-Oct-2022";
var d_debug = 0;
var http_req = new XMLHttpRequest();
@ -148,7 +148,6 @@ function rstFileReload() {
localStorage.ColorsTableUpdated == true;
}
function navOplog() {
window.open($('#oplogUrl').val());
}
@ -237,7 +236,8 @@ function rx_update(d) {
// frequency, system, and talkgroup display
function change_freq(d) { // d json_type = change_freq
t = 'TDMA';
var t = 'FDMA';
var t = 'FDMA'; // TODO: t= wtf??
if ((d['tdma'] == 0) || (d['tdma'] == 1)) {
t = '<span style="color: lime;">TDMA ' + d['tdma'] + '</span>';
}
@ -258,10 +258,12 @@ function change_freq(d) { // d json_type = change_freq
last_algid[d['nac']] = d['algid'];
last_keyid[d['nac']] = d['keyid'];
last_srctag[d['nac']] = d['srcaddr.tag'];
if (d['tgid'] != null) {
displayTgid = d['tgid'];
displayTag = d['tag'].substring(0, trunc);
if (d['srcaddr'] != null && d['srcaddr'] > 0) {
display_src = d['srcaddr'];
display_srctag = d['srcaddr_tag'];
@ -329,12 +331,21 @@ function change_freq(d) { // d json_type = change_freq
html += '<td style="text-align:center;"><span class="value" id="dKey">' + display_keyid + '</span>';
html += '</tr>';
}
// end encryption info block
html += '</table>';
$('#div_s2').html(html).show();
// "Go To" Presets
if (cbState('usePresets')) {
$('#div_presets').show();
for (let i = 1; i < 8; i++) {
$('#btnPreset' + i).css('color', $('#psc' + i).val()).html($('#preset-tag' + i).val());
}
} else {
$('#div_presets').hide();
}
active_nac = d['nac'];
active_tgid = d['tgid'];
if (d['tgid'] != null) {
@ -352,20 +363,20 @@ function change_freq(d) { // d json_type = change_freq
var srcColor = "";
var clr = getProperty('.c' + d.tag_color, 'color', 'tgcolors');
var srcClr = getProperty('.c' + d.srcaddr_color, 'color', 'tgcolors');
var ani = getProperty('.c' + d.tag_color, 'animation', 'tgcolors');
var bg = getProperty('.c' + d.tag_color, 'backgroundColor', 'tgcolors');
sysColor = (cbState('color_main_sys') && d['tag_color']) ? clr : defColor;
tagColor = (cbState('color_main_tag') && d['tag_color']) ? clr : defColor;
srcColor = (cbState('color_main_tag') && d['srcaddr_color']) ? srcClr : defColor;
// console.log(d['srcaddr_tag'] + '---' + d['srcaddr_color']);
$('#dSys').css({"color": sysColor, "font-size": sysSize, "font-weight": fontStyle});
$('#dTag').css({"color": tagColor, "font-size": tgSize, "font-weight": fontStyle, "animation": ani, "background-color": bg});
// console.log(srcColor);
$('#dSrcTag').css({"color": srcColor, "font-size": tgSize, "font-weight": fontStyle, "animation": ani, "background-color": bg});
// console.log(display_srctag, 'srcColor=' + srcColor, 'defColor=' + defColor, d.srcaddr_color);
} // end change_freq
@ -768,6 +779,9 @@ function trunk_detail(d) { // d json_type = trunk_update
// Active Frequencies Table
if (sf_tgtag[slot] == $('#dTag').text()) {
sf_enc[slot] += ' A';
}
html += '<tr>';
if (slot == 0)
@ -786,6 +800,9 @@ function trunk_detail(d) { // d json_type = trunk_update
// Sloppy Source ID Tag Hack 04/2022 -- this displays the source ID tag in the Main Display better than previous implementations.
// RID display is problematic when using 0x02 opcode, which the Main Display is sometimes populated with.
// Sloppy Source Tag Color Hack 10/2022 -- color is supposed to be set in change_freq() but sometimes it does not
// (src color might not be present in the json from python? not sure)
if (sf_srctag[slot].length == 1 && sf_srcaddr[slot] > 1 && cbState('showSourceId') ) {
sf_srctag[slot] = "ID: " + sf_srcaddr[slot];
@ -796,13 +813,20 @@ function trunk_detail(d) { // d json_type = trunk_update
// something here to catch when no source address is present -- usually when a patch is used
// the display layout gets a little messed up when these vars are null.
sf_srcaddr[slot] = 'NO P25 ID';
}
$('#dSrcTag').text(sf_srctag[slot]);
$('#dSrc').text(sf_srcaddr[slot]);
$('#dSrc').text(sf_srcaddr[slot]);
// redo the color for the source tag
var fontStyle = $('#valFontStyle').val();
var tgSize = parseInt($('#valTagFont').val());
var sysSize = parseInt($('#valSystemFont').val());
var ani = getProperty('.c' + d.tag_color, 'animation', 'tgcolors');
var bg = getProperty('.c' + d.tag_color, 'backgroundColor', 'tgcolors');
var srcColor = getProperty('.c' + sf_srccolor[slot], 'color', 'tgcolors');
$('#dSrcTag').css({"color": srcColor, "font-size": tgSize, "font-weight": fontStyle, "animation": ani, "background-color": bg});
}
// end 'sloppy'
// end 'sloppy' -- not my proudest achievement... :(
// if (!p2 || zt == " " ) break;
if (!p2 || zt == " " || ( sf_la[slot] > 120 && cbState('colSlot2')) ) break;
@ -995,6 +1019,7 @@ function trunk_update(d) {
// display last command unless it was more than 10 seconds ago
x2 = d['data']['last_command'];
if (x2=='skip') { x2 = 'scan'; }
if (x2 && d['data']['last_command_time'] > -10) {
$('#lastCommand').html('Last Command<br><b>' + x2.toUpperCase() + '</b><br>' + ' ' + d['data']['last_command_time'] * -1 + ' secs ago');
} else {
@ -1265,7 +1290,7 @@ function dispatch_commands(txt) {
// 0xD8 = Tait
// 0xF8 = Vertex Standard
// trunking.py sends the following opcodes:
// -1, 0x00, 01, 02, 03, 09, 20, 27, 28, 2a, 2b, 2c, 2d, 2f, 31, 33, 34, 3d
// -1, 0x00, 01, 02, 03, 09, 20, 24, 27, 28, 2a, 2b, 2c, 2d, 2f, 31, 33, 34, 3d
switch (opcode) {
@ -1377,15 +1402,26 @@ function dispatch_commands(txt) {
noLog = 1;
break;
case "24": // 0x24 - Extended Function Command (inhibit) TODO: get reason code, log it
case "24": // 0x24 - Extended Function Command (mostly inhibit commands)
var efclass = d.efclass;
var efoperand = d.efoperand;
var efargs = d.efargs;
var target = d.target;
n_opcode = "Ext Fnct Cmd: " + efoperand;
source = efargs['unit_id'];
noLog = 0;
break;
switch(efoperand) {
case 127:
n_opcode = "Radio Inhibit (7F)";
break;
case 126:
n_opcode = "Radio Uninhibit (7E)";
break;
case 125:
n_opcode = "Radio Detach (7D)";
break;
}
source = efargs['unit_id'];
noLog = cbState('je_extfunc') ? 0 : 1;
break;
case "27": // 0x27 - DENY_RSP
source = d.target.unit_id;
@ -1589,6 +1625,7 @@ function f_goto_button(command) {
if (current_tgid != null)
_tgid = current_tgid;
_tgid = parseInt(prompt('Enter TGID to hold.', _tgid));
if (isNaN(_tgid) || _tgid < 0 || _tgid > 65535) {
return; // Cancel was pressed or invalid entry
}
@ -1605,6 +1642,30 @@ function f_goto_button(command) {
}
}
function doPreset(ps) {
t = $('#preset-tg' + ps).val();
if (isNaN(t) || t < 0 || t > 65535) {
return; // Cancel was pressed or invalid entry
}
// it's necessary to release current hold before trying to hold on a new tg
if ($('#holdIndicator').is(':visible') ) {
send_command('skip', -1);
setTimeout(function() {
send_command('hold', parseInt(t));
}, 500);
return;
}
send_command('hold', parseInt(t));
}
function presetTable() {
(cbState('usePresets')) ? $('#configPresets').show() : $('#configPresets').hide();
}
function f_debug(d) {
if (!d_debug)
return;
@ -1683,7 +1744,7 @@ document.onkeydown = function(evt) {
break;
case 83:
// 's' key - SKIP
$('#lastCommand').html('S - Skip<br><br>').show();
$('#lastCommand').html('S - Scan<br><br>').show();
f_scan_button('skip');
break;
case 86:
@ -2357,7 +2418,30 @@ function saveDisplaySettings() {
"showLast",
"colSlot2",
"showEnc",
"showSourceId"];
"showSourceId",
"je_extfunc",
"usePresets",
"preset-tg1",
"preset-tg2",
"preset-tg3",
"preset-tg4",
"preset-tg5",
"preset-tg6",
"preset-tg7",
"preset-tag1",
"preset-tag2",
"preset-tag3",
"preset-tag4",
"preset-tag5",
"preset-tag6",
"preset-tag7",
"psc1",
"psc2",
"psc3",
"psc4",
"psc5",
"psc6",
"psc7" ];
for (r in s) {
if ($('#' + s[r]).attr('type') == "checkbox") {
@ -2369,6 +2453,7 @@ function saveDisplaySettings() {
var settingsJSON = JSON.stringify(settings, null, 2);
send_command('config-savesettings', settingsJSON);
}
@ -2403,6 +2488,7 @@ function loadJsonDisplaySettings(settings) {
var ele, m;
for (item in settings) {
ele = document.getElementById(item);
if (ele) {
if (ele.type == "checkbox") {
@ -2416,6 +2502,7 @@ function loadJsonDisplaySettings(settings) {
}
ele.value = settings[item];
// console.log(ele.value + ' --- ' + item);
}
if (item == "selDispMode") {
@ -2446,6 +2533,8 @@ function loadJsonDisplaySettings(settings) {
uiColorRefresh();
(cbState('usePresets')) ? $('#configPresets').show() : $('#configPresets').hide();
}
function uiColorRefresh() { // this is also called from editor.js