Merge branch 'next' into lime

author: Matthias P. Braendli <matthias.braendli@mpb.li> 2019-01-23 11:00:02 +0100
committer: Matthias P. Braendli <matthias.braendli@mpb.li> 2019-01-23 11:00:02 +0100
commit: 201d711a1d3dfbe46d622871731005937598e790 (patch)
tree: e43a95ee027e1be6ca8621f9e2c78aaf932a3421 /python/gui/templates
parent: 674228bedb325384f12602350ab36d075b5509a3 (diff)
parent: e0abfc3728fb56519fa2507d2468214e2a633c98 (diff)
download: dabmod-201d711a1d3dfbe46d622871731005937598e790.tar.gz
dabmod-201d711a1d3dfbe46d622871731005937598e790.tar.bz2
dabmod-201d711a1d3dfbe46d622871731005937598e790.zip
5 files changed, 203 insertions, 119 deletions
diff --git a/python/gui/templates/about.html b/python/gui/templates/about.html
index 3a05230..b781d54 100644
--- a/python/gui/templates/about.html
+++ b/python/gui/templates/about.html
@@ -1,24 +1,3 @@
-<!--
-   Copyright (C) 2018
-   Matthias P. Braendli, matthias.braendli@mpb.li
-
-This file is part of ODR-DabMod.
-
-ODR-DabMod 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.
-
-ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-
 <!DOCTYPE html>
 <html lang="en">
 
@@ -63,3 +42,24 @@ along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
 
 </html>
 
+<!--
+   Copyright (C) 2018
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+This file is part of ODR-DabMod.
+
+ODR-DabMod 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.
+
+ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+
diff --git a/python/gui/templates/home.html b/python/gui/templates/home.html
index 5cb29f8..398df37 100644
--- a/python/gui/templates/home.html
+++ b/python/gui/templates/home.html
@@ -1,3 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+
+{% include 'head.html' %}
+
+<body>
+    {% include 'body-nav.html' %}
+
+    <div class="container-fluid">
+        <div class="jumbotron">
+            <h1>Opendigitalradio</h1><h2>ODR-DabMod Status Check
+                <span id="overall_state" class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+            </h2>
+            <div class="well well-sm">
+                <p>ODR-DabMod
+                </p>
+                <ul>
+                    <li>Answering to RC:
+                        <span id="is_rc_ok" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_rc_ok_comment"><span>
+                    </li>
+                    <li>Frame generation:
+                        <span id="is_modulating" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_modulating_comment"><span>
+                    </li>
+                    <li>GPSDO status:
+                        <span id="is_gpsdo_ok" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_gpsdo_ok_comment"><span>
+                    </li>
+                    <li>Underruns:
+                        <span id="is_underrunning" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_underrunning_comment"><span>
+                    </li>
+                    <li>Late packets:
+                        <span id="is_late" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_late_comment"><span>
+                    </li>
+                </ul>
+
+                <p>Checking predistortion
+                <ul>
+                    <li>Sample rate at 4x native rate:
+                        <span id="is_rate_4x" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_rate_4x_comment"><span>
+                    </li>
+                    <li>DPDCE running:
+                        <span id="is_dpdce_running" class="glyphicon glyphicon-question-sign"></span>
+                        <span id="is_dpdce_running_comment"><span>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+
 <!--
    Copyright (C) 2018
    Matthias P. Braendli, matthias.braendli@mpb.li
@@ -17,19 +73,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
-<!DOCTYPE html>
-<html lang="en">
-
-{% include 'head.html' %}
-
-<body>
-	{% include 'body-nav.html' %}
-
-	<div class="container-fluid">
-		<div class="jumbotron">
-            <h1>Opendigitalradio</h1><h2>ODR-DabMod Interface</h2>
-		</div>
-	</div>
-</body>
-</html>
diff --git a/python/gui/templates/modulator.html b/python/gui/templates/modulator.html
index 6deffb1..016344a 100644
--- a/python/gui/templates/modulator.html
+++ b/python/gui/templates/modulator.html
@@ -1,23 +1,3 @@
-<!--
-   Copyright (C) 2018
-   Matthias P. Braendli, matthias.braendli@mpb.li
-
-This file is part of ODR-DabMod.
-
-ODR-DabMod 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.
-
-ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <!DOCTYPE html>
 <html lang="en">
 
@@ -71,3 +51,23 @@ along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
   </div>
 </body>
 </html>
+
+<!--
+   Copyright (C) 2018
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+This file is part of ODR-DabMod.
+
+ODR-DabMod 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.
+
+ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
+-->
diff --git a/python/gui/templates/predistortion.html b/python/gui/templates/predistortion.html
index cc5ecb0..62e8503 100644
--- a/python/gui/templates/predistortion.html
+++ b/python/gui/templates/predistortion.html
@@ -1,23 +1,3 @@
-<!--
-   Copyright (C) 2018
-   Matthias P. Braendli, matthias.braendli@mpb.li
-
-This file is part of ODR-DabMod.
-
-ODR-DabMod 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.
-
-ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <!DOCTYPE html>
 <html lang="en">
 
@@ -31,42 +11,87 @@ along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
       <div class="panel panel-default">
         <div class="panel-heading">Status and calibration</div>
         <div class="panel-body">
