updated board from olimex c5
This commit is contained in:
@@ -0,0 +1,211 @@
|
||||
"""Olimex ESP32-C5-EVB board driver.
|
||||
|
||||
Hardware
|
||||
--------
|
||||
- 2 relays (outputs, 250V/10A)
|
||||
- 2 opto-isolated inputs (110VAC-240VAC)
|
||||
- HTTP REST API served directly by the board on port 80
|
||||
|
||||
API endpoints
|
||||
-------------
|
||||
POST /relay/on?relay=<n> → {"state": true}
|
||||
POST /relay/off?relay=<n> → {"state": false}
|
||||
POST /relay/toggle?relay=<n> → {"state": <new>}
|
||||
GET /relay/status?relay=<n> → {"state": <bool>}
|
||||
GET /input/status?input=<n> → {"state": <bool>}
|
||||
POST /register?callback_url=<url> → {"status": "ok"}
|
||||
GET /nfc/status → {"initialized": bool, "card_present": bool,
|
||||
"last_uid": str, "access_state": str,
|
||||
"auth_uid": str, "relay_num": int,
|
||||
"pulse_ms": int}
|
||||
GET /nfc/config → {"auth_uid": str, "relay_num": int, "pulse_ms": int}
|
||||
POST /nfc/config?auth_uid=&relay=&pulse_ms= → {"status": "ok", ...}
|
||||
|
||||
Webhook (board → server)
|
||||
------------------------
|
||||
The board POSTs to the registered callback_url whenever an input changes:
|
||||
POST <callback_url>
|
||||
{"input": <n>, "state": <bool>}
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import hashlib
|
||||
import hmac
|
||||
import logging
|
||||
import time as _time
|
||||
import urllib.parse
|
||||
import requests
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from app.drivers.base import BoardDriver
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from app.models.board import Board
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_TIMEOUT = 3
|
||||
|
||||
|
||||
def _get(url: str, headers: dict | None = None) -> dict | None:
|
||||
try:
|
||||
r = requests.get(url, timeout=_TIMEOUT, headers=headers or {})
|
||||
r.raise_for_status()
|
||||
return r.json()
|
||||
except Exception as exc:
|
||||
logger.debug("GET %s → %s", url, exc)
|
||||
return None
|
||||
|
||||
|
||||
def _post(url: str, headers: dict | None = None) -> dict | None:
|
||||
try:
|
||||
r = requests.post(url, timeout=_TIMEOUT, headers=headers or {})
|
||||
r.raise_for_status()
|
||||
return r.json()
|
||||
except Exception as exc:
|
||||
logger.debug("POST %s → %s", url, exc)
|
||||
return None
|
||||
|
||||
|
||||
def _auth(board: "Board", method: str, url: str) -> dict:
|
||||
"""Build HMAC-SHA256 auth headers. Returns {} when no api_secret set."""
|
||||
secret: str = getattr(board, "api_secret", None) or ""
|
||||
if not secret:
|
||||
return {}
|
||||
path = urllib.parse.urlparse(url).path
|
||||
ts = str(int(_time.time()))
|
||||
msg = f"{method}:{path}:{ts}".encode()
|
||||
sig = hmac.new(secret.encode(), msg, hashlib.sha256).hexdigest()
|
||||
return {"X-Request-Time": ts, "X-Request-Sig": sig}
|
||||
|
||||
|
||||
class OlimexESP32C5EVBDriver(BoardDriver):
|
||||
"""Driver for the Olimex ESP32-C5-EVB board."""
|
||||
|
||||
DRIVER_ID = "olimex_esp32_c5_evb"
|
||||
DISPLAY_NAME = "Olimex ESP32-C5-EVB"
|
||||
DESCRIPTION = "2 relays (250V/10A) · 2 opto-isolated inputs (110-240VAC) · HTTP REST + webhook callbacks"
|
||||
DEFAULT_NUM_RELAYS = 2
|
||||
DEFAULT_NUM_INPUTS = 2
|
||||
FIRMWARE_URL = "https://github.com/OLIMEX/ESP32-C5-EVB"
|
||||
|
||||
# ── relay control ─────────────────────────────────────────────────────────
|
||||
|
||||
def get_relay_status(self, board: "Board", relay_num: int) -> bool | None:
|
||||
url = f"{board.base_url}/relay/status?relay={relay_num}"
|
||||
data = _get(url, _auth(board, "GET", url))
|
||||
return bool(data["state"]) if data is not None else None
|
||||
|
||||
def set_relay(self, board: "Board", relay_num: int, state: bool) -> bool:
|
||||
action = "on" if state else "off"
|
||||
url = f"{board.base_url}/relay/{action}?relay={relay_num}"
|
||||
return _post(url, _auth(board, "POST", url)) is not None
|
||||
|
||||
def toggle_relay(self, board: "Board", relay_num: int) -> bool | None:
|
||||
url = f"{board.base_url}/relay/toggle?relay={relay_num}"
|
||||
data = _post(url, _auth(board, "POST", url))
|
||||
return bool(data["state"]) if data is not None else None
|
||||
|
||||
# ── poll ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def poll(self, board: "Board") -> dict:
|
||||
_offline = {"relay_states": {}, "input_states": {}, "is_online": False}
|
||||
|
||||
# ── Connectivity probe ─────────────────────────────────────────────
|
||||
# Try the very first endpoint. If the board doesn't reply we know
|
||||
# it's offline and skip all remaining requests (saving N × 3 s worth
|
||||
# of connect timeouts on every recheck cycle).
|
||||
relay_states: dict = {}
|
||||
input_states: dict = {}
|
||||
|
||||
if board.num_relays > 0:
|
||||
url = f"{board.base_url}/relay/status?relay=1"
|
||||
probe = _get(url, _auth(board, "GET", url))
|
||||
if probe is None:
|
||||
return _offline
|
||||
relay_states["relay_1"] = bool(probe.get("state", False))
|
||||
elif board.num_inputs > 0:
|
||||
url = f"{board.base_url}/input/status?input=1"
|
||||
probe = _get(url, _auth(board, "GET", url))
|
||||
if probe is None:
|
||||
return _offline
|
||||
input_states["input_1"] = bool(probe.get("state", False))
|
||||
else:
|
||||
return _offline
|
||||
|
||||
# Board is reachable — collect remaining endpoints
|
||||
for n in range(2, board.num_relays + 1):
|
||||
url = f"{board.base_url}/relay/status?relay={n}"
|
||||
data = _get(url, _auth(board, "GET", url))
|
||||
if data is not None:
|
||||
relay_states[f"relay_{n}"] = bool(data.get("state", False))
|
||||
|
||||
input_start = 2 if (board.num_relays == 0 and board.num_inputs > 0) else 1
|
||||
for n in range(input_start, board.num_inputs + 1):
|
||||
url = f"{board.base_url}/input/status?input={n}"
|
||||
data = _get(url, _auth(board, "GET", url))
|
||||
if data is not None:
|
||||
input_states[f"input_{n}"] = bool(data.get("state", True))
|
||||
|
||||
return {
|
||||
"relay_states": relay_states,
|
||||
"input_states": input_states,
|
||||
"is_online": True,
|
||||
}
|
||||
|
||||
# ── webhook registration ──────────────────────────────────────────────────
|
||||
|
||||
def register_webhook(self, board: "Board", callback_url: str) -> bool:
|
||||
url = f"{board.base_url}/register?callback_url={callback_url}"
|
||||
ok = _post(url, _auth(board, "POST", url)) is not None
|
||||
if ok:
|
||||
logger.info("Webhook registered on board '%s' → %s", board.name, callback_url)
|
||||
else:
|
||||
logger.warning("Webhook registration failed for board '%s'", board.name)
|
||||
return ok
|
||||
|
||||
# ── NFC access control ──────────────────────────────────────────────────────
|
||||
|
||||
def get_nfc_status(self, board: "Board") -> dict | None:
|
||||
"""Return current NFC reader status (last UID, access_state, auth config)."""
|
||||
url = f"{board.base_url}/nfc/status"
|
||||
return _get(url, _auth(board, "GET", url))
|
||||
|
||||
def set_nfc_config(
|
||||
self,
|
||||
board: "Board",
|
||||
auth_uid: str = "",
|
||||
relay_num: int = 1,
|
||||
pulse_ms: int = 3000,
|
||||
) -> bool:
|
||||
"""Push NFC access-control config to the board."""
|
||||
import urllib.parse
|
||||
|
||||
url = (
|
||||
f"{board.base_url}/nfc/config"
|
||||
f"?auth_uid={urllib.parse.quote(auth_uid.upper())}"
|
||||
f"&relay={relay_num}"
|
||||
f"&pulse_ms={pulse_ms}"
|
||||
)
|
||||
result = _post(url, _auth(board, "POST", url))
|
||||
if result:
|
||||
logger.info(
|
||||
"NFC config pushed to board '%s': uid='%s' relay=%d pulse=%dms",
|
||||
board.name, auth_uid, relay_num, pulse_ms,
|
||||
)
|
||||
else:
|
||||
logger.warning("NFC config push failed for board '%s'", board.name)
|
||||
return result is not None
|
||||
|
||||
def set_nfc_enabled(self, board: "Board", enabled: bool) -> bool:
|
||||
"""Enable or disable the NFC/Mifare access-control module on the board."""
|
||||
state = 1 if enabled else 0
|
||||
url = f"{board.base_url}/nfc/enable?state={state}"
|
||||
result = _post(url, _auth(board, "POST", url))
|
||||
if result is not None:
|
||||
logger.info(
|
||||
"NFC module on board '%s' set to: %s",
|
||||
board.name, "ENABLED" if enabled else "DISABLED",
|
||||
)
|
||||
else:
|
||||
logger.warning("NFC enable/disable failed for board '%s'", board.name)
|
||||
return result is not None
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"driver_id": "olimex_esp32_c5_evb",
|
||||
"display_name": "Olimex ESP32-C5-EVB",
|
||||
"description": "Olimex ESP32-C5-EVB board with 2 relays (250V/10A) and 2 opto-isolated inputs (110-240VAC). Communicates via HTTP REST API with webhook callbacks.",
|
||||
"manufacturer": "Olimex",
|
||||
"chip": "ESP32-C5 WROOM-1",
|
||||
"default_num_relays": 2,
|
||||
"default_num_inputs": 2,
|
||||
"firmware_url": "https://github.com/OLIMEX/ESP32-C5-EVB",
|
||||
"api": {
|
||||
"relay_on": "POST /relay/on?relay={n}",
|
||||
"relay_off": "POST /relay/off?relay={n}",
|
||||
"relay_toggle": "POST /relay/toggle?relay={n}",
|
||||
"relay_status": "GET /relay/status?relay={n}",
|
||||
"input_status": "GET /input/status?input={n}",
|
||||
"register": "POST /register?callback_url={url}"
|
||||
}
|
||||
}
|
||||
+17
-16
@@ -10,6 +10,7 @@ from app.drivers.registry import registry
|
||||
from flask import current_app
|
||||
|
||||
_NFC_DRIVER_ID = "olimex_esp32_c6_evb_pn532"
|
||||
_NFC_DRIVER_IDS = {"olimex_esp32_c6_evb_pn532", "olimex_esp32_c5_evb"}
|
||||
|
||||
boards_bp = Blueprint("boards", __name__)
|
||||
|
||||
@@ -290,9 +291,9 @@ def edit_labels(board_id: int):
|
||||
@login_required
|
||||
def nfc_management(board_id: int):
|
||||
board = db.get_or_404(Board, board_id)
|
||||
if board.board_type != _NFC_DRIVER_ID:
|
||||
if board.board_type not in _NFC_DRIVER_IDS:
|
||||
abort(404)
|
||||
driver = registry.get(_NFC_DRIVER_ID)
|
||||
driver = registry.get(board.board_type)
|
||||
nfc_status = driver.get_nfc_status(board) if driver else None
|
||||
return render_template(
|
||||
"boards/nfc.html",
|
||||
@@ -305,9 +306,9 @@ def nfc_management(board_id: int):
|
||||
@login_required
|
||||
def nfc_status_json(board_id: int):
|
||||
board = db.get_or_404(Board, board_id)
|
||||
if board.board_type != _NFC_DRIVER_ID:
|
||||
if board.board_type not in _NFC_DRIVER_IDS:
|
||||
abort(404)
|
||||
driver = registry.get(_NFC_DRIVER_ID)
|
||||
driver = registry.get(board.board_type)
|
||||
data = driver.get_nfc_status(board) if driver else None
|
||||
if data is None:
|
||||
return jsonify({"error": "Board unreachable"}), 502
|
||||
@@ -320,22 +321,22 @@ def nfc_config_save(board_id: int):
|
||||
if not current_user.is_admin():
|
||||
abort(403)
|
||||
board = db.get_or_404(Board, board_id)
|
||||
if board.board_type != _NFC_DRIVER_ID:
|
||||
if board.board_type not in _NFC_DRIVER_IDS:
|
||||
abort(404)
|
||||
driver = registry.get(_NFC_DRIVER_ID)
|
||||
driver = registry.get(board.board_type)
|
||||
if not driver:
|
||||
flash("NFC driver not available.", "danger")
|
||||
return redirect(url_for("boards.nfc_management", board_id=board_id))
|
||||
|
||||
auth_uid = request.form.get("auth_uid", "").strip().upper()
|
||||
relay_num = int(request.form.get("relay_num", 1))
|
||||
pulse_ms = int(request.form.get("pulse_ms", 3000))
|
||||
pulse_ms = int(request.form.get("pulse_ms", 0))
|
||||
|
||||
if relay_num < 1 or relay_num > 4:
|
||||
flash("Relay number must be 1–4.", "danger")
|
||||
if relay_num < 1 or relay_num > board.num_relays:
|
||||
flash(f"Relay number must be 1–{board.num_relays}.", "danger")
|
||||
return redirect(url_for("boards.nfc_management", board_id=board_id))
|
||||
if pulse_ms < 100 or pulse_ms > 60000:
|
||||
flash("Absence timeout must be between 100 and 60 000 ms.", "danger")
|
||||
if pulse_ms < 0 or pulse_ms > 60000:
|
||||
flash("Release delay must be between 0 and 60 000 ms.", "danger")
|
||||
return redirect(url_for("boards.nfc_management", board_id=board_id))
|
||||
|
||||
ok = driver.set_nfc_config(board, auth_uid=auth_uid, relay_num=relay_num, pulse_ms=pulse_ms)
|
||||
@@ -354,9 +355,9 @@ def nfc_enroll(board_id: int):
|
||||
if not current_user.is_admin():
|
||||
abort(403)
|
||||
board = db.get_or_404(Board, board_id)
|
||||
if board.board_type != _NFC_DRIVER_ID:
|
||||
if board.board_type not in _NFC_DRIVER_IDS:
|
||||
abort(404)
|
||||
driver = registry.get(_NFC_DRIVER_ID)
|
||||
driver = registry.get(board.board_type)
|
||||
if not driver:
|
||||
flash("NFC driver not available.", "danger")
|
||||
return redirect(url_for("boards.nfc_management", board_id=board_id))
|
||||
@@ -372,7 +373,7 @@ def nfc_enroll(board_id: int):
|
||||
return redirect(url_for("boards.nfc_management", board_id=board_id))
|
||||
|
||||
relay_num = int(request.form.get("relay_num", status.get("relay_num", 1)))
|
||||
pulse_ms = int(request.form.get("pulse_ms", status.get("pulse_ms", 3000)))
|
||||
pulse_ms = int(request.form.get("pulse_ms", status.get("pulse_ms", 0)))
|
||||
|
||||
ok = driver.set_nfc_config(board, auth_uid=uid, relay_num=relay_num, pulse_ms=pulse_ms)
|
||||
if ok:
|
||||
@@ -389,9 +390,9 @@ def nfc_enable(board_id: int):
|
||||
if not current_user.is_admin():
|
||||
abort(403)
|
||||
board = db.get_or_404(Board, board_id)
|
||||
if board.board_type != _NFC_DRIVER_ID:
|
||||
if board.board_type not in _NFC_DRIVER_IDS:
|
||||
abort(404)
|
||||
driver = registry.get(_NFC_DRIVER_ID)
|
||||
driver = registry.get(board.board_type)
|
||||
if not driver:
|
||||
flash("NFC driver not available.", "danger")
|
||||
return redirect(url_for("boards.nfc_management", board_id=board_id))
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</div>
|
||||
{% if current_user.is_admin() %}
|
||||
<div class="d-flex gap-2">
|
||||
{% if board.board_type == 'olimex_esp32_c6_evb_pn532' %}
|
||||
{% if board.board_type == 'olimex_esp32_c6_evb_pn532' or board.board_type == 'olimex_esp32_c5_evb' %}
|
||||
<a href="{{ url_for('boards.nfc_management', board_id=board.id) }}" class="btn btn-outline-primary">
|
||||
<i class="bi bi-credit-card-2-front me-1"></i> NFC Access Control
|
||||
</a>
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
<dt class="col-5 text-secondary">Trigger relay</dt>
|
||||
<dd class="col-7 fw-semibold" id="relay-display">Relay {{ nfc.get('relay_num', 1) }}</dd>
|
||||
<dt class="col-5 text-secondary">Absence timeout</dt>
|
||||
<dd class="col-7 fw-semibold" id="pulse-display">{{ nfc.get('pulse_ms', 3000) }} ms</dd>
|
||||
<dd class="col-7 fw-semibold" id="pulse-display">{{ nfc.get('pulse_ms', 0) }} ms</dd>
|
||||
</dl>
|
||||
|
||||
</div>
|
||||
@@ -152,16 +152,16 @@
|
||||
<div class="col-sm-4">
|
||||
<label class="form-label small text-secondary mb-1">Trigger relay</label>
|
||||
<select name="relay_num" id="enroll-relay" class="form-select">
|
||||
{% for r in range(1, 5) %}
|
||||
{% for r in range(1, board.num_relays + 1) %}
|
||||
<option value="{{ r }}" {% if nfc.get('relay_num', 1) == r %}selected{% endif %}>Relay {{ r }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<label class="form-label small text-secondary mb-1">Absence timeout (ms)</label>
|
||||
<label class="form-label small text-secondary mb-1">Release delay (ms) — 0 = off when card removed</label>
|
||||
<input type="number" name="pulse_ms" id="enroll-pulse"
|
||||
class="form-control" min="100" max="60000"
|
||||
value="{{ nfc.get('pulse_ms', 3000) }}">
|
||||
class="form-control" min="0" max="60000"
|
||||
value="{{ nfc.get('pulse_ms', 0) }}">
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<button type="submit" class="btn btn-success w-100"
|
||||
@@ -204,16 +204,16 @@
|
||||
<div class="col-sm-6">
|
||||
<label class="form-label small text-secondary mb-1">Trigger relay</label>
|
||||
<select name="relay_num" class="form-select">
|
||||
{% for r in range(1, 5) %}
|
||||
{% for r in range(1, board.num_relays + 1) %}
|
||||
<option value="{{ r }}" {% if nfc.get('relay_num', 1) == r %}selected{% endif %}>Relay {{ r }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<label class="form-label small text-secondary mb-1">Absence timeout (ms)</label>
|
||||
<label class="form-label small text-secondary mb-1">Release delay (ms)</label>
|
||||
<input type="number" name="pulse_ms" class="form-control"
|
||||
min="100" max="60000" value="{{ nfc.get('pulse_ms', 3000) }}">
|
||||
<div class="form-text">Relay closes this many ms after the card is removed (100 – 60 000).</div>
|
||||
min="0" max="60000" value="{{ nfc.get('pulse_ms', 0) }}">
|
||||
<div class="form-text">Relay turns off this many ms after the card is removed (0 = immediately).</div>
|
||||
</div>
|
||||
<div class="col-12 d-flex gap-2">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
@@ -287,7 +287,7 @@ function loadStatus() {
|
||||
const relayDisp = document.getElementById('relay-display');
|
||||
if (relayDisp) relayDisp.textContent = 'Relay ' + (d.relay_num || 1);
|
||||
const pulseDisp = document.getElementById('pulse-display');
|
||||
if (pulseDisp) pulseDisp.textContent = (d.pulse_ms || 3000) + ' ms';
|
||||
if (pulseDisp) pulseDisp.textContent = (d.pulse_ms != null ? d.pulse_ms : 0) + ' ms';
|
||||
// module enabled/disabled summary in left card
|
||||
const modDd = document.getElementById('module-state-dd');
|
||||
if (modDd) {
|
||||
|
||||
Reference in New Issue
Block a user