FEAT-DEEPSLEEP: Display-Refresh-Timer + CPU-Throttle + Admin Power-Tab
DeepSleep-Modus fuer das ePaper-Display:
- dashboard.py: _is_deepsleep(), _next_wake(), _seconds_until_wake(),
_apply_cpu_throttle() (Pi auf 600MHz im Sleep)
- 60s sleep-chunks in main loop statt festes Intervall
- render_full() mit deepsleep_active + next_wake params
- ZZZ-Indikator + CPU-Throttle-Badge wenn schlafend
- load_config() auto-filled 'power' defaults aus POWER_DEFAULTS
Admin UI (templates/power.html + admin.py):
- /power (GET+POST): DeepSleep-Toggle, Wake-Times, CPU-Throttle-Settings
- /api/power (JSON): live status polling fuer Sidebar-Badge
- /api/wake (POST): manuelles Display-Aufwecken aus dem Admin
- templates/index.html: Energie-Sidebar-Link + Live-Status-Badge
(Zz / wach / an / aus) via refreshPowerStatus()
This commit is contained in:
Patrik
@@ -690,6 +690,124 @@ def api_net_forget():
|
||||
return jsonify({"ok": rc == 0, "message": out or err})
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Power / DeepSleep — Energie-Tab
|
||||
# ============================================================================
|
||||
@app.route("/power", methods=["GET", "POST"])
|
||||
def power_settings():
|
||||
"""Energie-Tab: DeepSleep-Konfiguration + manuelle Wake-Aktion."""
|
||||
a = require_auth()
|
||||
if a: return a
|
||||
cfg = dashboard_mod.load_config()
|
||||
power = cfg.get("power", {})
|
||||
|
||||
if request.method == "POST":
|
||||
# Form: deepsleep_enabled, deepsleep_start, deepsleep_end, cpu_throttle
|
||||
power["deepsleep_enabled"] = (request.form.get("deepsleep_enabled") == "on")
|
||||
start = request.form.get("deepsleep_start", "23:30").strip()
|
||||
end = request.form.get("deepsleep_end", "06:30").strip()
|
||||
# Validierung HH:MM
|
||||
import re
|
||||
if re.match(r"^\d{1,2}:\d{2}$", start):
|
||||
power["deepsleep_start"] = start
|
||||
if re.match(r"^\d{1,2}:\d{2}$", end):
|
||||
power["deepsleep_end"] = end
|
||||
power["cpu_throttle"] = (request.form.get("cpu_throttle") == "on")
|
||||
power["wifi_off"] = (request.form.get("wifi_off") == "on")
|
||||
cfg["power"] = power
|
||||
dashboard_mod.save_config(cfg)
|
||||
return redirect(url_for("power_settings"))
|
||||
|
||||
# Status: gerade im DeepSleep?
|
||||
from datetime import datetime
|
||||
now = datetime.now()
|
||||
is_sleep = False
|
||||
next_wake = None
|
||||
if power.get("deepsleep_enabled", False):
|
||||
try:
|
||||
def _to_min(s):
|
||||
h, m = s.split(":")
|
||||
return int(h) * 60 + int(m)
|
||||
now_min = now.hour * 60 + now.minute
|
||||
s = _to_min(power.get("deepsleep_start", "23:00"))
|
||||
e = _to_min(power.get("deepsleep_end", "06:00"))
|
||||
if s < e:
|
||||
is_sleep = s <= now_min < e
|
||||
else:
|
||||
is_sleep = now_min >= s or now_min < e
|
||||
if is_sleep:
|
||||
from datetime import timedelta
|
||||
end_dt = now.replace(hour=e // 60, minute=e % 60, second=0, microsecond=0)
|
||||
if end_dt <= now:
|
||||
end_dt += timedelta(days=1)
|
||||
next_wake = end_dt
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return render_template("power.html",
|
||||
power=power,
|
||||
is_deepsleep=is_sleep,
|
||||
next_wake=next_wake.strftime("%H:%M") if next_wake else None,
|
||||
now=now.strftime("%H:%M"))
|
||||
|
||||
|
||||
@app.route("/api/power", methods=["GET"])
|
||||
def api_power():
|
||||
"""JSON-Status fuer Live-Anzeige in der UI."""
|
||||
a = require_auth()
|
||||
if a: return a
|
||||
cfg = dashboard_mod.load_config()
|
||||
power = cfg.get("power", {})
|
||||
from datetime import datetime, timedelta
|
||||
now = datetime.now()
|
||||
is_sleep = False
|
||||
next_wake = None
|
||||
if power.get("deepsleep_enabled", False):
|
||||
try:
|
||||
def _to_min(s):
|
||||
h, m = s.split(":")
|
||||
return int(h) * 60 + int(m)
|
||||
now_min = now.hour * 60 + now.minute
|
||||
s = _to_min(power.get("deepsleep_start", "23:00"))
|
||||
e = _to_min(power.get("deepsleep_end", "06:00"))
|
||||
if s < e:
|
||||
is_sleep = s <= now_min < e
|
||||
else:
|
||||
is_sleep = now_min >= s or now_min < e
|
||||
if is_sleep:
|
||||
end_dt = now.replace(hour=e // 60, minute=e % 60, second=0, microsecond=0)
|
||||
if end_dt <= now:
|
||||
end_dt += timedelta(days=1)
|
||||
next_wake = end_dt.strftime("%H:%M")
|
||||
secs_left = int((end_dt - now).total_seconds())
|
||||
else:
|
||||
secs_left = 0
|
||||
except Exception:
|
||||
secs_left = 0
|
||||
else:
|
||||
secs_left = 0
|
||||
return jsonify({
|
||||
"deepsleep_enabled": power.get("deepsleep_enabled", False),
|
||||
"deepsleep_start": power.get("deepsleep_start", "23:30"),
|
||||
"deepsleep_end": power.get("deepsleep_end", "06:30"),
|
||||
"cpu_throttle": power.get("cpu_throttle", True),
|
||||
"is_deepsleep": is_sleep,
|
||||
"next_wake": next_wake,
|
||||
"seconds_until_wake": secs_left,
|
||||
"now": now.strftime("%H:%M"),
|
||||
})
|
||||
|
||||
|
||||
@app.route("/api/wake", methods=["POST"])
|
||||
def api_wake():
|
||||
"""Forciert Aufwachen aus dem DeepSleep (einmaliger Refresh-Trigger)."""
|
||||
a = require_auth()
|
||||
if a: return a
|
||||
# IPC 'refresh' ans Dashboard schicken — der Trigger weckt aus DeepSleep
|
||||
rc = dashboard_mod.send_ipc("refresh")
|
||||
return jsonify({"ok": True, "message": "wake trigger sent", "ipc_result": rc})
|
||||
|
||||
|
||||
def main():
|
||||
# Wenn direkt ausgeführt: eigenen Renderer starten ist Sache des Run-Skripts.
|
||||
# Wir nehmen einfach Port 8080.
|
||||
|
||||
+130
-9
@@ -1,19 +1,23 @@
|
||||
"""Layout, Slot-Geometrie, Refresh-Loop.
|
||||
"""Layout, Slot-Geometrie, Refresh-Loop mit DeepSleep-Support.
|
||||
|
||||
Lädt config.json, instanziiert Plugins, läuft Refresh-Loop mit ≥refresh_interval_s
|
||||
zwischen Full-Refreshes. Reagiert auf Live-Trigger via Unix-Socket.
|
||||
|
||||
DeepSleep: konfigurierbares Zeitfenster in dem KEIN Display-Refresh passiert.
|
||||
Der Pi bleibt an (Admin-UI erreichbar), der Fetch-Loop laeuft weiter, aber
|
||||
dashboard.display() wird uebersprungen. ePaper haelt das letzte Bild ohne Strom.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
import os, sys, time, json, math, threading, signal, socket, logging
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timedelta
|
||||
from pathlib import Path
|
||||
|
||||
HERE = Path(__file__).resolve().parent
|
||||
sys.path.insert(0, str(HERE))
|
||||
|
||||
from PIL import Image, ImageDraw, ImageFont
|
||||
from palette import BG, FG, OK
|
||||
from plugins.base import all_widget_classes, Widget
|
||||
from palette import BG, FG, OK, POWER_DEFAULTS
|
||||
from plugins.base import all_widget_classes, Widget, draw_deepsleep_indicator
|
||||
from layout import Item, GRID_COLS, GRID_ROWS, CELL_W, CELL_H, DISPLAY_W as LAYOUT_DISPLAY_W, pack, find_overlaps, find_out_of_bounds
|
||||
|
||||
import importlib, pkgutil
|
||||
@@ -103,6 +107,12 @@ def load_config() -> dict:
|
||||
cfg["plugin_configs"] = {}
|
||||
if "refresh_interval_s" not in cfg:
|
||||
cfg["refresh_interval_s"] = 180
|
||||
# Power-Defaults (DeepSleep) sicherstellen
|
||||
if "power" not in cfg or not isinstance(cfg["power"], dict):
|
||||
cfg["power"] = dict(POWER_DEFAULTS)
|
||||
else:
|
||||
for k, v in POWER_DEFAULTS.items():
|
||||
cfg["power"].setdefault(k, v)
|
||||
return cfg
|
||||
|
||||
|
||||
@@ -119,6 +129,7 @@ def _empty_v2_config() -> dict:
|
||||
"items": [],
|
||||
},
|
||||
"plugin_configs": {},
|
||||
"power": dict(POWER_DEFAULTS),
|
||||
}
|
||||
|
||||
|
||||
@@ -198,7 +209,8 @@ def slot_box(idx: int) -> tuple[int, int, int, int]:
|
||||
# ============================================================================
|
||||
# Render
|
||||
# ============================================================================
|
||||
def render_full(items: list, widgets: list, fonts: dict) -> Image.Image:
|
||||
def render_full(items: list, widgets: list, fonts: dict,
|
||||
deepsleep_active: bool = False, next_wake: str = "") -> Image.Image:
|
||||
"""Render alle Items aufs Display.
|
||||
|
||||
items: list[Item] (Layout-Items mit x,y,w,h)
|
||||
@@ -241,6 +253,9 @@ def render_full(items: list, widgets: list, fonts: dict) -> Image.Image:
|
||||
draw.text((px + 8, py + 8), f"{widget.label} (overflow)",
|
||||
font=fonts.get("16", fonts.get("default")), fill=FG)
|
||||
continue
|
||||
# Fonts an Widget durchreichen VOR render()
|
||||
if hasattr(widget, "set_fonts"):
|
||||
widget.set_fonts(fonts)
|
||||
try:
|
||||
widget.render(draw, fonts, px, py, pw, ph)
|
||||
except Exception as e:
|
||||
@@ -249,6 +264,11 @@ def render_full(items: list, widgets: list, fonts: dict) -> Image.Image:
|
||||
f"{widget.label}: render error",
|
||||
font=fonts.get("16", fonts.get("default")), fill=FG)
|
||||
|
||||
# DeepSleep-Indikator im oberen rechten Bereich
|
||||
if deepsleep_active:
|
||||
ind_w = min(280, DISPLAY_W // 3)
|
||||
draw_deepsleep_indicator(draw, DISPLAY_W - ind_w - 6, 4, ind_w, 18, next_wake)
|
||||
|
||||
return img
|
||||
|
||||
|
||||
@@ -300,8 +320,69 @@ class Dashboard:
|
||||
def trigger_refresh(self):
|
||||
self._trigger.set()
|
||||
|
||||
def render_once(self) -> Image.Image:
|
||||
# fetch all widgets
|
||||
# ------------------------------------------------------------------
|
||||
# DeepSleep: Zeitschaltung fuer Display-Refresh
|
||||
# ------------------------------------------------------------------
|
||||
def _parse_hhmm(self, s: str) -> int:
|
||||
"""'HH:MM' → Minuten seit Mitternacht. Fallback: 0."""
|
||||
try:
|
||||
parts = s.split(":")
|
||||
return int(parts[0]) * 60 + int(parts[1])
|
||||
except Exception:
|
||||
return 0
|
||||
|
||||
def _is_deepsleep(self) -> bool:
|
||||
"""True wenn jetzt in der DeepSleep-Zeit liegt."""
|
||||
cfg = self.config.get("power", {})
|
||||
if not cfg.get("deepsleep_enabled", False):
|
||||
return False
|
||||
now = datetime.now()
|
||||
now_min = now.hour * 60 + now.minute
|
||||
start = self._parse_hhmm(cfg.get("deepsleep_start", "23:00"))
|
||||
end = self._parse_hhmm(cfg.get("deepsleep_end", "06:00"))
|
||||
if start == end:
|
||||
return False # kein Fenster
|
||||
if start < end:
|
||||
return start <= now_min < end
|
||||
# Mitternacht-ueberschreitend (z.B. 23:30 → 06:30)
|
||||
return now_min >= start or now_min < end
|
||||
|
||||
def _next_wake(self) -> datetime | None:
|
||||
"""Naechster Zeitpunkt an dem DeepSleep endet, oder None wenn aus."""
|
||||
if not self._is_deepsleep():
|
||||
return None
|
||||
cfg = self.config.get("power", {})
|
||||
end = self._parse_hhmm(cfg.get("deepsleep_end", "06:00"))
|
||||
now = datetime.now()
|
||||
end_dt = now.replace(hour=end // 60, minute=end % 60, second=0, microsecond=0)
|
||||
if end_dt <= now:
|
||||
end_dt += timedelta(days=1)
|
||||
return end_dt
|
||||
|
||||
def _seconds_until_wake(self) -> int:
|
||||
nw = self._next_wake()
|
||||
if nw is None:
|
||||
return 0
|
||||
return max(5, int((nw - datetime.now()).total_seconds()))
|
||||
|
||||
def _apply_cpu_throttle(self, throttle_on: bool):
|
||||
"""CPU-Taktung setzen. Nur auf Linux/Pi wirksam; sonst noop."""
|
||||
try:
|
||||
if throttle_on:
|
||||
# 600 MHz
|
||||
for gov in ("conservative", "ondemand", "powersave"):
|
||||
os.system(f"echo {gov} > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null")
|
||||
os.system("echo 600000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq 2>/dev/null")
|
||||
else:
|
||||
# Default: ondemand, max 1.5 GHz
|
||||
for gov in ("ondemand", "performance"):
|
||||
os.system(f"echo {gov} > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null")
|
||||
os.system("echo 1500000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq 2>/dev/null")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def render_once(self, with_deepsleep: bool = True) -> Image.Image:
|
||||
# fetch all widgets (auch im DeepSleep — damit Daten frisch sind wenn wir aufwachen)
|
||||
for w in self.widgets:
|
||||
if w is None: continue
|
||||
try:
|
||||
@@ -311,7 +392,15 @@ class Dashboard:
|
||||
with self._lock:
|
||||
items = list(self.items)
|
||||
widgets = list(self.widgets)
|
||||
img = render_full(items, widgets, self.fonts)
|
||||
# DeepSleep-Status + Indikator
|
||||
sleep_active = with_deepsleep and self._is_deepsleep()
|
||||
next_wake = ""
|
||||
if sleep_active:
|
||||
nw = self._next_wake()
|
||||
if nw:
|
||||
next_wake = nw.strftime("%H:%M")
|
||||
img = render_full(items, widgets, self.fonts,
|
||||
deepsleep_active=sleep_active, next_wake=next_wake)
|
||||
return img
|
||||
|
||||
def display(self, img: Image.Image):
|
||||
@@ -341,11 +430,43 @@ class Dashboard:
|
||||
# start IPC socket listener
|
||||
threading.Thread(target=self._socket_loop, daemon=True).start()
|
||||
|
||||
_throttle_applied = False
|
||||
|
||||
while True:
|
||||
try:
|
||||
self.maybe_reload_config()
|
||||
interval = int(self.config.get("refresh_interval_s", 180))
|
||||
# sleep until interval elapsed OR trigger set
|
||||
# ----- DeepSleep Check -----
|
||||
if self._is_deepsleep():
|
||||
secs = self._seconds_until_wake()
|
||||
nw = self._next_wake()
|
||||
nw_str = nw.strftime("%H:%M") if nw else "?"
|
||||
logging.info(f"DeepSleep aktiv — wache um {nw_str} auf ({secs}s)")
|
||||
# CPU-Throttle einmalig anwenden
|
||||
if not _throttle_applied and self.config.get("power", {}).get("cpu_throttle", True):
|
||||
self._apply_cpu_throttle(True)
|
||||
_throttle_applied = True
|
||||
# Warten bis Trigger (Admin-Override) ODER bis zum Aufwach-Zeitpunkt
|
||||
# Wir pollen in kürzeren Intervallen damit CPU-Throttle sinnvoll ist
|
||||
sleep_chunk = min(60, secs)
|
||||
triggered = self._trigger.wait(timeout=sleep_chunk)
|
||||
if triggered:
|
||||
# Admin hat manuell "Refresh Now" gesendet → aufwachen
|
||||
self._trigger.clear()
|
||||
logging.info("DeepSleep durch Admin-Trigger beendet")
|
||||
if _throttle_applied:
|
||||
self._apply_cpu_throttle(False)
|
||||
_throttle_applied = False
|
||||
# weiter zum normalen Refresh unten
|
||||
else:
|
||||
# chunk ausgeschlafen, noch im DeepSleep → weiter warten
|
||||
continue
|
||||
else:
|
||||
# Wach: Throttle zurücksetzen falls aktiv
|
||||
if _throttle_applied:
|
||||
self._apply_cpu_throttle(False)
|
||||
_throttle_applied = False
|
||||
# normaler Refresh
|
||||
wait = max(5, interval)
|
||||
logging.info(f"waiting up to {wait}s (manual trigger interrupts)")
|
||||
if self._trigger.wait(timeout=wait):
|
||||
|
||||
@@ -939,6 +939,11 @@
|
||||
<span class="icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 1 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 1 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 1 1-2.83-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 1 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 1 1 2.83-2.83l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 1 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 1 1 2.83 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 1 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg></span>
|
||||
Settings
|
||||
</button>
|
||||
<a class="sidebar-item" href="/power" style="text-decoration:none">
|
||||
<span class="icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18.36 6.64a9 9 0 1 1-12.73 0"/><line x1="12" y1="2" x2="12" y2="12"/></svg></span>
|
||||
Energie
|
||||
<span class="badge" id="sbPower">—</span>
|
||||
</a>
|
||||
<button class="sidebar-item" data-tab="network" onclick="switchTab('network')">
|
||||
<span class="icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 12.55a11 11 0 0 1 14.08 0"/><path d="M1.42 9a16 16 0 0 1 21.16 0"/><path d="M8.53 16.11a6 6 0 0 1 6.95 0"/><line x1="12" y1="20" x2="12.01" y2="20"/></svg></span>
|
||||
Network
|
||||
@@ -2042,6 +2047,32 @@
|
||||
};
|
||||
document.getElementById('netHint').textContent = hints[s.mode] || '';
|
||||
}
|
||||
|
||||
// ---- Power-Status (DeepSleep) ----
|
||||
async function refreshPowerStatus() {
|
||||
try {
|
||||
const r = await fetch('/api/power');
|
||||
const d = await r.json();
|
||||
const sb = document.getElementById('sbPower');
|
||||
if (sb) {
|
||||
if (d.deepsleep_enabled && d.is_deepsleep) {
|
||||
sb.textContent = 'Zz';
|
||||
sb.style.background = '#fef3c7';
|
||||
sb.style.color = '#92400e';
|
||||
} else if (d.deepsleep_enabled) {
|
||||
sb.textContent = 'an';
|
||||
sb.style.background = '';
|
||||
sb.style.color = '';
|
||||
} else {
|
||||
sb.textContent = 'aus';
|
||||
sb.style.background = '';
|
||||
sb.style.color = '';
|
||||
}
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
refreshPowerStatus();
|
||||
setInterval(refreshPowerStatus, 30000);
|
||||
async function refreshScan() {
|
||||
const r = await netFetch('/api/network/scan'); if (!r) return;
|
||||
const sel = document.getElementById('ssidSelect');
|
||||
|
||||
@@ -0,0 +1,187 @@
|
||||
<!doctype html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Energie — ePaper Dashboard</title>
|
||||
<style>
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
||||
background: #f4f5f7; color: #1a1a1a; margin: 0; padding: 24px; }
|
||||
h1 { font-size: 22px; margin: 0 0 4px; }
|
||||
h2 { font-size: 15px; font-weight: 600; color: #555; margin: 24px 0 8px;
|
||||
text-transform: uppercase; letter-spacing: 0.5px; }
|
||||
.back { float: right; font-size: 13px; color: #2563eb; text-decoration: none; }
|
||||
.card { background: #fff; border: 1px solid #e1e3e8; border-radius: 8px;
|
||||
padding: 20px 24px; max-width: 720px; }
|
||||
.row { display: flex; align-items: center; gap: 12px; padding: 12px 0;
|
||||
border-bottom: 1px solid #f0f1f3; }
|
||||
.row:last-child { border-bottom: none; }
|
||||
.row label { flex: 1; font-size: 14px; }
|
||||
.row .hint { font-size: 12px; color: #888; display: block; margin-top: 2px; }
|
||||
.toggle { position: relative; width: 44px; height: 24px; }
|
||||
.toggle input { opacity: 0; width: 0; height: 0; }
|
||||
.slider { position: absolute; cursor: pointer; top: 0; left: 0; right: 0; bottom: 0;
|
||||
background: #d1d5db; border-radius: 12px; transition: 0.2s; }
|
||||
.slider::before { content: ""; position: absolute; height: 18px; width: 18px;
|
||||
left: 3px; bottom: 3px; background: white; border-radius: 50%;
|
||||
transition: 0.2s; }
|
||||
.toggle input:checked + .slider { background: #10b981; }
|
||||
.toggle input:checked + .slider::before { transform: translateX(20px); }
|
||||
input[type="time"] { padding: 6px 10px; border: 1px solid #d1d5db;
|
||||
border-radius: 6px; font-size: 14px; }
|
||||
button { background: #2563eb; color: white; border: none; padding: 10px 20px;
|
||||
border-radius: 6px; font-size: 14px; font-weight: 500; cursor: pointer; }
|
||||
button:hover { background: #1d4ed8; }
|
||||
button.secondary { background: #6b7280; }
|
||||
button.secondary:hover { background: #4b5563; }
|
||||
.status { display: inline-block; padding: 4px 10px; border-radius: 4px;
|
||||
font-size: 12px; font-weight: 600; }
|
||||
.status.wach { background: #d1fae5; color: #065f46; }
|
||||
.status.schlaft { background: #fef3c7; color: #92400e; }
|
||||
.pill { display: inline-block; background: #e0e7ff; color: #3730a3;
|
||||
padding: 2px 8px; border-radius: 10px; font-size: 12px;
|
||||
margin-left: 8px; }
|
||||
.footer { margin-top: 16px; font-size: 12px; color: #6b7280; }
|
||||
.pulse { animation: pulse 2s ease-in-out infinite; }
|
||||
@keyframes pulse { 0%, 100% { opacity: 1; } 50% { opacity: 0.4; } }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<a class="back" href="/">← zurück zum Dashboard</a>
|
||||
<h1>Energie</h1>
|
||||
<p style="color:#6b7280; font-size:13px; margin:4px 0 0">
|
||||
DeepSleep spart Strom, weil das ePaper das letzte Bild ohne Strom haelt.
|
||||
WiFi bleibt an, damit du das Display jederzeit wecken kannst.
|
||||
</p>
|
||||
|
||||
<div class="card" style="margin-top:20px">
|
||||
<h2>Status <span id="status-pill" class="pill">…</span></h2>
|
||||
<div id="status-text" style="font-size:14px; padding:8px 0">lade…</div>
|
||||
<button class="secondary" id="wake-btn" type="button">Display jetzt wecken</button>
|
||||
</div>
|
||||
|
||||
<div class="card" style="margin-top:20px">
|
||||
<h2>DeepSleep</h2>
|
||||
<form method="post" action="/power">
|
||||
<div class="row">
|
||||
<label>
|
||||
DeepSleep aktivieren
|
||||
<span class="hint">Display bleibt zwischen den Zeiten eingefroren, kein Refresh.</span>
|
||||
</label>
|
||||
<span class="toggle">
|
||||
<input type="checkbox" name="deepsleep_enabled"
|
||||
{% if power.deepsleep_enabled %}checked{% endif %}>
|
||||
<span class="slider"></span>
|
||||
</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label>
|
||||
Schlafenszeit
|
||||
<span class="hint">Start und Ende im 24h-Format. Mitternacht-Überschreitung
|
||||
(z.B. 23:30 → 06:30) wird automatisch erkannt.</span>
|
||||
</label>
|
||||
<span>
|
||||
<input type="time" name="deepsleep_start"
|
||||
value="{{ power.deepsleep_start }}">
|
||||
bis
|
||||
<input type="time" name="deepsleep_end"
|
||||
value="{{ power.deepsleep_end }}">
|
||||
</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label>
|
||||
CPU-Taktung drosseln (Pi)
|
||||
<span class="hint">Während DeepSleep auf 600 MHz takten. Spart ~0.5W.
|
||||
Beim Aufwachen wird automatisch auf Normal-Takt zurückgeschaltet.</span>
|
||||
</label>
|
||||
<span class="toggle">
|
||||
<input type="checkbox" name="cpu_throttle"
|
||||
{% if power.cpu_throttle %}checked{% endif %}>
|
||||
<span class="slider"></span>
|
||||
</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label>
|
||||
WiFi im DeepSleep aus
|
||||
<span class="hint"><strong>Nicht empfohlen.</strong> Solange WiFi aus ist, ist
|
||||
das Admin-UI nicht erreichbar — du kannst das Display dann nicht wecken
|
||||
ausser durch physischen Neustart. Nur aktivieren wenn du weisst was du tust.</span>
|
||||
</label>
|
||||
<span class="toggle">
|
||||
<input type="checkbox" name="wifi_off"
|
||||
{% if power.wifi_off %}checked{% endif %}>
|
||||
<span class="slider"></span>
|
||||
</span>
|
||||
</div>
|
||||
<div style="padding-top:16px">
|
||||
<button type="submit">Speichern</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="card" style="margin-top:20px">
|
||||
<h2>Wie es funktioniert</h2>
|
||||
<ul style="font-size:13px; line-height:1.6; color:#374151">
|
||||
<li><strong>Wann:</strong> DeepSleep gilt zwischen den eingestellten Zeiten, jeden Tag.</li>
|
||||
<li><strong>Display:</strong> ePaper hält das letzte Bild ohne Strom — Refresh kostet nur
|
||||
die ~30 Sekunden alle 3 Minuten (~0.5 Wh pro Refresh).</li>
|
||||
<li><strong>Daten:</strong> Plugin-Fetch läuft weiter, damit beim Aufwachen frische Daten da sind.</li>
|
||||
<li><strong>WiFi:</strong> Bleibt an (default), Admin-UI ist erreichbar.</li>
|
||||
<li><strong>Aufwachen:</strong> "Display jetzt wecken" Button, oder warten bis Ende der Schlafenszeit.</li>
|
||||
<li><strong>Z-Indikator:</strong> Auf dem Display erscheint oben rechts ein "Zz" + Aufwach-Zeit.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<p class="footer">
|
||||
Geschätzte Ersparnis: bei 7h DeepSleep/Tag + 3min Refresh-Intervall ca. 30% weniger
|
||||
Display-Refresh-Strom. Plus Pi-CPU-Throttle ~0.5-1W Dauerersparnis.
|
||||
</p>
|
||||
|
||||
<script>
|
||||
async function refreshStatus() {
|
||||
try {
|
||||
const r = await fetch('/api/power');
|
||||
const d = await r.json();
|
||||
const pill = document.getElementById('status-pill');
|
||||
const text = document.getElementById('status-text');
|
||||
if (d.is_deepsleep) {
|
||||
pill.className = 'pill';
|
||||
pill.style.background = '#fef3c7';
|
||||
pill.style.color = '#92400e';
|
||||
pill.textContent = 'schläft';
|
||||
pill.classList.add('pulse');
|
||||
text.innerHTML = `Display schläft bis <strong>${d.next_wake}</strong> `
|
||||
+ `(${formatDuration(d.seconds_until_wake)} verbleibend)`;
|
||||
} else {
|
||||
pill.className = 'pill';
|
||||
pill.style.background = '#d1fae5';
|
||||
pill.style.color = '#065f46';
|
||||
pill.textContent = 'wach';
|
||||
pill.classList.remove('pulse');
|
||||
text.innerHTML = `Display ist wach. Normaler Refresh-Modus aktiv.`
|
||||
+ (d.deepsleep_enabled ? ` Nächster DeepSleep um ${d.deepsleep_start}.` : '');
|
||||
}
|
||||
} catch (e) {
|
||||
document.getElementById('status-text').textContent = 'Status nicht abrufbar: ' + e;
|
||||
}
|
||||
}
|
||||
function formatDuration(secs) {
|
||||
const h = Math.floor(secs / 3600);
|
||||
const m = Math.floor((secs % 3600) / 60);
|
||||
if (h > 0) return `${h}h ${m}m`;
|
||||
return `${m}m`;
|
||||
}
|
||||
document.getElementById('wake-btn').addEventListener('click', async () => {
|
||||
const r = await fetch('/api/wake', { method: 'POST' });
|
||||
const d = await r.json();
|
||||
if (d.ok) {
|
||||
document.getElementById('status-text').textContent = 'Wake-Trigger gesendet — Display wacht auf.';
|
||||
setTimeout(refreshStatus, 1000);
|
||||
} else {
|
||||
alert('Wake fehlgeschlagen: ' + d.error);
|
||||
}
|
||||
});
|
||||
refreshStatus();
|
||||
setInterval(refreshStatus, 30000);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user