From 92f9e5ca60d601433e82ec4032c2e43dc2480f2b Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hummypkg.org.uk>
Date: Thu, 25 Apr 2019 14:38:49 +0100
Subject: [PATCH] Use eSystem for DVB-T/T2 detection. Transmission mode 1 has
 been seen in the wild.

---
 CONTROL/control         |  2 +-
 webif/html/diag/mux.jim | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index f274e33..600c56f 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.4-7
+Version: 1.4.4-8
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.12-1),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98),sqlite3(>=3.15.1),jim-xconv
diff --git a/webif/html/diag/mux.jim b/webif/html/diag/mux.jim
index 05ad46c..b4d6ea9 100755
--- a/webif/html/diag/mux.jim
+++ b/webif/html/diag/mux.jim
@@ -43,13 +43,13 @@ puts "
 "
 foreach tw [$db query {
 		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel,
-		ucQuality, eTransMode, eConstellation
+		ucQuality, eTransMode, eConstellation, eSystem
 		from TBL_TS join TBL_NET using (netIdx)
 		order by ulFrequency
 	}] {
 	lassign $tw \
 	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality \
-	    x eTransMode x eConstellation
+	    x eTransMode x eConstellation x eSystem
 
 	puts "
 		<tr class=odd>
@@ -82,10 +82,10 @@ foreach tw [$db query {
 		}
 	}
 	puts "<td>$mux</td>"
-	if {$eTransMode == 2} {
-		puts "<td>DVB-T (SD)</td>"
+	if {$eSystem == 0} {
+		puts "<td>DVB-T (SD;$eTransMode)</td>"
 	} else {
-		puts "<td class=blood>DVB-T2 (HD)</td>"
+		puts "<td class=blood>DVB-T2 (HD;$eTransMode)</td>"
 	}
 
 	puts "<td>[llength $channels]