Display per-adapter status information in the Status tab in UI

diff --git a/src/dvb/dvb.h b/src/dvb/dvb.h
index 6b42de906a59e819fb733b407811efbaad530cdf..92fcaf2c37f253068fa3a6f1a07693366d4951f3 100644 (file)
--- a/src/dvb/dvb.h
+++ b/src/dvb/dvb.h
@@ -98,7 +98,8 @@ typedef struct th_dvb_mux_instance {
   struct th_dvb_adapter *tdmi_adapter;
 
   uint16_t tdmi_snr, tdmi_signal;
-  uint32_t tdmi_ber, tdmi_uncorrected_blocks;
+  uint32_t tdmi_ber, tdmi_unc;
+  float tdmi_unc_avg;
 
 #define TDMI_FEC_ERR_HISTOGRAM_SIZE 10
   uint32_t tdmi_fec_err_histogram[TDMI_FEC_ERR_HISTOGRAM_SIZE];

diff --git a/src/dvb/dvb_fe.c b/src/dvb/dvb_fe.c
index c3355d301024fb1230b970710bd391a505b29af1..b90d5abb94d8cd2a1db82b646f1942434656ea66 100644 (file)
--- a/src/dvb/dvb_fe.c
+++ b/src/dvb/dvb_fe.c
@@ -90,13 +90,16 @@ dvb_fe_monitor(void *aux)
 {
   th_dvb_adapter_t *tda = aux;
   fe_status_t fe_status;
-  int status, v, update = 0, vv, i, fec, q;
+  int status, v, vv, i, fec, q;
   th_dvb_mux_instance_t *tdmi = tda->tda_mux_current;
   char buf[50];
   signal_status_t sigstat;
   streaming_message_t sm;
   struct service *t;
 
+  int store = 0;
+  int notify = 0;
+
   gtimer_arm(&tda->tda_fe_monitor_timer, dvb_fe_monitor, tda, 1);
 
   if(tdmi == NULL)
@@ -133,7 +136,11 @@ dvb_fe_monitor(void *aux)
     /* Read FEC counter (delta) */
 
     fec = dvb_fe_get_unc(tda);
-    tdmi->tdmi_uncorrected_blocks = fec;
+
+    if(tdmi->tdmi_unc != fec) {
+      tdmi->tdmi_unc = fec;
+      notify = 1;
+    }
 
     tdmi->tdmi_fec_err_histogram[tdmi->tdmi_fec_err_ptr++] = fec;
     if(tdmi->tdmi_fec_err_ptr == TDMI_FEC_ERR_HISTOGRAM_SIZE)
@@ -145,7 +152,13 @@ dvb_fe_monitor(void *aux)
        v++;
       vv += tdmi->tdmi_fec_err_histogram[i];
     }
-    vv = vv / TDMI_FEC_ERR_HISTOGRAM_SIZE;
+
+    float avg = (float)vv / TDMI_FEC_ERR_HISTOGRAM_SIZE;
+
+    if(tdmi->tdmi_unc_avg != avg) {
+      tdmi->tdmi_unc_avg = avg;
+      notify = 1;
+    }
 
     if(v == 0) {
       status = TDMI_FE_OK;
@@ -155,27 +168,35 @@ dvb_fe_monitor(void *aux)
       status = TDMI_FE_CONSTANT_FEC;
     }
 
+    int v;
     /* bit error rate */
-    if(ioctl(tda->tda_fe_fd, FE_READ_BER, &tdmi->tdmi_ber) == -1)
-      tdmi->tdmi_ber = -2;
+    if(ioctl(tda->tda_fe_fd, FE_READ_BER, &v) != -1 && v != tdmi->tdmi_ber) {
+      tdmi->tdmi_ber = v;
+      notify = 1;
+    }
 
     /* signal strength */
-    if(ioctl(tda->tda_fe_fd, FE_READ_SIGNAL_STRENGTH, &tdmi->tdmi_signal) == -1)
-      tdmi->tdmi_signal = -2;
+    if(ioctl(tda->tda_fe_fd, FE_READ_SIGNAL_STRENGTH, &v) != -1 && v != tdmi->tdmi_signal) {
+      tdmi->tdmi_signal = v;
+      notify = 1;
+    }
 
     /* signal/noise ratio */
-    if(ioctl(tda->tda_fe_fd, FE_READ_SNR, &tdmi->tdmi_snr) == -1)
-      tdmi->tdmi_snr = -2;
+    if(ioctl(tda->tda_fe_fd, FE_READ_SNR, &v) == -1 && v != tdmi->tdmi_snr) {
+      tdmi->tdmi_snr = v;
+      notify = 1;
+    }
   }
 
   if(status != tdmi->tdmi_fe_status) {
     tdmi->tdmi_fe_status = status;
 
     dvb_mux_nicename(buf, sizeof(buf), tdmi);
-    tvhlog(LOG_DEBUG, 
+    tvhlog(LOG_DEBUG,
           "dvb", "\"%s\" on adapter \"%s\", status changed to %s",
           buf, tda->tda_displayname, dvb_mux_status(tdmi));
-    update = 1;
+    store = 1;
+    notify = 1;
   }
 
   if(status != TDMI_FE_UNKNOWN) {
@@ -187,26 +208,40 @@ dvb_fe_monitor(void *aux)
     }
     if(q != tdmi->tdmi_quality) {
       tdmi->tdmi_quality = q;
-      update = 1;
+      store = 1;
+      notify = 1;
     }
-  } 
+  }
 