-          <div>Current DPDCE status: <span id="dpdstatus" style="font-weight:bold;">N/A</span>
-            <div class="well well-sm" id="dpdresults">N/A</div>
+
+          <div class="container-fluid">
+            <div class="row">
+              <div class="col-sm-4">
+                <h2>Current DPDCE status</h2>
+                <div>
+                  <div id="dpdstatus" style="font-weight:bold;">N/A</div>
+                  <div class="progress">
+                    <div id="dpdprogress" class="progress-bar" role="progressbar" style="width:0%">
+                      <span id="dpdprogresstext"></span>
+                    </div>
+                  </div>
+                </div>
+                <div class="well well-sm" id="dpdresults">N/A</div>
+              </div>
+              <div class="col-sm-4">
+                <h2>List of saved DPD settings</h2>
+                <!--TODO: 'erase' and 'clear' buttons. Show DPD settings in tooltip?-->
+                <p>This list contains previously used predistortion settings that you
+                can recall.</p>
+                <p>
+                <select id="dpdadaptdumps" size="8" style="width:70%" multiple></select>
+                </p>
+                <p>
+                <button type="button" class="btn btn-sm btn-info" id="adaptdumpsrefreshbtn">Refresh
+                </button>
+                <button type="button" class="btn btn-sm btn-warning" id="adaptdumpsload">Load and Apply
+                </button>
+                </p>
+              </div>
+              <div class="col-sm-4">
+                <h2>Summary</h2>
+                <p>Calibration needs to be done once before the PA model
+                can be trained. Every time calibration is changed, the predistortion
+                parameters are invalidated!</p>
+                <p>Once calibration succeeded and correct RX gain is set, you
+                can trigger a capture and model the PA. Usually, several capture
+                runs are needed before the model can be trained.</p>
+                <p>The capture and model analysis will calculate a new set of
+                DPD model data, that you can apply using the Update Predistorter button.</p>
+                <p>The reset button allows you to reset the computation engine. It does not
+                modify the currently active predistorter.</p>
+              </div>
+            </div>
           </div>
 
-          <div>Calibration needs to be done once before the PA model
-          can be trained. Every time calibration is changed, the predistortion
-          parameters are invalidated!</div>
           <button type="button" class="btn btn-sm btn-warning" id="calibratebtn">
             Calibrate</button>
+          <button type="button" class="btn btn-sm btn-warning" id="triggerbtn">
+            Trigger Capture and PA Modeling</button>
+          <button type="button" class="btn btn-sm btn-warning" id="adaptbtn">
+            Update Predistorter</button>
+          <button type="button" class="btn btn-sm btn-info" id="resetbtn">
+            Reset Capture and Model</button>
         </div>
       </div>
-      <!--
+
       <div class="panel panel-default">
-        <div class="panel-heading">Capture TX and RX frames</div>
+        <div class="panel-heading">Capture Statistics</div>
         <div class="panel-body">
-          <div>
-            <img id="txframeimg" src="dpd/txframe.png" width="320" height="240" />
-            <img id="rxframeimg" src="dpd/rxframe.png" width="320" height="240" />
-          </div>
-          <div>
-            <button type="button" class="btn btn-sm btn-info" id="refreshframesbtn">
-              Refresh</button>
-          </div>
+          <img id="dpdcapturestats" />
         </div>
       </div>
-
       <div class="panel panel-default">
-        <div class="panel-heading">Capture</div>
+        <div class="panel-heading">AM/AM and AM/PM Model</div>
         <div class="panel-body">
-          <div>On pressing this button,
-            the DPDCE will trigger a capture and a quick data
-            analysis, without updating any DPD models.</div>
-          <button type="button" class="btn btn-sm btn-info" id="capturebutton">
-            Capture</button>
+          <div class="container-fluid">
+            <div class="row">
+              <div class="col-sm-2">
+                <p>Model data:</p>
+              </div>
+              <div class="col-sm-10">
+                <pre id="dpdmodeldata"></pre>
+              </div>
+            </div>
+          </div>
+          <img id="dpdmodelplot" />
         </div>
       </div>
+
+      <!--
       <div class="panel panel-default">
         <div class="panel-heading">Status</div>
         <div class="panel-body">
@@ -87,3 +112,23 @@ along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
   </div>
 </body>
 </html>
+
+<!--
+   Copyright (C) 2019
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+This file is part of ODR-DabMod.
+
+ODR-DabMod 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.
+
+ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
+-->
diff --git a/python/gui/templates/rcvalues.html b/python/gui/templates/rcvalues.html
index c1786bc..9e607bc 100644
--- a/python/gui/templates/rcvalues.html
+++ b/python/gui/templates/rcvalues.html
@@ -1,23 +1,3 @@
-<!--
-   Copyright (C) 2018
-   Matthias P. Braendli, matthias.braendli@mpb.li
-
-This file is part of ODR-DabMod.
-
-ODR-DabMod 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.
-
-ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <!DOCTYPE html>
 <html lang="en">
 
@@ -46,3 +26,22 @@ along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
     </div>
 </body>
 </html>
+<!--
+   Copyright (C) 2018
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+This file is part of ODR-DabMod.
+
+ODR-DabMod 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.
+
+ODR-DabMod 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 ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
+-->
author	Matthias P. Braendli <matthias.braendli@mpb.li>	2019-01-23 11:00:02 +0100
committer	Matthias P. Braendli <matthias.braendli@mpb.li>	2019-01-23 11:00:02 +0100
commit	201d711a1d3dfbe46d622871731005937598e790 (patch)
tree	e43a95ee027e1be6ca8621f9e2c78aaf932a3421 /python/gui/templates
parent	674228bedb325384f12602350ab36d075b5509a3 (diff)
parent	e0abfc3728fb56519fa2507d2468214e2a633c98 (diff)
download	dabmod-201d711a1d3dfbe46d622871731005937598e790.tar.gz dabmod-201d711a1d3dfbe46d622871731005937598e790.tar.bz2 dabmod-201d711a1d3dfbe46d622871731005937598e790.zip