summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <ikj1234i@yahoo.com>2020-07-12 21:09:57 -0400
committerMax <ikj1234i@yahoo.com>2020-07-12 21:09:57 -0400
commit602cb0659faccf5c9f6dfdfaee68d0909d0e6a41 (patch)
tree615f2916eb853306c99b0e830161e4270e2ae2b9
parent1da0714da5c9cc97deca9da1b476f1dc1c6918b6 (diff)
html/css/js updates+bugfixes
-rw-r--r--op25/gr-op25_repeater/www/www-static/index.html43
-rw-r--r--op25/gr-op25_repeater/www/www-static/main.css5
-rw-r--r--op25/gr-op25_repeater/www/www-static/main.js16
3 files changed, 54 insertions, 10 deletions
diff --git a/op25/gr-op25_repeater/www/www-static/index.html b/op25/gr-op25_repeater/www/www-static/index.html
index 90b38cb..614cd5f 100644
--- a/op25/gr-op25_repeater/www/www-static/index.html
+++ b/op25/gr-op25_repeater/www/www-static/index.html
@@ -20,8 +20,9 @@
<li id="li1" class="nav-li"><input id="b1" class="nav-button" type="button" name="B1" value="Home" onclick="javascript:f_select(&quot;status&quot;);"></li>
<li id="li2" class="nav-li"><input id="b2" class="nav-button" type="button" name="B2" value="Configuration" onclick="javascript:f_select(&quot;settings&quot;);"></li>
<li id="li3" class="nav-li"><input id="b3" class="nav-button" type="button" name="B3" value="RX" onclick="javascript:f_select(&quot;rx&quot;);"></li>
- <li id="li4" class="nav-li"><input id="b4" class="nav-button" type="button" name="B4" value="About" onclick="javascript:f_select(&quot;about&quot;);"></li>
- <li id="li5"><div class="copyr">&copy; 2017-2019 Max H. Parke KA1RBI</div></li>
+ <li id="li4" class="nav-li"><input id="b4" class="nav-button" type="button" name="B4" value="Help" onclick="javascript:f_select(&quot;help&quot;);"></li>
+ <li id="li5" class="nav-li"><input id="b5" class="nav-button" type="button" name="B5" value="About" onclick="javascript:f_select(&quot;about&quot;);"></li>
+ <li id="li5"><div class="copyr">&copy; 2017&dash;2020 Max H. Parke KA1RBI</div></li>
</ul>
</div>
<br>
@@ -29,6 +30,39 @@
<div id="div_debug" style="display: none;">
</div>
+<div id="div_help" class="help" style="display:none;">
+<P>
+<h2>Setup and Monitor a Trunked System</h2>
+Before proceeding you will need to know the control channel frequency or frequencies for your system and the system NAC code. Also needed is the frequency correction (PPM) value for your SDR.
+<ul>
+<li>Select "Configuration" from the top nav bar</li>
+<li>Select "sample_trunked" from the list of available configurations; then click "Edit"</li>
+<li>The various Frequency parameters are used as follows:
+ <ul>
+ <li>The Channel frequency is the same as the "center frequency". If the entire P25 system being monitored fits within the sampling band (as defined by the device sampling rate), choose a frequency that is halfway between the lowest and highest system frequencies and enter it here. OP25 will use a "software LO" to achieve tuning within this band. If the value is zero or if the desired frequency when retuning is outside the sampling band, OP25 will change the SDR hardware receive frequency each time a frequency change is needed.</li>
+ <li>The Device frequency is ignored in trunked operation, but must be set to a non-zero number. TODO: fix this.</li>
+ <li>Under "Trunking Info" the "CC Freq's" should be set to a list of control channel frequencies. If your system has more than one control channel you should enter them as a comma separated list. Some systems with multiple control channels seem to favor a certain frequency; if so you can speed up acquisition by entering such channel(s) first in the list.</li>
+ </ul>
+<li>Enter the frequency correction value of the SDR device in the "PPM" field. If your SDR is GPSDO stabilized, you can enter zero here; all others must contend with setting a proper correction value.</li>
+<li>Enter the name of your system in the channel "Name" input.</li>
+<li>Enter the system NAC.</li>
+<li>Be sure to check the "P2 TDMA" box if your system utilizes P25 Phase 2/TDMA.</li>
+<li>Choose and enter a name for the new configuration file and click "Save".</li>
+<li>The displayed list of configurations should update, showing the new configuration.</li>
+<li>After selecting the configuration from the list, click "Start" to launch the receiver app (rx.py) in the background*</li>
+</ul>
+*The "Start" and "Stop" options are only usable when OP25 has been started in the backend as "http.py", not as "rx.py" or "multi_rx.py".
+<h3>NOTES</h3>
+<ul>
+<li>Configuration files are saved in the <tt>op25/gr-op25_repeater/www/config</tt> directory, as JSON.</li>
+<li>If you aleady have installed OP25 with a TSV configuration file, to import the TSV config files check the box to include TSV files and click "Refresh". TSV files are searched for in the <tt>op25/gr-op25_repeater/apps</tt> directory.</li>
+<li>The current version does not allow configurations with more than one channel unless all the channels share the same value for the "Trunked" parameter. That is, the configuration must define either none of the channels as trunked or all of the channels as trunked. The selected backend used in these two cases is multi_rx.py or rx.py, respectively.</li>
+<li>You can define more than one trunked (P25) system by adding an additional channel for each one. The list of currently-active channels can be managed from the HTTP console "Home" page.</li>
+<li>Please refer to <a href="https://osmocom.org/projects/gr-osmosdr/wiki" target="_blank">this page</a> for details about specifying the Device Args parameter values for your SDR device.</li>
+<li>After creating and verifying a configuration you can arrange for that configuration to be automatically started whenever <tt>http.py</tt> is (re)started. When starting <tt>http.py</tt>, use the <tt>-c <em>Name</em></tt> parameter to give the name of the configuration to be started. <tt><em>Name</em></tt> should not contain any prefixes or suffixes,</li>
+</ul>
+</div>
+
<!-- copyright / about div-->
<div id="div_about" style="display:none;">
@@ -171,10 +205,10 @@
<div id="cfg_list_area" class="cfg_list">
</div>
<p>
+<input type="button" name="load" value="Edit" onclick="javascript:f_load();"></input> - Open configuration editor (any previous unsaved work will be lost)<br>
<input type="button" name="list" value="Refresh" onclick="javascript:f_list();"></input> - Reload selection list
<input type=checkbox id="include_tsv" name="include_tsv">Include old-style trunking TSV files
<br>
-<input type="button" name="load" value="Edit" onclick="javascript:f_load();"></input> - Open configuration editor (any previous unsaved work will be lost)<br>
<input type="button" name="start" value="Start" onclick="javascript:f_start();"></input> - Run flowgraph using selected configuration<br>
<input type="button" name="stop" value="Stop" onclick="javascript:f_stop();"></input> - End running flowgraph<br>
<br>
@@ -227,7 +261,6 @@
<tr><th>pcm inp device</th><td><input type=text name="audio-input" value=""></input></td></tr>
<tr><th>soundcard IF</th><td><input type=checkbox name="audio-if" ></input></td></tr>
<tr><th>tone detect algo</th><td><input type=checkbox name="tone-detect" ></input></td></tr>
-<tr><th>voice codec</th><td><input type=checkbox name="vocoder" ></input></td></tr>
<tr><th>hamlib model</th><td><input type=text name="hamlib-model" value="None"></input></td></tr>
<tr><th>direct audio inp</th><td><input type=checkbox name="audio" ></input></td></tr>
<tr><th>startup pause</th><td><input type=checkbox name="pause" ></input></td></tr>
@@ -286,6 +319,7 @@
<th>Plot Type(s)</th>
<th>Destination</th>
<th>IF Rate</th>
+<th>&alpha;</th>
<th>&nbsp;</th>
</tr>
<tr id="chrow" class="dynrow" style="display: none">
@@ -311,6 +345,7 @@
</select></td>
<td><input type="text" name="destination" value="udp://127.0.0.1:23456"></td>
<td><input type="text" name="if_rate" value="24000"></td>
+<td><input type="text" name="excess_bw" value="0"></td>
<td>
<input type="button" name="clone" value="CLONE" onclick="javascript:f_command(this, &quot;clone&quot;);"></input>
<br>
diff --git a/op25/gr-op25_repeater/www/www-static/main.css b/op25/gr-op25_repeater/www/www-static/main.css
index 70a723b..597d553 100644
--- a/op25/gr-op25_repeater/www/www-static/main.css
+++ b/op25/gr-op25_repeater/www/www-static/main.css
@@ -439,3 +439,8 @@ div#cfg_list_area select {
border-left: none;
text-align: right;
}
+
+.help {
+ max-width: 640px;
+ font-family: Arial, Helvetica, sans-serif;
+}
diff --git a/op25/gr-op25_repeater/www/www-static/main.js b/op25/gr-op25_repeater/www/www-static/main.js
index 08ee375..9bc769c 100644
--- a/op25/gr-op25_repeater/www/www-static/main.js
+++ b/op25/gr-op25_repeater/www/www-static/main.js
@@ -80,7 +80,7 @@ function edit_d(d, to_ui) {
var hexints = {"nac":1};
var ints = {"if_rate":1, "ppm":1, "rate":1, "offset":1, "nac":1, "logfile-workers":1, "decim-amt":1, "seek":1, "hamlib-model":1 };
var bools = {"active":1, "trunked":1, "rate":1, "offset":1, "phase2_tdma": 1, "phase2-tdma":1, "wireshark":1, "udp-player":1, "audio-if":1, "tone-detect":1, "vocoder":1, "audio":1, "pause":1 };
- var floats = {"costas-alpha":1, "gain-mu":1, "calibration":1, "fine-tune":1, "gain":1, "excess-bw":1, "offset":1}
+ var floats = {"costas-alpha":1, "gain-mu":1, "calibration":1, "fine-tune":1, "gain":1, "excess-bw":1, "offset":1, "excess_bw":1}
var lists = {"blacklist":1, "whitelist":1, "cclist":1};
var freqs = {"frequency":1, "cclist":1};
@@ -114,7 +114,10 @@ function edit_d(d, to_ui) {
}
} else {
if (k in hexints) {
- new_d[k] = "0x" + d[k].toString(16);
+ if (d[k] == null)
+ new_d[k] = "0x0";
+ else
+ new_d[k] = "0x" + d[k].toString(16);
} else if (k in ints) {
if (d[k] == null)
new_d[k] = "";
@@ -213,8 +216,8 @@ function amend_d(myrow, mytbl, command) {
}
function nav_update(command) {
- var names = ["b1", "b2", "b3", "b4"];
- var bmap = { "status": "b1", "settings": "b2", "rx": "b3", "about": "b4" };
+ var names = ["b1", "b2", "b3", "b4", "b5"];
+ var bmap = { "status": "b1", "settings": "b2", "rx": "b3", "help": "b4", "about": "b5" };
var id = bmap[command];
for (var id1 in names) {
b = document.getElementById(names[id1]);
@@ -227,7 +230,7 @@ function nav_update(command) {
}
function f_select(command) {
- var div_list = ["status", "settings", "rx", "about"];
+ var div_list = ["status", "settings", "rx", "help", "about"];
var orig_command = command;
if (command == "rx") {
command = "status"; //hack
@@ -307,8 +310,9 @@ function change_freq(d) {
}
var html = "<table style=\"width: 512px; height: 168px;\">";
+ var d_sys = ("system" in d) ? d['system'].substring(0,doTruncate) : "Undefined";
html += "<tr>";
- html += "<td style=\"width: 422px;\" colspan=2><span class=\"systgid\" id=\"dSys\">" + d['system'].substring(0,doTruncate) + "</span></td>";
+ html += "<td style=\"width: 422px;\" colspan=2><span class=\"systgid\" id=\"dSys\">" + d_sys + "</span></td>";
html += "<td align=\"center\" style=\"width: 88px;\">";
html += "<span class=\"label-sm\">Frequency</span><br><span class=\"value\">" + d['freq'] / 1000000.0 + "</span></td>";
html += "</tr>";