-  if(update) {
+  if(notify) {
     htsmsg_t *m = htsmsg_create_map();
-
     htsmsg_add_str(m, "id", tdmi->tdmi_identifier);
     htsmsg_add_u32(m, "quality", tdmi->tdmi_quality);
+    htsmsg_add_u32(m, "signal", tdmi->tdmi_signal);
+    htsmsg_add_u32(m, "snr", tdmi->tdmi_snr);
+    htsmsg_add_u32(m, "ber", tdmi->tdmi_ber);
+    htsmsg_add_u32(m, "unc", tdmi->tdmi_unc);
     notify_by_msg("dvbMux", m);
 
-    dvb_mux_save(tdmi);
+    m = htsmsg_create_map();
+    htsmsg_add_str(m, "identifier", tda->tda_identifier);
+    htsmsg_add_u32(m, "signal", MIN(tdmi->tdmi_signal * 100 / 65535, 100));
+    htsmsg_add_u32(m, "snr", tdmi->tdmi_snr);
+    htsmsg_add_u32(m, "ber", tdmi->tdmi_ber);
+    htsmsg_add_u32(m, "unc", tdmi->tdmi_unc);
+    htsmsg_add_u32(m, "uncavg", tdmi->tdmi_unc_avg);
+    notify_by_msg("tvAdapter", m);
   }
 
+  if(store)
+    dvb_mux_save(tdmi);
+
   /* Streaming message */
   sigstat.status_text = dvb_mux_status(tdmi);
   sigstat.snr         = tdmi->tdmi_snr;
   sigstat.signal      = tdmi->tdmi_signal;
   sigstat.ber         = tdmi->tdmi_ber;
-  sigstat.unc         = tdmi->tdmi_uncorrected_blocks;
+  sigstat.unc         = tdmi->tdmi_unc;
   sm.sm_type = SMT_SIGNAL_STATUS;
   sm.sm_data = &sigstat;
   LIST_FOREACH(t, &tda->tda_transports, s_active_link)

diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js
index dcda443a7baa7600b02ab09c1338278fae986d77..746ac7d6db0a8022a285e1e39c53f82bf01b72be 100644 (file)
--- a/src/webui/static/app/dvb.js
+++ b/src/webui/static/app/dvb.js
@@ -1237,7 +1237,11 @@ tvheadend.dvb_adapter_general = function(adapterData, satConfStore) {
                        + '<h2 style="font-size: 150%">Status</h2>'
                        + '<h3>Currently tuned to:</h3>{currentMux}&nbsp'
                        + '<h3>Services:</h3>{services}' + '<h3>Muxes:</h3>{muxes}'
-                       + '<h3>Muxes awaiting initial scan:</h3>{initialMuxes}');
+                       + '<h3>Muxes awaiting initial scan:</h3>{initialMuxes}'
+                       + '<h3>Signal Strength:</h3>{signal}%'
+                       + '<h3>Bit Error Rate:</h3>{ber}/s'
+                       + '<h3>Uncorrected Bit Errors:</h3>{uncavg}/s'
+        );
 
        var infoPanel = new Ext.Panel({
                title : 'Information and capabilities',

diff --git a/src/webui/static/app/status.js b/src/webui/static/app/status.js
index 44f999d274ce9f56e6aeae6f509186f601b4aeb0..bf3c2cbbbffdf5f32a9860337be4241810f8f781 100644 (file)
--- a/src/webui/static/app/status.js
+++ b/src/webui/static/app/status.js
@@ -1,7 +1,7 @@
 /**
  *
  */
-tvheadend.status = function() {
+tvheadend.status_subs = function() {
 
        tvheadend.subsStore = new Ext.data.JsonStore({
                root : 'entries',
@@ -117,7 +117,8 @@ tvheadend.status = function() {
                renderer: renderBw
        } ]);
 
-       var panel = new Ext.grid.GridPanel({
+       var subs = new Ext.grid.GridPanel({
+                border: false,
                loadMask : true,
                stripeRows : true,
                disableSelection : true,
@@ -125,10 +126,80 @@ tvheadend.status = function() {
                iconCls : 'eye',
                store : tvheadend.subsStore,
                cm : subsCm,
+                flex: 1,
                viewConfig : {
                        forceFit : true
                }
        });
+        return subs;
+}
+
+
+/**
+ *
+ */
+tvheadend.status_adapters = function() {
+
+       var signal = new Ext.ux.grid.ProgressColumn({
+               header : "Signal Strength",
+               dataIndex : 'signal',
+               width : 85,
+               textPst : '%',
+               colored : true
+       });
+
+       var cm = new Ext.grid.ColumnModel([{
+               width : 50,
+               header : "Name",
+               dataIndex : 'name'
+        },{
+               width : 50,
+               header : "Hardware device",
+               dataIndex : 'path'
+        },{
+               width : 100,
+               header : "Currently tuned to",
+               dataIndex : 'currentMux'
+        },{
+               width : 50,
+               header : "Bit error rate",
+               dataIndex : 'ber'
+        },{
+               width : 50,
+               header : "Uncorrected bit error rate",
+               dataIndex : 'uncavg'
+        }, signal]);
+
+       var panel = new Ext.grid.GridPanel({
+                border: false,
+               loadMask : true,
+               stripeRows : true,
+               disableSelection : true,
+               title : 'Adapters',
+               iconCls : 'hardware',
+               store : tvheadend.tvAdapterStore,
+               cm : cm,
+                flex: 1,
+               viewConfig : {
+                       forceFit : true
+               }
+       });
+        return panel;
+}
+
+
+
+
+tvheadend.status = function() {
+
+        var panel = new Ext.Panel({
+                border: false,
+               layout : 'vbox',
+               title : 'Status',
+               iconCls : 'eye',
+               items : [ new tvheadend.status_subs, new tvheadend.status_adapters ]
+        });
+
        return panel;
 }
 

diff --git a/src/webui/static/app/tvadapters.js b/src/webui/static/app/tvadapters.js
index 0d3fcc566574586e29d59138c5d83d5692e66a83..d6928ed867237f7b1cbcdec1ab3158af4fda6c50 100644 (file)
--- a/src/webui/static/app/tvadapters.js
+++ b/src/webui/static/app/tvadapters.js
@@ -5,9 +5,10 @@ tvheadend.tvAdapterStore = new Ext.data.JsonStore({
        root : 'entries',
        id : 'identifier',
        fields : [ 'identifier', 'type', 'name', 'path', 'devicename',
-               'hostconnection', 'currentMux', 'services', 'muxes', 'initialMuxes',
-               'satConf', 'deliverySystem', 'freqMin', 'freqMax', 'freqStep',
-               'symrateMin', 'symrateMax' ],
+                  'hostconnection', 'currentMux', 'services', 'muxes', 'initialMuxes',
+                  'satConf', 'deliverySystem', 'freqMin', 'freqMax', 'freqStep',
+                  'symrateMin', 'symrateMax',  'signal', 'snr', 'ber', 'unc', 'uncavg'],
+       autoLoad : true,
        url : 'tv/adapter'
 });