diff --git a/src/mediactl/main.py b/src/mediactl/main.py
index 02def1cd9abd3b31440071d745f33ad30e6762bf..b09b7980c704cc411bbdf402fe520d1b0d342825 100644
--- a/src/mediactl/main.py
+++ b/src/mediactl/main.py
@@ -21,8 +21,8 @@ logger.setLevel(logging.INFO)
# Connect to projctl and ahm via network, other connections are GPIO, see README
system = mediactl.System(
- projector_address="http://172.20.2.60", # "http://projctl.mediahell.hfbk.net",
- ahm_address="172.20.2.61", # "ahm16-m.mediahell.hfbk.net",
+ projector_address="http://172.20.2.60", # "http://projctl.mediahell.hfbk.net",
+ ahm_address="172.20.2.61", # "ahm16-m.mediahell.hfbk.net",
logger=logger,
)
@@ -88,7 +88,7 @@ manager2 = ConnectionManager()
async def index(request: Request):
return templates.TemplateResponse(
request=request,
- name="power.html",
+ name="index.html",
context={"status": await system.get_status()},
mimetypes=custom_mimetype,
)
diff --git a/templates/index.html b/templates/index.html
index d5725371e23fc7a00c71d0e64e17b932e7e5d81d..458c527aed03ae84103d892b54aaca217c5ed015 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,52 +2,43 @@
<head>
<title>Ext Lib</title>
<link href="{{ url_for('static', path='/style.css') }}" rel="stylesheet">
+ <link href="{{ url_for('static', path='/fonts.css') }}" rel="stylesheet">
+ <script type="text/javascript" crossorigin src="{{ url_for('static', path='/reconnecting-websocket.min.js') }}"></script>
+ <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/projector.js') }}"></script>
+ <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/ahm.js') }}"></script>
+ <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/kramer.js') }}"></script>
+ <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/system.js') }}"></script>
+ <script type="text/javascript" crossorigin src="{{ url_for('static', path='/helpers.js') }}"></script>
</head>
-<body>
+<body id="page-power" class="{{ status['system']['power']|replace(' ', '_') }}">
<header>
- <div id="connection-status-websocket" class="led-wrapper state-unknown">
- <div class="led">
- </div>
- <p>Websocket</p>
- <p class="state">unknown</p>
+ <div class="status {{ status['system']['power'] }}" id="status-system">
+ <p class="status_title">System</p>
+ <div class="led"></div>
+ <p class="status_text">{{ status['system']['power'] }}</p>
</div>
- <div id="connection-status-serial" class="led-wrapper state-unknown">
- <div class="led">
- </div>
- <p>RS-232</p>
- <p class="state">unknown</p>
+ <div class="status {{ status['projector']['power'] }}" id="status-projector">
+ <p class="status_title">Projector</p>
+ <div class="led"></div>
+ <p class="status_text">{{ status['projector']['power'] }}</p>
</div>
- <div id="connection-status-power" class="led-wrapper state-unknown">
- <div class="led">
- </div>
- <p>Power</p>
- <p class="state">unknown</p>
+ <div class="status {{ status['ahm']['power'] }}" id="status-ahm">
+ <p class="status_title">DSP</p>
+ <div class="led"></div>
+ <p class="status_text">{{ status['ahm']['power'] }}</p>
</div>
- <div id="connection-status-shutter" class="led-wrapper state-unknown">
- <div class="led">
- </div>
- <p>Shutter</p>
- <p class="state">unknown</p>
+
+ <div class="title">
+ <h1>Extended Library</h1>
+ <p class="time-display"></p>
</div>
- <button id="power-button" disabled class="toggle-button" data-active-command="power-off" data-inactive-command="power-on" data-active-label="Power<br>ON" data-inactive-label="Power<br>OFF">Power</button>
- <button id="shutter-button" disabled class="toggle-button" data-inactive-command="shutter-close" data-active-command="shutter-open" data-inactive-label="OPEN<br>Shutter" data-active-label="CLOSE<br>Shutter">Shutter</button>
- <button id="testpattern-button" disabled class="toggle-button" data-active-command="testpattern-off" data-inactive-command="testpattern-green-grid" data-active-label="Activate<br>Test Pattern" data-inactive-label="Deactivate<br>Test Pattern">Test Pattern</button>
- <h3 id="temperature"></h3>
- <h3 id="hours"></h3>
+
+ <button id="power-off-button" class="rectangle-button danger">POWER OFF</button>
</header>
- <h2>Projector Log</h2>
- <div id="log-wrapper">
- <table id="log">
- <thead>
- <th>Time</th>
- <th>Message</th>
- <th>Type</th>
- </thead>
- <tbody id="log-body">
- </tbody>
- </table>
- </div>
+ <main>
+ {# filled by JS #}
+ </main>
<script src="{{ url_for('static', path='/ws.js') }}"></script>
</body>
diff --git a/templates/power.html b/templates/power.html
deleted file mode 100644
index 458c527aed03ae84103d892b54aaca217c5ed015..0000000000000000000000000000000000000000
--- a/templates/power.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<head>
- <title>Ext Lib</title>
- <link href="{{ url_for('static', path='/style.css') }}" rel="stylesheet">
- <link href="{{ url_for('static', path='/fonts.css') }}" rel="stylesheet">
- <script type="text/javascript" crossorigin src="{{ url_for('static', path='/reconnecting-websocket.min.js') }}"></script>
- <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/projector.js') }}"></script>
- <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/ahm.js') }}"></script>
- <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/kramer.js') }}"></script>
- <script type="text/javascript" crossorigin src="{{ url_for('static', path='/modules/system.js') }}"></script>
- <script type="text/javascript" crossorigin src="{{ url_for('static', path='/helpers.js') }}"></script>
-</head>
-<body id="page-power" class="{{ status['system']['power']|replace(' ', '_') }}">
- <header>
- <div class="status {{ status['system']['power'] }}" id="status-system">
- <p class="status_title">System</p>
- <div class="led"></div>
- <p class="status_text">{{ status['system']['power'] }}</p>
- </div>
- <div class="status {{ status['projector']['power'] }}" id="status-projector">
- <p class="status_title">Projector</p>
- <div class="led"></div>
- <p class="status_text">{{ status['projector']['power'] }}</p>
- </div>
- <div class="status {{ status['ahm']['power'] }}" id="status-ahm">
- <p class="status_title">DSP</p>
- <div class="led"></div>
- <p class="status_text">{{ status['ahm']['power'] }}</p>
- </div>
-
- <div class="title">
- <h1>Extended Library</h1>
- <p class="time-display"></p>
- </div>
-
- <button id="power-off-button" class="rectangle-button danger">POWER OFF</button>
- </header>
-
- <main>
- {# filled by JS #}
- </main>
-
- <script src="{{ url_for('static', path='/ws.js') }}"></script>
-</body>
-</html>
\ No newline at end of file