fix wlan, acpi and host for TC

diff --git a/telecaster/templates/telecaster/base.html b/telecaster/templates/telecaster/base.html
index b38c599505232c4f93f0da2a3a84200e6761e5c4..5d767ae85c5bb389a681c905e16270989c3eac72 100644 (file)
--- a/telecaster/templates/telecaster/base.html
+++ b/telecaster/templates/telecaster/base.html
@@ -37,7 +37,7 @@ server_status_callback();
 {% block video %}
 <div class="video">
 <video id="my_video_1" class="video-js vjs-default-skin" controls preload="auto" width="360" height="240" data-setup="{}">
-<source src="http://192.168.0.15:8080/consume/safe" type="video/webm"></video>
+<source src="{{ host }}:8080/consume/safe" type="video/webm"></video>
 </div>
 {% endblock video %}
 

diff --git a/telecaster/tools/acpi.py b/telecaster/tools/acpi.py
index 8d2fb06432b30753dd9c4398f458de2cd82c16a7..a4835d52619ce5961d5b7fa303e50a97bca2989f 100644 (file)
--- a/telecaster/tools/acpi.py
+++ b/telecaster/tools/acpi.py
@@ -173,7 +173,7 @@ class AcpiLinux:
         """init ACPI class and check for any ACPI features in /proc/acpi/"""
 
         #we read all acpi stuff from here
-        dirs = ['/proc/acpi/ibm']
+        dirs = ['/proc/acpi/ibm', '/proc/acpi']
         for dir in dirs:
             if os.path.exists(dir):
                 self.proc_acpi_dir = dir

diff --git a/telecaster/tools/tools.py b/telecaster/tools/tools.py
index ee2d83142c6dcc9c9020ba29958f7bbe3a255965..f3fabe7a01d234c1976ef7b98b872dbfe38f75d1 100644 (file)
--- a/telecaster/tools/tools.py
+++ b/telecaster/tools/tools.py
@@ -167,7 +167,7 @@ def norm_string(string):
 
 class Status(object):
 
-    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2','eth3']
+    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2', 'eth3', 'wlan0', 'wlan1']
     acpi_states = {0: 'battery', 1: 'battery', 2: 'AC'}
 
     def __init__(self):